From 45c65337662bf8647404a69e48f53528e7046bd2 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Mon, 16 Mar 2015 15:38:38 +0000 Subject: [PATCH] Change episode row color away from blue on display show page when indexer airdate is not defined. Hide year, runtime, genre tags, country flag, or status if lacking valid data to display. Remove redundant CSS color use (all browsers treat 3 identical digits as 6, except for possibly in gradients). --- CHANGES.md | 3 + gui/slick/css/dark.css | 82 +++++----- gui/slick/css/light.css | 114 +++++++------- gui/slick/css/style.css | 148 +++++++++--------- gui/slick/interfaces/default/displayShow.tmpl | 18 ++- 5 files changed, 188 insertions(+), 177 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 71696100..ba2358c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,6 +35,9 @@ * Change to no longer require restart with the "Scan and post process" option on page config/Post Processing * Add validation when using Release Group token on page config Post Processing/Episode Naming/Name pattern/Custom * Change to simplify and reduce logging output of Recent-Search and Backlog processes +* Change episode row color away from blue on display show page when indexer airdate is not defined +* Hide year, runtime, genre tags, country flag, or status if lacking valid data to display +* Remove redundant CSS color use (all browsers treat 3 identical digits as 6, except for possibly in gradients) * Add show names to items listed during startup in the loading from database phase * Add "Enable IMDb info" option to config/General/Interface * Change to not display IMDb info on UI when "Enable IMDb info" is disabled diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 2b6a3f21..e1253155 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -128,11 +128,11 @@ inc_top.tmpl } .ui-widget-overlay { - background: #000000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; + background: #000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; } .ui-widget-shadow { - background: #000000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; + background: #000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { @@ -584,7 +584,7 @@ h2.day, h2.network { } .tvshowTitle a { - color: #000000; + color: #000; } .tvshowDiv td.next_episode { @@ -728,7 +728,7 @@ config_postProcessing.tmpl } #config div.example { - background-color: #333333; + background-color: #333; border-color: #111; } @@ -847,45 +847,45 @@ input, textarea, select, .uneditable-input { } .navbar-default .navbar-brand { - color: #ffffff; + color: #fff; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-default .navbar-text { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-nav > li > a { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #ffffff; + color: #fff; background-color: #124477; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #ffffff; + color: #fff; background-color: #124477; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } .navbar-default .navbar-toggle { - border-color: #cccccc; + border-color: #ccc; } .navbar-default .navbar-toggle:hover, @@ -906,38 +906,38 @@ input, textarea, select, .uneditable-input { .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #124477; - color: #ffffff; + color: #fff; } @media (max-width: 767px) { - .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #dddddd; - } - .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #ddd; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #fff; background-color: transparent; - } - .navbar-default .navbar-nav .open .dropdown-menu > .active > a, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #fff; background-color: #124477; - } - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; + } + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #ccc; background-color: transparent; - } + } } .navbar-default .navbar-link { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-link:hover { - color: #ffffff; + color: #fff; } .navbar-default .btn-link { @@ -946,14 +946,14 @@ input, textarea, select, .uneditable-input { .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #dddddd; + color: #ddd; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { - color: #cccccc; + color: #ccc; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { @@ -1010,7 +1010,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #ccc \9; color: #fff; } @@ -1084,7 +1084,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-info:hover, .btn-inverse, .btn-inverse:hover { - color: #ffffff; + color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } @@ -1249,7 +1249,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-inverse { background-color: #414141; - *background-color: #222222; + *background-color: #222; background-image: -ms-linear-gradient(top, #555555, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); background-image: -webkit-linear-gradient(top, #555555, #222222); @@ -1257,7 +1257,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-image: -moz-linear-gradient(top, #555555, #222222); background-image: linear-gradient(top, #555555, #222222); background-repeat: repeat-x; - border-color: #222222 #222222 #000000; + border-color: #222 #222 #000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); @@ -1268,7 +1268,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { - background-color: #222222; + background-color: #222; *background-color: #151515; } @@ -1363,7 +1363,7 @@ formWizard ========================================================================== */ .step, legend.legendStep { - color: #ffffff; + color: #fff; } div.stepsguide .step p { @@ -1457,7 +1457,7 @@ thead.tablesorter-stickyHeader { /* Zebra Widget - row alternating colors */ .tablesorter tr.odd, .sickbeardTable tr.odd { - background-color: #333333; + background-color: #333; } .tablesorter tr.even, .sickbeardTable tr.even { diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index ab7a5f51..89851c03 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -52,14 +52,14 @@ inc_top.tmpl } .ui-widget-header { - background: #ffffff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; + background: #fff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - background: #ffffff; - border: 1px solid #CCCCCC; + background: #fff; + border: 1px solid #CCC; } .ui-state-hover, @@ -68,7 +68,7 @@ inc_top.tmpl .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - background: #ffffff; + background: #fff; } .ui-state-active, @@ -121,11 +121,11 @@ inc_top.tmpl } .ui-widget-overlay { - background: #aaaaaa url("../css/lib/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + background: #aaa url("../css/lib/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; } .ui-widget-shadow { - background: #000000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; + background: #000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { @@ -154,7 +154,7 @@ inc_top.tmpl .ui-tabs .ui-tabs-panel { background-color: #F7F7F7 !important; - border: 1px solid #CCCCCC !important; + border: 1px solid #CCC !important; } .ui-tabs .ui-tabs-nav li.ui-tabs-active { @@ -363,7 +363,7 @@ home.tmpl .progressbarText { text-shadow: 0 0 0.1em #fff; - color: #000000; + color: #000; } .show { @@ -572,7 +572,7 @@ h2.day, h2.network { } .tvshowTitle a { - color: #000000; + color: #000; } .tvshowDiv td.next_episode { @@ -635,11 +635,11 @@ h2.day, h2.network { .day-of-week .text .episode .season, .day-of-week .text .episode .number { - color: rgb(9, 133, 225); + color: rgb(9, 133, 225); } .day-of-week .text .episode { - color: #888; + color: #888; } .episodeview-daybyday .time .time-hr-min, @@ -753,7 +753,7 @@ manage*.tmpl ========================================================================== */ .separator { - color: #333333; + color: #333; } a.whitelink { @@ -796,7 +796,7 @@ input, textarea, select, .uneditable-input { /* navbar styling */ .navbar-default { - background-color: #333333; + background-color: #333; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333'); background-image: -ms-linear-gradient(top, #555555 0%, #333333 100%); background-image: -moz-linear-gradient(top, #555555 0%, #333333 100%); @@ -808,54 +808,54 @@ input, textarea, select, .uneditable-input { } .navbar-default .navbar-brand { - color: #ffffff; + color: #fff; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-default .navbar-text { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-nav > li > a { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } .navbar-default .navbar-toggle { - border-color: #cccccc; + border-color: #ccc; } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { - background-color: #333333; + background-color: #333; } .navbar-default .navbar-toggle .icon-bar { - background-color: #333333; + background-color: #333; } .navbar-default .navbar-collapse, @@ -866,39 +866,39 @@ input, textarea, select, .uneditable-input { .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { - background-color: #333333; - color: #ffffff; + background-color: #333; + color: #fff; } @media (max-width: 767px) { - .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #dddddd; - } - .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #ddd; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #fff; background-color: transparent; - } - .navbar-default .navbar-nav .open .dropdown-menu > .active > a, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; - background-color: #333333; - } - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #fff; + background-color: #333; + } + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #ccc; background-color: transparent; - } + } } .navbar-default .navbar-link { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-link:hover { - color: #ffffff; + color: #fff; } .navbar-default .btn-link { @@ -907,14 +907,14 @@ input, textarea, select, .uneditable-input { .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #dddddd; + color: #ddd; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { - color: #cccccc; + color: #ccc; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { @@ -934,7 +934,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .btn { - color: #333333; + color: #333; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f5f5f5; *background-color: #e6e6e6; @@ -944,7 +944,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); background-image: linear-gradient(top, #ffffff, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - border: 1px solid #cccccc; + border: 1px solid #ccc; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-bottom-color: #b3b3b3; @@ -966,11 +966,11 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #ccc \9; } .btn:hover { - color: #333333; + color: #333; background-color: #e6e6e6; *background-color: #d9d9d9; background-position: 0 -15px; @@ -1037,7 +1037,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-info:hover, .btn-inverse, .btn-inverse:hover { - color: #ffffff; + color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } @@ -1202,7 +1202,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-inverse { background-color: #414141; - *background-color: #222222; + *background-color: #222; background-image: -ms-linear-gradient(top, #555555, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); background-image: -webkit-linear-gradient(top, #555555, #222222); @@ -1210,7 +1210,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-image: -moz-linear-gradient(top, #555555, #222222); background-image: linear-gradient(top, #555555, #222222); background-repeat: repeat-x; - border-color: #222222 #222222 #000000; + border-color: #222 #222 #000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); @@ -1221,7 +1221,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { - background-color: #222222; + background-color: #222; *background-color: #151515; } diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index b5ba05ec..f9e9f8a8 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -201,14 +201,14 @@ inc_top.tmpl } .ui-widget-header { - background: #ffffff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; + background: #fff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - background: #ffffff; - border: 1px solid #CCCCCC; + background: #fff; + border: 1px solid #CCC; } .ui-state-hover, @@ -217,7 +217,7 @@ inc_top.tmpl .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - background: #ffffff; + background: #fff; } .ui-state-active, @@ -270,11 +270,11 @@ inc_top.tmpl } .ui-widget-overlay { - background: #aaaaaa url("../css/lib/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + background: #aaa url("../css/lib/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; } .ui-widget-shadow { - background: #000000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; + background: #000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { @@ -303,7 +303,7 @@ inc_top.tmpl .ui-tabs .ui-tabs-panel { background-color: #F7F7F7 !important; - border: 1px solid #CCCCCC !important; + border: 1px solid #CCC !important; } .ui-tabs .ui-tabs-nav li.ui-tabs-active { @@ -578,7 +578,7 @@ home.tmpl text-shadow: 0 0 0.1em #fff; vertical-align: middle; font-size: 12px; - color: #000000; + color: #000; } .progress-80 { @@ -1220,23 +1220,27 @@ ul.tags li a{ vertical-align: -2px; } +.airdate-never { + background-color: #eae2c8; + color: #666 +} .unaired { - background-color: #f5f1e4; + background-color: #f5f1e4; } .skipped { - background-color: #bedeed; + background-color: #bedeed; } .good { - background-color: #c3e3c8; + background-color: #c3e3c8; } .qual { - background-color: #ffda8a; + background-color: #ffda8a; } .wanted { - background-color: #ffb0b0; + background-color: #ffb0b0; } .snatched { - background-color: #ebc1ea; + background-color: #ebc1ea; } span.unaired { @@ -1270,7 +1274,7 @@ span.good b, span.qual b, span.wanted b, span.snatched b { - color: #000000; + color: #000; font-weight: 800; } @@ -1390,7 +1394,7 @@ td.col-legend { th.col-search, td.col-search { - width: 46px; + width: 46px; } .showLegend { @@ -1521,7 +1525,7 @@ h2.day, h2.network { } .tvshowTitle a { - color: #000000; + color: #000; float: left; line-height: 1.4em; font-size: 1.4em; @@ -1582,7 +1586,7 @@ h2.day, h2.network { } .daybydayWrapper { - max-width: 1400px; + max-width: 1400px; margin: 0 auto; padding: 0; /*3px*/ } @@ -1951,7 +1955,7 @@ select .selected { list-style-type: none; } -#provider_order_list, +#provider_order_list, #service_order_list { width: 250px; padding-left: 20px; @@ -2000,7 +2004,7 @@ select .selected { font-size: 14px; } -#provider_order_list input, +#provider_order_list input, #service_order_list input { margin: 0 5px 0 2px; vertical-align: middle; @@ -2021,13 +2025,13 @@ select .selected { width: 220px !important; } -.infoTableHeader, +.infoTableHeader, .infoTableCell { padding: 5px; } -.infoTableSeperator { - border-top: 1px dotted #666666; +.infoTableSeperator { + border-top: 1px dotted #666; } [class^="icon16-"], @@ -2115,7 +2119,7 @@ config_postProcessing.tmpl #failed-guide, #failed-guide .title, #failed-guide li { - margin: 0; + margin: 0; padding: 0; } @@ -2248,7 +2252,7 @@ td.tableright { .separator { font-size: 90%; - color: #333333; + color: #333; } a.whitelink { @@ -2302,7 +2306,7 @@ span.quality { -webkit-box-shadow:inset 0 1px rgba(255, 255, 255, 0.1),inset 0 -1px 3px rgba(0, 0, 0, 0.3),inset 0 0 0 1px rgba(255, 255, 255, 0.08),0 1px 2px rgba(0, 0, 0, 0.15); box-shadow:inset 0 1px rgba(255, 255, 255, 0.1),inset 0 -1px 3px rgba(0, 0, 0, 0.3),inset 0 0 0 1px rgba(255, 255, 255, 0.08),0 1px 2px rgba(0, 0, 0, 0.15); text-shadow: 0 1px rgba(0, 0, 0, 0.8); - color: #FFFFFF; + color: #FFF; display: inline-block; padding: 2px 4px; text-align: center; @@ -2463,15 +2467,15 @@ div.blackwhitelist.manual { bootstrap Overrides ========================================================================== */ -body { - padding-top: 60px; +body { + padding-top: 60px; overflow-y: scroll; font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; color: #000; } -html * { - outline: 0 !important; +html * { + outline: 0 !important; } input[type="checkbox"] { @@ -2500,54 +2504,54 @@ input, textarea, select, .uneditable-input { /* navbar styling */ .navbar-default .navbar-brand { - color: #ffffff; + color: #fff; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-default .navbar-text { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-nav > li > a { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } .navbar-default .navbar-toggle { - border-color: #cccccc; + border-color: #ccc; } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { - background-color: #333333; + background-color: #333; } .navbar-default .navbar-toggle .icon-bar { - background-color: #333333; + background-color: #333; } .navbar-default .navbar-collapse, @@ -2558,39 +2562,39 @@ input, textarea, select, .uneditable-input { .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { - background-color: #333333; - color: #ffffff; + background-color: #333; + color: #fff; } @media (max-width: 767px) { - .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #dddddd; - } - .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #ddd; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #fff; background-color: transparent; - } - .navbar-default .navbar-nav .open .dropdown-menu > .active > a, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; - background-color: #333333; - } - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #fff; + background-color: #333; + } + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #ccc; background-color: transparent; - } + } } .navbar-default .navbar-link { - color: #dddddd; + color: #ddd; } .navbar-default .navbar-link:hover { - color: #ffffff; + color: #fff; } .navbar-default .btn-link { @@ -2599,14 +2603,14 @@ input, textarea, select, .uneditable-input { .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #dddddd; + color: #ddd; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { - color: #cccccc; + color: #ccc; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { @@ -2626,7 +2630,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .form-control { - color: #000000; + color: #000; } .form-control-inline { @@ -2666,7 +2670,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #ccc \9; } .btn:first-child { @@ -2674,7 +2678,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .btn:hover { - color: #333333; + color: #333; text-decoration: none; background-color: #e6e6e6; *background-color: #d9d9d9; @@ -2756,7 +2760,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-info:hover, .btn-inverse, .btn-inverse:hover { - color: #ffffff; + color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } @@ -2921,7 +2925,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-inverse { background-color: #414141; - *background-color: #222222; + *background-color: #222; background-image: -ms-linear-gradient(top, #555555, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); background-image: -webkit-linear-gradient(top, #555555, #222222); @@ -2929,7 +2933,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-image: -moz-linear-gradient(top, #555555, #222222); background-image: linear-gradient(top, #555555, #222222); background-repeat: repeat-x; - border-color: #222222 #222222 #000000; + border-color: #222 #222 #000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); @@ -2940,7 +2944,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { - background-color: #222222; + background-color: #222; *background-color: #151515; } diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl index 7552c563..5601f7b2 100644 --- a/gui/slick/interfaces/default/displayShow.tmpl +++ b/gui/slick/interfaces/default/displayShow.tmpl @@ -143,7 +143,8 @@
- +
@@ -160,15 +161,15 @@ #set $_show = $show #if not $sickbeard.USE_IMDB_INFO or not $show.imdbid - ($show.startyear) - $show.runtime minutes - + #echo ('(%s) - ' % $show.startyear, '')['' == $show.startyear]##echo ('%s minutes - ' % $show.runtime, '')['' == $show.runtime]# #else - #if 'country_codes' in $show.imdb_info: + #if 'country_codes' in $show.imdb_info and '' != $show.imdb_info['country_codes']: #for $country in $show.imdb_info['country_codes'].split('|') #end for #end if #if 'year' in $show.imdb_info: - ($show.imdb_info['year']) - $show.imdb_info['runtimes'] minutes + #echo ('(%s) - ' % $show.imdb_info['year'], '')['' == $show.imdb_info['year']]##echo ('%s minutes' % $show.imdb_info['runtimes'], '')['' == $show.imdb_info['runtimes']]# #end if [imdb] #end if @@ -189,7 +190,7 @@
#end if #end if -#if $sickbeard.USE_IMDB_INFO and 'year' in $show.imdb_info: +#if $sickbeard.USE_IMDB_INFO and 'genres' in $show.imdb_info and '' != $show.imdb_info['genres']:
    #for $imdbgenre in $show.imdb_info['genres'].split('|') @@ -208,7 +209,9 @@ #else if $show.airs: Originally airs$show.airs #if not $network_timezones.test_timeformat($show.airs) then ' (invalid Timeformat) ' else ''# #end if +#if '' != $show.status: Status$show.status +#end if #if $showLoc[1]: Location$showLoc[0] #else: @@ -385,11 +388,12 @@ #end if #set $epLoc = $epResult['location'] + #set never_aired = 0 < $curSeason and 1 == int($epResult['airdate']) - + - #if $UNAIRED != int($epResult['status']) + #if $UNAIRED != int($epResult['status']) and not $never_aired #end if