From 059f617d29ba6758663c2ed830b59b7df259f1c6 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Mon, 23 Mar 2015 02:16:33 +0000 Subject: [PATCH] Change overhaul more on the displayShow page. Fix disabling IMDb broke page. Fix counting of files. Add some tooltips to bottom show details for clarity. Change glyph to right side of "Show/Hide episodes" button text to improve visual when toggling button. Change red text on blue tag to white text on red tag to improve readability of invalid locations. Change some label tags to fit with edit show page. Fix handle when a show in db has all episodes removed from indexer. Add the name of show that will be displayed to the hover of the Prev/Next show buttons. Add hover tooltips for nfo and tbn columns for browsers that use the title attr. Change Special link moved from "Season" line to "Specials" line on displayShow. Change code re-factored in readiness for live option switching, clean up and add closures of html tables. --- CHANGES.md | 11 + gui/slick/css/dark.css | 52 +- gui/slick/css/light.css | 63 ++- gui/slick/css/style.css | 167 +++++- .../interfaces/default/config_general.tmpl | 34 -- gui/slick/interfaces/default/displayShow.tmpl | 526 +++++++++--------- gui/slick/interfaces/default/inc_bottom.tmpl | 13 +- gui/slick/interfaces/default/inc_top.tmpl | 10 +- sickbeard/webserve.py | 30 + 9 files changed, 528 insertions(+), 378 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 258439ae..11a27f7f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -80,6 +80,12 @@ * Add option to collapse seasons and leave current season open on displayShow (disabled) * Add filesize to episode location qtip on displayShow * Change selected options from editShow will only show when enabled now on displayShow +* Change some label tags to fit with edit show page on displayShow +* Fix handle when a show in db has all episodes removed from indexer on displayShow +* Add the name of show that will be displayed to the hover of the Prev/Next show buttons on displayShow +* Add hover tooltips for nfo and tbn columns for browsers that use the title attr on displayShow +* Change Special link moved from "Season" line to "Specials" line on displayShow +* Change code re-factored in readiness for live option switching, clean up and add closures of html tables * Add show overview from indexers to the database [develop changelog] @@ -94,6 +100,11 @@ * Fix to correctly use wanted_begin and wanted_latest when adding shows * Change Log/Error Log Menu icons to correct ones * Fix issue with missing QueueItemForceUpdate object has no attribute 'force_web' +* Fix disabling IMDb broke page +* Fix counting of files on displayShow +* Add some tooltips to bottom show details for clarity on displayShow +* Change red text on blue tag to white text on red tag to improve readability of invalid locations on displayShow +* Change glyph to right side of "Show/Hide episodes" button text to improve visual when toggling button on displayShow ### 0.7.2 (2015-03-10 17:05:00 UTC) diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 0c26d7c4..a4a38cd0 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -347,6 +347,11 @@ home_postprocess.tmpl displayShow.tmpl ========================================================================== */ +tr.seasonheader{ + text-align:left; + border:none +} + #prevShow, #nextShow, #topcontrol{ @@ -358,40 +363,26 @@ displayShow.tmpl border:1px solid #111 } -.sickbeardTable tr.header td, -.sickbeardTable th{ - color:#fff; - background-color:#15528F -} - -th.row-seasonheader{ - border:none; - background-color:transparent; - color:#fff -} - -tr.seasonheader{ - text-align:left; - border:none -} - .display-details{ background-color:#3d3d3d; border:1px solid #111 } -.display-details-transparent{ - background:rgba(0,0,0,0.5); - border:1px solid rgba(0,0,0,0.5) +.pro .details-title{ + color:#999 } -.info-tag-bg, -.genre-tag-bg{ +.back-art.pro .details-title{ + color:#bbb +} + +.back-art #details-top .label, +.back-art #details-bottom .label{ background-color:#15528F } -.info-tag-nobg, -.genre-tag-nobg{ +#details-top .label, +#details-bottom .label{ background-color:#15528F } @@ -399,6 +390,19 @@ tr.seasonheader{ color:#09A2FF } +.sickbeardTable th{ + background-color:#15528f +} + +.displayshow-wrapper .sickbeardTable th.row-seasonheader{ + color:#fff +} + +.back-art.pro .sickbeardTable .seasoncols th, +.translucent.pro .sickbeardTable .seasoncols th{ + background-color:rgba(21, 82, 143, 0.5) +} + /* ======================================================================= episodeView.tmpl ========================================================================== */ diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index 4d027e82..a5605538 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -187,6 +187,19 @@ inc_bottom.tmpl color:#428BCA } +body#display-show.back-art .displayshow-wrapper a, +body#display-show.back-art .footerhighlight a, +body#display-show.back-art .footerhighlight{ + color:#c7db40 +} + +body#display-show.back-art .displayshow-wrapper a:hover, +body#display-show.back-art .displayshow-wrapper a:focus, +body#display-show.back-art .footerhighlight a:hover, +body#display-show.back-art .footerhighlight a:focus{ + color:#9faf33 +} + /* ======================================================================= home.tmpl ========================================================================== */ @@ -335,6 +348,11 @@ home_postprocess.tmpl displayShow.tmpl ========================================================================== */ +tr.seasonheader{ + border:none; + color:#000 +} + #prevShow, #nextShow, #topcontrol{ @@ -348,39 +366,26 @@ displayShow.tmpl border:1px solid #ccc } -.sickbeardTable th{ - color:#fff; - background-color:#333 -} - -th.row-seasonheader{ - border:none; - background-color:transparent; - color:#000 -} - -tr.seasonheader{ - border:none; - color:#000 -} - .display-details{ background-color:#efefef; border:1px solid #dfdede } -.display-details-transparent{ - background:rgba(0,0,0,0.5); - border:1px solid rgba(0,0,0,0.5) +.pro .details-title{ + color:#666 } -.info-tag-bg, -.genre-tag-bg{ +.back-art.pro .details-title{ + color:#bbb +} + +.back-art #details-top .label, +.back-art #details-bottom .label{ background-color:#215f2f } -.info-tag-nobg, -.genre-tag-nobg{ +#details-top .label, +#details-bottom .label{ background-color:#555 } @@ -388,6 +393,18 @@ tr.seasonheader{ color:#C7DB40 } +.sickbeardTable th{ + background-color:#333 +} + +.displayshow-wrapper .sickbeardTable th.row-seasonheader{ + color:#000 +} + +.translucent.pro .sickbeardTable th{ + background-color:rgba(51, 51, 51, 0.5) +} + /* ======================================================================= episodeView.tmpl ========================================================================== */ diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index b26395dc..e68f5363 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -1069,17 +1069,46 @@ home_postprocess.tmpl /* ======================================================================= displayShow.tmpl ========================================================================== */ +body#display-show.back-art { + color:#fff +} -.background-container{ +body#display-show .pro #details-bottom .label-paused, +body#display-show .pro .season-status .archived-count{ + display:inline +} + +body#display-show .season-status, +body#display-show #details-bottom .label-paused, +body#display-show .season-status .archived-count, +.displayshow-wrapper .background-container, +.all .sickbeardTable .row-seasonheader button, +.reg .sickbeardTable .row-seasonheader button.latest-season, +.pro .sickbeardTable .row-seasonheader button.display-season{ + display:none +} + +.all .sickbeardTable tbody.collapse, +.reg .sickbeardTable tbody.collapse.latest-season, +.pro .sickbeardTable tbody.collapse.display-season{ + display:table-row-group +} + +body#display-show .pro #details-bottom .label-paused{ + background-color:#8f1515 +} + +.back-art .background-container{ position:fixed; top:0; right:0; bottom:0; left:0; - z-index:-1 + z-index:-1; + display:block } -.background{ +.back-art .background{ position:absolute; top:0; right:0; @@ -1089,7 +1118,7 @@ displayShow.tmpl background-size:cover } -.background-transparent:after{ +.back-art.translucent .background:after{ position:absolute; content:""; top:0; @@ -1113,23 +1142,27 @@ displayShow.tmpl margin-top:10px } -.display-show{ +body#display-show .sickbeardTable{ margin:30px 0 } -.display-season{ +body#display-show .back-art .sickbeardTable{ background:rgba(0,0,0,0.5); border-radius:3px; padding:10px } -.display-details, -.display-details-transparent{ +.display-details{ border-radius:3px; padding:8px 10px; margin-bottom:20px } +.back-art .display-details{ + background:rgba(0,0,0,0.5); + border:1px solid rgba(0,0,0,0.5) +} + #details-wrapper{ float:left; width:100%; @@ -1137,6 +1170,10 @@ displayShow.tmpl cursor:default } +.no-labels #details-top{ + height:43px +} + #details-top{ height:70px } @@ -1157,13 +1194,40 @@ displayShow.tmpl margin-left:15px } -#details-right .flag{ - margin-right:4px; +.details-title{ + display:inline-block; + float:left +} + +.reg .details-title{ + margin-right:4px +} + +.reg .details-title:after{ + content:":" +} + +.pro .details-title{ + width:80px; + font-size:13px; + line-height:20px +} + +.pro .details-info{ + display:block; + margin-left:85px +} + +.details-info .space-right{ + margin-right:4px +} + +.details-info .flag{ vertical-align:baseline } .details-plot{ - min-height:217px; + min-height:220px; overflow:hidden } @@ -1180,17 +1244,14 @@ displayShow.tmpl height:42px } -.genre-tag-bg, -.genre-tag-nobg{ +#details-top .label{ padding:3px 4px 3px 22px; background:url(../images/tag.png) no-repeat scroll 4px 3px; cursor:default } -.genre-tag-bg a, -.genre-tag-bg a:hover, -.genre-tag-nobg a, -.genre-tag-nobg a:hover{ +#details-top .label a, +#details-top .label a:hover{ color:#fff; text-decoration:none } @@ -1216,11 +1277,11 @@ span.imdbstars, span.imdbstars > *{ } .moreless{ - margin-top:-3px + margin-top:0 } .no-plot{ - font-style: italic + font-style:italic } .paused{ @@ -1269,10 +1330,22 @@ a.service img{ .tvshowImg{ border:1px solid #ccc; border-radius:3px; - height:329px; + height:332px; width:auto; float:left } +.no-labels #posterCol .tvshowImg{ + height:305px +} + +.back-art .tvshowImg{ + border-color:rgba(0,0,0,0.5) +} + +.back-art.translucent.pro .tvshowImg { + opacity: 0.85; + filter: alpha(opacity=85) +} #checkboxControls{ padding-top:5px @@ -1299,35 +1372,75 @@ a.service img{ color:#666 } +.back-art.pro .airdate-never{ + background-color:rgba(234,226,200,0.7); + color:#666 +} + .unaired{ background-color:#f5f1e4 } +.back-art.pro .unaired{ + background-color:rgba(245,241,228,0.7); + color:#584b20 +} + .skipped{ background-color:#bedeed } +.back-art.pro .skipped{ + background-color:rgba(190,222,237,0.7); + color:#1d5068 +} + .good{ background-color:#c3e3c8 } +.back-art.pro .good{ + background-color:rgba(195,227,200,0.7); + color:#295730 +} + .archived{ background-color:#d5e3d8; color:#295730 } +.back-art.pro .archived{ + background-color:rgba(213,227,216,0.7); + color:#295730 +} + .qual{ background-color:#ffda8a } +.back-art.pro .qual{ + background-color:rgba(255,218,138,0.7); + color:#765100 +} + .wanted{ background-color:#ffb0b0 } +.back-art.pro .wanted{ + background-color:rgba(255,176,176,0.7); + color:#890000 +} + .snatched{ background-color:#ebc1ea } +.back-art.pro .snatched{ + background-color:rgba(235,193,234,0.7); + color:#652164 +} + span.unaired{ color:#584b20; border:1px solid #584b20 @@ -1389,15 +1502,10 @@ span.snatched b{ color:#000 } -.sickbeardTable.display_show{ - clear:both -} - .sickbeardTable tr.header td, .sickbeardTable th{ color:#fff; text-align:center; - background-color:#333; white-space:nowrap } @@ -1411,12 +1519,17 @@ span.snatched b{ padding:4px 8px } -th.row-seasonheader{ +.displayshow-wrapper .sickbeardTable th.row-seasonheader{ border:none; - background-color:transparent !important; + width:auto; + background-color:transparent; text-align:left } +.back-art th.row-seasonheader h3{ + color:#fff +} + th.row-seasonheader h3{ margin:0 } diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index e438dc70..d74e2523 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -247,41 +247,7 @@ -