From ccb9bb329ce32c5955f0962a9bcc65373170d691 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Tue, 16 Dec 2014 14:14:54 +0000 Subject: [PATCH] Coming Episodes Overhaul. Change Coming Episodes to "Episodes" page (API endpoint is not renamed). Add coming episodes to episode view renaming to config migration code. Change Layout term "Calender" to "Day by Day" on Episodes page. Fix saving of sort modes to config file on Episodes page. Add qTip episode plots to "Day by Day" on Episodes page. Add article sorting to networks on Episodes page. Add toggle sort direction and multidimensional sort to isotope on Episodes page. Add text "[paused]" where appropriate to shows on layout Day by Day. Simplified sort code in webserver and in template. Change page auto refresh from 10 to 30 mins. Add other UI tweaks. --- CHANGES.md | 18 +- gui/slick/css/dark.css | 399 +++++----- gui/slick/css/light.css | 205 +++--- gui/slick/css/style.css | 240 +++--- gui/slick/interfaces/default/apiBuilder.tmpl | 4 +- .../interfaces/default/comingEpisodes.tmpl | 626 ---------------- .../interfaces/default/config_general.tmpl | 2 +- gui/slick/interfaces/default/episodeView.tmpl | 695 ++++++++++++++++++ .../default/home_trendingShows.tmpl | 2 +- gui/slick/interfaces/default/inc_top.tmpl | 6 +- gui/slick/js/plotTooltip.js | 2 +- sickbeard/__init__.py | 28 +- sickbeard/config.py | 16 +- sickbeard/webapi.py | 40 +- sickbeard/webserve.py | 101 ++- 15 files changed, 1233 insertions(+), 1151 deletions(-) delete mode 100644 gui/slick/interfaces/default/comingEpisodes.tmpl create mode 100644 gui/slick/interfaces/default/episodeView.tmpl diff --git a/CHANGES.md b/CHANGES.md index ebe7c185..6adf19de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -### 0.x.x (2014-12-xx xx:xx:xx UTC) +### 0.x.x (2015-01-xx xx:xx:xx UTC) * Add network logos BBC Canada, Crackle, El Rey Network, SKY Atlantic, and Watch * Change Yahoo! screen network logo @@ -20,9 +20,19 @@ * Fix anime searches on BTN provider * Change replace "Daily-Search" with "Recent-Search" * Add daily search to recent search renaming to config migration code -* Change Coming Episodes calendar view to a fluid layout, change episode layout design, and add day and month in column headers. -* Add isotope plug-in to Coming Episodes calendar view to enable sort columns by Date, Network, and Show name. -* Add imagesLoaded plug-in to prevent layout breakage by calling isotope to update content after a page auto-refresh. +* Change Coming Episodes calendar view to a fluid layout, change episode layout design, and add day and month in column headers +* Add isotope plug-in to Coming Episodes calendar view to enable sort columns by Date, Network, and Show name +* Add imagesLoaded plug-in to prevent layout breakage by calling isotope to update content after a page auto-refresh +* Change Coming Episodes to "Episodes" page (API endpoint is not renamed) +* Add coming episodes to episode view renaming to config migration code +* Change Layout term "Calender" to "Day by Day" on Episodes page +* Fix saving of sort modes to config file on Episodes page +* Add qTip episode plots to "Day by Day" on Episodes page +* Add article sorting to networks on Episodes page +* Add toggle sort direction and multidimensional sort to isotope on Episodes page +* Add text "[paused]" where appropriate to shows on layout Day by Day on Episodes page +* Change Epsiodes page auto refresh from 10 to 30 mins +* Add UI tweaks [develop changelog] diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 3a7d45dc..7a0083ad 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -149,22 +149,18 @@ inc_top.tmpl margin-bottom: -15px; } -#contentWrapper { -/* background: url("../images/bg.png") repeat 0 0 transparent; */ +[class^="icon-"], +[class*=" icon-"] { + background-image: url("../images/glyphicons-halflings.png"); } -[class^="icon-"], -[class*=" icon-"] { - background-image: url("../images/glyphicons-halflings.png"); +.icon-white { + background-image: url("../images/glyphicons-halflings-white.png"); } -.icon-white { - background-image: url("../images/glyphicons-halflings-white.png"); -} - -.dropdown-menu li > a:hover > [class^="menu-icon-"], -.dropdown-menu li > a:hover > [class*=" menu-icon-"] { - background-image: url("../images/menu/menu-icons-white.png"); +.dropdown-menu li > a:hover > [class^="menu-icon-"], +.dropdown-menu li > a:hover > [class*=" menu-icon-"] { + background-image: url("../images/menu/menu-icons-white.png"); } .infoTableHeader .icon16-sb { @@ -172,29 +168,29 @@ inc_top.tmpl } .ui-autocomplete-loading { - background: white url("../images/loading16.gif") right center no-repeat; + background: white url("../images/loading16.gif") right center no-repeat; } -.browserDialog.busy .ui-dialog-buttonpane { - background: url("../images/loading.gif") 10px 50% no-repeat !important; +.browserDialog.busy .ui-dialog-buttonpane { + background: url("../images/loading.gif") 10px 50% no-repeat !important; } -.ui-progressbar .ui-progressbar-overlay { - background: url("../css/lib/images/animated-overlay.gif"); +.ui-progressbar .ui-progressbar-overlay { + background: url("../css/lib/images/animated-overlay.gif"); } -.ui-dialog, -.ui-dialog-buttonpane { - background: #2a2a2a !important;; +.ui-dialog, +.ui-dialog-buttonpane { + background: #2a2a2a !important;; } -.ui-accordion-content, -.ui-tabs-panel { - background: #ededed !important; - background-image: none !important; +.ui-accordion-content, +.ui-tabs-panel { + background: #ededed !important; + background-image: none !important; } -.ui-widget-content { +.ui-widget-content { background: #606060; border: 1px solid #111; color: #fff; @@ -208,82 +204,82 @@ inc_top.tmpl color: #09A2FF; } -.ui-widget-header { +.ui-widget-header { background: #3d3d3d; border: 1px solid #111; color: #fff; } -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default { +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { border: 1px solid #111; } -.ui-state-hover, -.ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus { - background: #3d3d3d; -} - -.ui-state-active, -.ui-widget-content .ui-state-active, -.ui-widget-header .ui-state-active { +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus { background: #3d3d3d; } -.ui-state-highlight, -.ui-widget-content .ui-state-highlight, -.ui-widget-header .ui-state-highlight { - background: #fbf9ee url("../css/lib/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + background: #3d3d3d; } -.ui-state-error, -.ui-widget-content .ui-state-error, -.ui-widget-header .ui-state-error { - background: #fef1ec url("../css/lib/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + background: #fbf9ee url("../css/lib/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; } -.ui-icon, -.ui-widget-content .ui-icon { - background-image: url("../css/lib/images/ui-icons_ffffff_256x240.png"); +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + background: #fef1ec url("../css/lib/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; } -.ui-widget-header .ui-icon { - background-image: url("../css/lib/images/ui-icons_222222_256x240.png"); +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url("../css/lib/images/ui-icons_ffffff_256x240.png"); } -.ui-state-default .ui-icon { - background-image: url('../css/lib/images/ui-icons_09a2ff_256x240.png'); +.ui-widget-header .ui-icon { + background-image: url("../css/lib/images/ui-icons_222222_256x240.png"); } -.ui-state-hover .ui-icon, -.ui-state-focus .ui-icon { - background-image: url("../css/lib/images/ui-icons_222222_256x240.png"); +.ui-state-default .ui-icon { + background-image: url('../css/lib/images/ui-icons_09a2ff_256x240.png'); } -.ui-state-active .ui-icon { - background-image: url("../css/lib/images/ui-icons_8c291d_256x240.png"); +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url("../css/lib/images/ui-icons_222222_256x240.png"); } -.ui-state-highlight .ui-icon { - background-image: url("../css/lib/images/ui-icons_2e83ff_256x240.png"); +.ui-state-active .ui-icon { + background-image: url("../css/lib/images/ui-icons_8c291d_256x240.png"); } -.ui-state-error .ui-icon, -.ui-state-error-text .ui-icon { - background-image: url("../css/lib/images/ui-icons_cd0a0a_256x240.png"); +.ui-state-highlight .ui-icon { + background-image: url("../css/lib/images/ui-icons_2e83ff_256x240.png"); } -.ui-widget-overlay { - background: #000000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url("../css/lib/images/ui-icons_cd0a0a_256x240.png"); } -.ui-widget-shadow { - background: #000000 url("../css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; +.ui-widget-overlay { + background: #000000 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; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { @@ -301,21 +297,21 @@ inc_top.tmpl } .ui-tabs { - padding: 0px; + padding: 0; background: none; - border-width: 0px; + border-width: 0; } .ui-tabs .ui-tabs-nav { - padding-left: 0px; + padding-left: 0; background: transparent; - border-width: 0px 0px 0px 0px; - -moz-border-radius: 0px; - -webkit-border-radius: 0px; - border-radius: 0px; + border-width: 0 0 0 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; } -.ui-tabs .ui-tabs-panel { +.ui-tabs .ui-tabs-panel { background-color: #3d3d3d !important; border: 1px solid #111 !important; } @@ -331,15 +327,6 @@ inc_top.tmpl border-top-right-radius: 5px; } -#content { - width: 95%; - min-width: 875px; - padding: 15px; - margin-left: auto; - margin-right: auto; - clear: both; -} - #SubMenu { padding-right: 20px; clear: both; @@ -348,12 +335,12 @@ inc_top.tmpl } .upgrade-notification { - width: 600px; - text-align: center; - margin-left: auto; - margin-right: auto; - margin-top: 50px; - margin-bottom: 0px; + width: 600px; + text-align: center; + margin-left: auto; + margin-right: auto; + margin-top: 50px; + margin-bottom: 0; } [class^="menu-icon-"], [class*=" menu-icon-"] { @@ -379,83 +366,83 @@ inc_top.tmpl } .menu-icon-addshow { - background-position: 0px 0px; + background-position: 0 0; } .menu-icon-anime { - background-position: -21px 0px; + background-position: -21px 0; } .menu-icon-backlog-view { - background-position: -42px 0px; + background-position: -42px 0; } .menu-icon-backlog { - background-position: -63px 0px; + background-position: -63px 0; } .menu-icon-bittorrent { - background-position: -84px 0px; + background-position: -84px 0; } .menu-icon-config-index { - background-position: -105px 0px; + background-position: -105px 0; } .menu-icon-config { - background-position: -126px 0px; + background-position: -126px 0; } .menu-icon-failed-download { - background-position: -147px 0px; + background-position: -147px 0; } .menu-icon-home { - background-position: -168px 0px; + background-position: -168px 0; } .menu-icon-manage { - background-position: -189px 0px; + background-position: -189px 0; } .menu-icon-manage-searches { - background-position: -210px 0px; + background-position: -210px 0; } .menu-icon-poster { - background-position: -231px 0px; + background-position: -231px 0; } .menu-icon-postprocess { - background-position: -252px 0px; + background-position: -252px 0; } .menu-icon-restart { - background-position: -273px 0px; + background-position: -273px 0; } .menu-icon-shutdown { - background-position: -294px 0px; + background-position: -294px 0; } .menu-icon-update { - background-position: -315px 0px; + background-position: -315px 0; } .menu-icon-viewlog-errors { - background-position: -336px 0px; + background-position: -336px 0; } .menu-icon-viewlog { - background-position: -357px 0px; + background-position: -357px 0; } .menu-icon-xbmc { - background-position: -378px 0px; + background-position: -378px 0; } .menu-icon-help { - background-position: -399px 0px; + background-position: -399px 0; } [class^="submenu-icon-"], [class*=" submenu-icon-"] { @@ -465,27 +452,27 @@ inc_top.tmpl } .submenu-icon-anime { - background-position: -21px 0px; + background-position: -21px 0; } .submenu-icon-bittorrent { - background-position: -84px 0px; + background-position: -84px 0; } .submenu-icon-failed-download { - background-position: -147px 0px; + background-position: -147px 0; } .submenu-icon-restart { - background-position: -273px 0px; + background-position: -273px 0; } .submenu-icon-shutdown { - background-position: -294px 0px; + background-position: -294px 0; } .submenu-icon-xbmc { - background-position: -378px 0px; + background-position: -378px 0; } /* ======================================================================= @@ -622,42 +609,42 @@ home.tmpl } .show .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 0px; + border-bottom-right-radius: 0; } .show .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 0px; + border-bottom-left-radius: 0; } .show .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 0px; + border-top-right-radius: 0; } .show .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 0px; + border-top-left-radius: 0; } .show .ui-widget-content { border-top: 1px solid #111; border-bottom: 1px solid #111; - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; } .show .progress-80 { - border-radius: 0px; + border-radius: 0; } .show .progress-60 { - border-radius: 0px; + border-radius: 0; } .show .progress-40 { - border-radius: 0px; + border-radius: 0; } .show .progress-20 { - border-radius: 0px; + border-radius: 0; } .show-title { @@ -665,7 +652,7 @@ home.tmpl overflow: hidden; white-space: nowrap; font-size: 11px; - margin: 4px 4px 0px 4px; + margin: 4px 4px 0 4px; } .show-title:after { @@ -674,7 +661,7 @@ home.tmpl position: absolute; width: 20px; height: 100%; - top: 0; + top: 0; right: 0; background-image: -webkit-linear-gradient(right, rgba(51, 51, 51, 1), rgba(51, 51, 51, 0)); background-image: -moz-linear-gradient(right, rgba(51, 51, 51, 1), rgba(51, 51, 51, 0)); @@ -688,7 +675,7 @@ home.tmpl overflow: hidden; white-space: nowrap; font-size: 11px; - margin: 0px 4px 4px 4px; + margin: 0 4px 4px 4px; } .show-date:after { @@ -697,7 +684,7 @@ home.tmpl position: absolute; width: 20px; height: 100%; - top: 0; + top: 0; right: 0; background-image: -webkit-linear-gradient(right, rgba(51, 51, 51, 1), rgba(51, 51, 51, 0)); background-image: -moz-linear-gradient(right, rgba(51, 51, 51, 1), rgba(51, 51, 51, 0)); @@ -706,8 +693,8 @@ home.tmpl background-image: linear-gradient(to left, rgba(51, 51, 51, 1), rgba(51, 51, 51, 0)); } -.show-table { - text-align:center; +.show-table { + text-align:center; vertical-align:middle; width: 33% } @@ -745,7 +732,7 @@ home.tmpl #sort-by { display: inline; - list-style-type: none; + list-style-type: none; padding: 0; margin-left: 5px; } @@ -815,20 +802,20 @@ home_trendingShows.tmpl padding-bottom: 4px; } -.traktContainer p { +.traktContainer p { padding-top: 2px; } -.traktContainer p img { +.traktContainer p img { position: relative; top: -2px; } -.traktContainer p, .traktContainer i { +.traktContainer p, .traktContainer i { white-space: nowrap; font-size: 12px; overflow: hidden; -/* text-shadow: 1px 1px 0px #000;*/ +/* text-shadow: 1px 1px 0 #000;*/ padding-left: 4px; margin: 0; } @@ -864,7 +851,7 @@ home_postprocess.tmpl /* ======================================================================= -displayShow.tmpl +displayShow.tmpl ========================================================================== */ #showCol { @@ -894,7 +881,7 @@ h1.title { } .displayspecials { - position: relative; + position: relative; top: -24px; } @@ -902,7 +889,7 @@ h1.title { cursor: default; } -#showinfo { +#showinfo { display: inline-block; position: relative; top: -3px; @@ -928,7 +915,7 @@ ul.tags li { border: 1px solid #111; color: #FFF; font: 14px/18px "Open Sans", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; - text-shadow: 0px 1px rgba(0, 0, 0, 0.8); + text-shadow: 0 1px rgba(0, 0, 0, 0.8); float: left; } @@ -1066,7 +1053,7 @@ span.snatched b { white-space: nowrap; } -.sickbeardTable th, +.sickbeardTable th, .sickbeardTable td { border-top: 1px solid #222; border-left: 1px solid #222; @@ -1168,7 +1155,7 @@ td.col-search { } /* ======================================================================= -comingEpisodes.tmpl +episodeView.tmpl ========================================================================== */ .sort_data { @@ -1227,7 +1214,7 @@ h2.day, h2.network { letter-spacing: 1px; color: #FFF; text-align: center; - text-shadow: -1px -1px 0px rgba(0, 0, 0, 0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #15528F; } @@ -1236,7 +1223,7 @@ h2.day, h2.network { clear: both; border: 1px solid #ccc; margin: auto; - padding: 0px; + padding: 0; text-align: left; width: 750px; border-radius: 5px; @@ -1325,7 +1312,7 @@ h2.day, h2.network { color: #09A2FF; } -.calendar-row .day-number { +.day-of-week .day-number { background-color: #15528F; color: #fff; } @@ -1334,22 +1321,34 @@ h2.day, h2.network { color: #8dbeee; } -.odd .calendar-show { +.odd .daybyday-show { background-color: #333; } -.even .calendar-show { +.even .daybyday-show { background-color: #3d3d3d; } - -.calendar-row .poster img { - border: 1px solid #111; +.daybyday-show .episode-blank { + background-color: rgba(0,0,0,.1); + border-radius: 3px; } -.calendar-row .text .airtime, -.calendar-row .text .episode-title { +.day-of-week .poster img { + border-color: #111; +} + +.day-of-week .text .airtime, +.day-of-week .text .episode, +.day-of-week .text .episode .name { color: #fff; } +.day-of-week .text .episode .season, +.day-of-week .text .episode .number { + color: rgb(9, 162, 255); +} +.day-of-week .text .episode { + color: rgb(141, 190, 238); +} /* ======================================================================= config*.tmpl @@ -1385,7 +1384,7 @@ config*.tmpl } #config div.field-pair { - padding: 12px 0px; + padding: 12px 0; } #config .nocheck, #config div #customQuality, .metadataDiv { @@ -1423,14 +1422,14 @@ select .selected { list-style-type: none; } -#provider_order_list, +#provider_order_list, #service_order_list { width: 250px; padding-left: 20px; list-style-type: none; } -#provider_order_list li, +#provider_order_list li, #service_order_list li { background: #333 !important; color: #fff; @@ -1447,13 +1446,13 @@ select .selected { width: 220px !important; } -.infoTableHeader, +.infoTableHeader, .infoTableCell { padding: 5px; } -.infoTableSeperator { - border-top: 1px dotted #666666; +.infoTableSeperator { + border-top: 1px dotted #666666; } /* ======================================================================= @@ -1570,7 +1569,7 @@ td.tableright { text-align: left; vertical-align: middle; width: 225px; - padding: 6px 0px; + padding: 6px 0; } .optionWrapper div.selectChoices { @@ -1604,7 +1603,6 @@ Global ========================================================================== */ span.path { - padding: 3px 6px; color: #09A2FF; background-color: #333; } @@ -1616,13 +1614,13 @@ span.path { span.quality { font: 12px/13px "Open Sans", verdana, sans-serif; - background-image:-webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:-moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:-o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - -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: 0px 1px rgba(0, 0, 0, 0.8); + background-image:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:-moz-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:-o-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + -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; display: inline-block; padding: 2px 4px; @@ -1713,7 +1711,7 @@ option.flag { div.blackwhitelist{ float:left; - text-align: center; + text-align: center; } div.blackwhitelist input { @@ -1742,7 +1740,7 @@ div.blackwhitelist span { } div.blackwhitelist.anidb, div.blackwhitelist.manual { - margin: 7px 0px; + margin: 7px 0; } @@ -1750,8 +1748,8 @@ div.blackwhitelist.anidb, 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: #fff; @@ -1759,7 +1757,7 @@ body { } input[type="radio"] { - margin: 2px 0px 0px; + margin: 2px 0 0; line-height: normal; } @@ -1774,7 +1772,7 @@ input, textarea, select, .uneditable-input { } .navbar-brand { - padding: 0px; + padding: 0; } /* navbar styling */ @@ -1914,7 +1912,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .dropdown-menu { background-color: #333; border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.176); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176); } .form-control { @@ -2392,10 +2390,10 @@ pnotify.css background-image: -o-linear-gradient(#333, #3d3d3d) !important; filter: progid:dximagetransform.microsoft.gradient(startColorstr=#333, endColorstr=#3d3d3d) !important; -ms-filter: progid:dximagetransform.microsoft.gradient(startColorstr=#333, endColorstr=#3d3d3d) !important; - -moz-box-shadow: 0px 0px 2px #000; - -webkit-box-shadow: 0px 0px 2px #000; - -o-box-shadow: 0px 0px 2px #000; - box-shadow: 0px 0px 2px #000; + -moz-box-shadow: 0 0 2px #000; + -webkit-box-shadow: 0 0 2px #000; + -o-box-shadow: 0 0 2px #000; + box-shadow: 0 0 2px #000; } .ui-pnotify-title { @@ -2433,7 +2431,7 @@ tablesorter.css .tablesorter th { color: #fff; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #15528F; } @@ -2504,7 +2502,7 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot tr { color: #fff; text-align: center; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #333; border-collapse: collapse; } @@ -2656,10 +2654,19 @@ span.token-input-delete-token { background-color: rgb(40, 40, 40); } +/*.episodeview-daybyday .time .time-min,*/ +.episodeview-daybyday .time .time-hr-min, +.episodeview-daybyday .time .time-am-pm, #addRootDirTable td label .filepath, .grey-text { color:#999 } +/*.episodeview-daybyday .time .time-hr-min{ + display:none +} +.episodeview-daybyday .time .time-min{ + font-size: 11px; +}*/ #newShowPortal #displayText .show-name, #newShowPortal #displayText .show-dest, @@ -2682,8 +2689,8 @@ jquery.confirm.css top: 0; left: 0; background: url('../images/bg.gif'); - background: -moz-linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.5)) repeat-x rgba(0,0,0,0.5); - background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0.5)), to(rgba(0,0,0,0.5))) repeat-x rgba(0,0,0,0.5); + background: -moz-linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)) repeat-x rgba(0, 0, 0, 0.5); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.5))) repeat-x rgba(0, 0, 0, 0.5); z-index: 100000; } @@ -2695,7 +2702,7 @@ jquery.confirm.css top: 50%; margin: -130px 0 0 -230px; border: 1px solid #111; - box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.175); + box-shadow: 0 0 12px 0 rgba(0, 0, 0, 0.175); } #confirmBox h1, @@ -2709,13 +2716,13 @@ jquery.confirm.css color: #fff; margin: 0; font-size: 22px; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); } #confirmBox p { padding-top: 20px; color: #fff; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); } #confirmButtons { @@ -2730,7 +2737,7 @@ jquery.confirm.css display: inline-block; color: #fff; text-align:center; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); background-clip: padding-box; border: 1px solid #111; border-radius: 3px; @@ -2738,12 +2745,12 @@ jquery.confirm.css -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: -moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: -o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - -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); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + -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); } #confirmBox .button:last-child { diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index fc2dd64d..8ebbbfe5 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -149,11 +149,7 @@ inc_top.tmpl margin-bottom: -15px; } -#contentWrapper { -/* background: url("../images/bg.png") repeat 0 0 transparent; */ -} - -[class^="icon-"], +[class^="icon-"], [class*=" icon-"] { background-image: url("../images/glyphicons-halflings.png"); } @@ -289,18 +285,18 @@ inc_top.tmpl } .ui-tabs { - padding: 0px; + padding: 0; background: none; - border-width: 0px; + border-width: 0; } .ui-tabs .ui-tabs-nav { - padding-left: 0px; + padding-left: 0; background: transparent; - border-width: 0px 0px 0px 0px; - -moz-border-radius: 0px; - -webkit-border-radius: 0px; - border-radius: 0px; + border-width: 0 0 0 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; } .ui-tabs .ui-tabs-panel { @@ -318,15 +314,6 @@ inc_top.tmpl border-top-right-radius: 5px; } -#content { - width: 95%; - min-width: 875px; - padding: 15px; - margin-left: auto; - margin-right: auto; - clear: both; -} - #SubMenu { padding-right: 20px; clear: both; @@ -340,7 +327,7 @@ inc_top.tmpl margin-left: auto; margin-right: auto; margin-top: 50px; - margin-bottom: 0px; + margin-bottom: 0; } [class^="menu-icon-"], [class*=" menu-icon-"] { @@ -366,83 +353,83 @@ inc_top.tmpl } .menu-icon-addshow { - background-position: 0px 0px; + background-position: 0 0; } .menu-icon-anime { - background-position: -21px 0px; + background-position: -21px 0; } .menu-icon-backlog-view { - background-position: -42px 0px; + background-position: -42px 0; } .menu-icon-backlog { - background-position: -63px 0px; + background-position: -63px 0; } .menu-icon-bittorrent { - background-position: -84px 0px; + background-position: -84px 0; } .menu-icon-config-index { - background-position: -105px 0px; + background-position: -105px 0; } .menu-icon-config { - background-position: -126px 0px; + background-position: -126px 0; } .menu-icon-failed-download { - background-position: -147px 0px; + background-position: -147px 0; } .menu-icon-home { - background-position: -168px 0px; + background-position: -168px 0; } .menu-icon-manage { - background-position: -189px 0px; + background-position: -189px 0; } .menu-icon-manage-searches { - background-position: -210px 0px; + background-position: -210px 0; } .menu-icon-poster { - background-position: -231px 0px; + background-position: -231px 0; } .menu-icon-postprocess { - background-position: -252px 0px; + background-position: -252px 0; } .menu-icon-restart { - background-position: -273px 0px; + background-position: -273px 0; } .menu-icon-shutdown { - background-position: -294px 0px; + background-position: -294px 0; } .menu-icon-update { - background-position: -315px 0px; + background-position: -315px 0; } .menu-icon-viewlog-errors { - background-position: -336px 0px; + background-position: -336px 0; } .menu-icon-viewlog { - background-position: -357px 0px; + background-position: -357px 0; } .menu-icon-xbmc { - background-position: -378px 0px; + background-position: -378px 0; } .menu-icon-help { - background-position: -399px 0px; + background-position: -399px 0; } [class^="submenu-icon-"], [class*=" submenu-icon-"] { @@ -452,27 +439,27 @@ inc_top.tmpl } .submenu-icon-anime { - background-position: -21px 0px; + background-position: -21px 0; } .submenu-icon-bittorrent { - background-position: -84px 0px; + background-position: -84px 0; } .submenu-icon-failed-download { - background-position: -147px 0px; + background-position: -147px 0; } .submenu-icon-restart { - background-position: -273px 0px; + background-position: -273px 0; } .submenu-icon-shutdown { - background-position: -294px 0px; + background-position: -294px 0; } .submenu-icon-xbmc { - background-position: -378px 0px; + background-position: -378px 0; } /* ======================================================================= @@ -609,42 +596,42 @@ home.tmpl } .show .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 0px; + border-bottom-right-radius: 0; } .show .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 0px; + border-bottom-left-radius: 0; } .show .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 0px; + border-top-right-radius: 0; } .show .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 0px; + border-top-left-radius: 0; } .show .ui-widget-content { border-top: 1px solid #111; border-bottom: 1px solid #111; - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; } .show .progress-80 { - border-radius: 0px; + border-radius: 0; } .show .progress-60 { - border-radius: 0px; + border-radius: 0; } .show .progress-40 { - border-radius: 0px; + border-radius: 0; } .show .progress-20 { - border-radius: 0px; + border-radius: 0; } .show-title { @@ -652,7 +639,7 @@ home.tmpl overflow: hidden; white-space: nowrap; font-size: 11px; - margin: 4px 4px 0px 4px; + margin: 4px 4px 0 4px; } .show-title:after { @@ -675,7 +662,7 @@ home.tmpl overflow: hidden; white-space: nowrap; font-size: 11px; - margin: 0px 4px 4px 4px; + margin: 0 4px 4px 4px; } .show-date:after { @@ -815,7 +802,7 @@ home_trendingShows.tmpl white-space: nowrap; font-size: 12px; overflow: hidden; -/* text-shadow: 1px 1px 0px #000;*/ +/* text-shadow: 1px 1px 0 #000;*/ padding-left: 4px; margin: 0; } @@ -917,7 +904,7 @@ ul.tags li { border: 1px solid #111; color: #FFF; font: 14px/18px "Open Sans", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; - text-shadow: 0px 1px rgba(0, 0, 0, 0.8); + text-shadow: 0 1px rgba(0, 0, 0, 0.8); float: left; } @@ -1074,7 +1061,7 @@ tr.seasonheader { padding-top: 10px; text-align: left; border: none; - color: #fff; + color: #000; } th.col-checkbox, @@ -1157,7 +1144,7 @@ td.col-search { } /* ======================================================================= -comingEpisodes.tmpl +episodeView.tmpl ========================================================================== */ .sort_data { @@ -1219,7 +1206,7 @@ h2.day, h2.network { letter-spacing: 1px; color: #FFF; text-align: center; - text-shadow: -1px -1px 0px rgba(0, 0, 0, 0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #333; } @@ -1228,7 +1215,7 @@ h2.day, h2.network { clear: both; border: 1px solid #ccc; margin: auto; - padding: 0px; + padding: 0; text-align: left; width: 750px; border-radius: 5px; @@ -1307,7 +1294,7 @@ h2.day, h2.network { vertical-align: middle; } -.calendar-row .day-number { +.day-of-week .day-number { background-color: #333; color: #fff; } @@ -1316,22 +1303,31 @@ h2.day, h2.network { color: #c7db40; } -.odd .calendar-show { +.odd .daybyday-show { background-color: #F5F1E4; } -.even .calendar-show { +.even .daybyday-show { background-color: #DFDACF; } -.calendar-row .poster img { - border: 1px solid #CCC; +.day-of-week .poster img { + border-color: #CCC; } -.calendar-row .text .airtime, -.calendar-row .text .episode-title { +.day-of-week .text .airtime, +.day-of-week .text .episode, +.day-of-week .text .episode .name { color: #000; } +.day-of-week .text .episode .season, +.day-of-week .text .episode .number { + color: rgb(9, 133, 225); + /*color: #3d3d3d;*/ +} +.day-of-week .text .episode { + color: #888; +} /* ======================================================================= config*.tmpl @@ -1368,7 +1364,7 @@ config*.tmpl } #config div.field-pair { - padding: 12px 0px; + padding: 12px 0; } #config .nocheck, #config div #customQuality, .metadataDiv { @@ -1546,7 +1542,7 @@ td.tableright { text-align: left; vertical-align: middle; width: 225px; - padding: 6px 0px; + padding: 6px 0; } .optionWrapper div.selectChoices { @@ -1580,7 +1576,6 @@ Global ========================================================================== */ span.path { - padding: 3px 6px; color: #8b0000; background-color: #f5f1e4; } @@ -1596,13 +1591,13 @@ span.path { span.quality { font: 12px/13px "Open Sans", verdana, sans-serif; - background-image:-webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:-moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:-o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - -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: 0px 1px rgba(0, 0, 0, 0.8); + background-image:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:-moz-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:-o-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + -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; display: inline-block; padding: 2px 4px; @@ -1693,7 +1688,7 @@ option.flag { div.blackwhitelist{ float:left; - text-align: center; + text-align: center; } div.blackwhitelist input { @@ -1722,7 +1717,7 @@ div.blackwhitelist span { } div.blackwhitelist.anidb, div.blackwhitelist.manual { - margin: 7px 0px; + margin: 7px 0; } @@ -1730,15 +1725,15 @@ div.blackwhitelist.anidb, 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; } input[type="radio"] { - margin: 2px 0px 0px; + margin: 2px 0 0; line-height: normal; } @@ -1753,7 +1748,7 @@ input, textarea, select, .uneditable-input { } .navbar-brand { - padding: 0px; + padding: 0; } /* navbar styling */ @@ -1892,7 +1887,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .dropdown-menu { background-color: #F5F1E4; border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.176); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176); } .form-control { @@ -2386,7 +2381,7 @@ tablesorter.css .tablesorter th { color: #fff; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #333; } @@ -2457,7 +2452,7 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot tr { color: #fff; text-align: center; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #333; border-collapse: collapse; } @@ -2604,6 +2599,8 @@ span.token-input-delete-token { background-color: rgb(245, 245, 245); } +.episodeview-daybyday .time .time-min, +.episodeview-daybyday .time .time-am-pm, #addRootDirTable td label .filepath, .grey-text { color:#666 @@ -2630,8 +2627,8 @@ jquery.confirm.css top: 0; left: 0; background: url('../images/bg.gif'); - background: -moz-linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.5)) repeat-x rgba(0,0,0,0.5); - background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0.5)), to(rgba(0,0,0,0.5))) repeat-x rgba(0,0,0,0.5); + background: -moz-linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)) repeat-x rgba(0, 0, 0, 0.5); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.5))) repeat-x rgba(0, 0, 0, 0.5); z-index: 100000; } @@ -2643,7 +2640,7 @@ jquery.confirm.css top: 50%; margin: -130px 0 0 -230px; border: 1px solid #111; - box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.175); + box-shadow: 0 0 12px 0 rgba(0, 0, 0, 0.175); } #confirmBox h1, @@ -2657,13 +2654,13 @@ jquery.confirm.css color: #fff; margin: 0; font-size: 22px; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); } #confirmBox p { padding-top: 20px; color: #000; - text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } #confirmButtons { @@ -2678,7 +2675,7 @@ jquery.confirm.css display: inline-block; color: #fff; text-align:center; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); background-clip: padding-box; border: 1px solid #111; border-radius: 3px; @@ -2686,12 +2683,12 @@ jquery.confirm.css -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: -moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: -o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - -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); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + -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); } #confirmBox .button:last-child { diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 53dbb1c9..d9d2351a 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -149,8 +149,11 @@ inc_top.tmpl margin-bottom: -15px; } -#contentWrapper { -/* background: url("../images/bg.png") repeat 0 0 transparent; */ +#contentWrapper .episodeview-banner, +#contentWrapper .episodeview-daybyday, +#contentWrapper .episodeview-list, +#contentWrapper .episodeview-poster{ + padding-top:45px; } [class^="icon-"], @@ -285,18 +288,18 @@ inc_top.tmpl } .ui-tabs { - padding: 0px; + padding: 0; background: none; - border-width: 0px; + border-width: 0; } .ui-tabs .ui-tabs-nav { - padding-left: 0px; + padding-left: 0; background: transparent; - border-width: 0px 0px 0px 0px; - -moz-border-radius: 0px; - -webkit-border-radius: 0px; - border-radius: 0px; + border-width: 0 0 0 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; } .ui-tabs .ui-tabs-panel { @@ -336,7 +339,7 @@ inc_top.tmpl margin-left: auto; margin-right: auto; margin-top: 50px; - margin-bottom: 0px; + margin-bottom: 0; } [class^="menu-icon-"], [class*=" menu-icon-"] { @@ -362,83 +365,83 @@ inc_top.tmpl } .menu-icon-addshow { - background-position: 0px 0px; + background-position: 0 0; } .menu-icon-anime { - background-position: -21px 0px; + background-position: -21px 0; } .menu-icon-backlog-view { - background-position: -42px 0px; + background-position: -42px 0; } .menu-icon-backlog { - background-position: -63px 0px; + background-position: -63px 0; } .menu-icon-bittorrent { - background-position: -84px 0px; + background-position: -84px 0; } .menu-icon-config-index { - background-position: -105px 0px; + background-position: -105px 0; } .menu-icon-config { - background-position: -126px 0px; + background-position: -126px 0; } .menu-icon-failed-download { - background-position: -147px 0px; + background-position: -147px 0; } .menu-icon-home { - background-position: -168px 0px; + background-position: -168px 0; } .menu-icon-manage { - background-position: -189px 0px; + background-position: -189px 0; } .menu-icon-manage-searches { - background-position: -210px 0px; + background-position: -210px 0; } .menu-icon-poster { - background-position: -231px 0px; + background-position: -231px 0; } .menu-icon-postprocess { - background-position: -252px 0px; + background-position: -252px 0; } .menu-icon-restart { - background-position: -273px 0px; + background-position: -273px 0; } .menu-icon-shutdown { - background-position: -294px 0px; + background-position: -294px 0; } .menu-icon-update { - background-position: -315px 0px; + background-position: -315px 0; } .menu-icon-viewlog-errors { - background-position: -336px 0px; + background-position: -336px 0; } .menu-icon-viewlog { - background-position: -357px 0px; + background-position: -357px 0; } .menu-icon-xbmc { - background-position: -378px 0px; + background-position: -378px 0; } .menu-icon-help { - background-position: -399px 0px; + background-position: -399px 0; } [class^="submenu-icon-"], [class*=" submenu-icon-"] { @@ -448,27 +451,27 @@ inc_top.tmpl } .submenu-icon-anime { - background-position: -21px 0px; + background-position: -21px 0; } .submenu-icon-bittorrent { - background-position: -84px 0px; + background-position: -84px 0; } .submenu-icon-failed-download { - background-position: -147px 0px; + background-position: -147px 0; } .submenu-icon-restart { - background-position: -273px 0px; + background-position: -273px 0; } .submenu-icon-shutdown { - background-position: -294px 0px; + background-position: -294px 0; } .submenu-icon-xbmc { - background-position: -378px 0px; + background-position: -378px 0; } /* ======================================================================= @@ -626,26 +629,26 @@ home.tmpl } .show .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 0px; + border-bottom-right-radius: 0; } .show .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 0px; + border-bottom-left-radius: 0; } .show .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 0px; + border-top-right-radius: 0; } .show .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 0px; + border-top-left-radius: 0; } .show .ui-widget-content { border-top: 1px solid #111; border-bottom: 1px solid #111; - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; } .ui-progressbar .ui-progressbar-value { height:20px @@ -661,19 +664,19 @@ home.tmpl } .show .progress-80 { - border-radius: 0px; + border-radius: 0; } .show .progress-60 { - border-radius: 0px; + border-radius: 0; } .show .progress-40 { - border-radius: 0px; + border-radius: 0; } .show .progress-20 { - border-radius: 0px; + border-radius: 0; } .show-title { @@ -681,7 +684,7 @@ home.tmpl overflow: hidden; white-space: nowrap; font-size: 11px; - margin: 4px 4px 0px 4px; + margin: 4px 4px 0 4px; } .show-title:after { @@ -704,7 +707,7 @@ home.tmpl overflow: hidden; white-space: nowrap; font-size: 11px; - margin: 0px 4px 4px 4px; + margin: 0 4px 4px 4px; } .show-date:after { @@ -791,34 +794,27 @@ home_addShows.tmpl ========================================================================== */ #addShowPortal { - width: 750px; + width: 748px; padding: 10px 0; margin-right: auto; margin-left: auto; } #addShowPortal a { -/* padding: 10px;*/ - padding: 0px 20px; + padding: 0 20px; width: 360px; - float: left; - margin: 0 15px 15px 0; + margin: 0 7px 14px; } div.button { display: table-cell; vertical-align: middle; -/* padding-left: 10px;*/ } div.buttontext { display: table-cell; -/* - padding-left: 20px; - padding: 10px 15px; -*/ - padding: 10px 0px 10px 15px; + padding: 10px 0 10px 15px; text-align: left; white-space: normal; } @@ -826,7 +822,7 @@ div.buttontext p { margin: 0 } div.buttontext h3 { - margin-top: 0px; + margin-top: 0; } div.buttontext p { @@ -970,7 +966,6 @@ home_trendingShows.tmpl white-space: nowrap; font-size: 12px; overflow: hidden; -/* text-shadow: 1px 1px 0px #000;*/ padding-left: 4px; margin: 0; } @@ -1104,7 +1099,7 @@ ul.tags li { border: 1px solid #111; color: #FFF; font: 14px/18px "Open Sans", "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; - text-shadow: 0px 1px rgba(0, 0, 0, 0.8); + text-shadow: 0 1px rgba(0, 0, 0, 0.8); float: left; } @@ -1347,7 +1342,7 @@ td.col-search { } /* ======================================================================= -comingEpisodes.tmpl +episodeView.tmpl ========================================================================== */ .sort_data { @@ -1409,7 +1404,7 @@ h2.day, h2.network { letter-spacing: 1px; color: #FFF; text-align: center; - text-shadow: -1px -1px 0px rgba(0, 0, 0, 0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #333; } @@ -1418,7 +1413,7 @@ h2.day, h2.network { clear: both; border: 1px solid #ccc; margin: auto; - padding: 0px; + padding: 0; text-align: left; width: 750px; border-radius: 5px; @@ -1497,26 +1492,24 @@ h2.day, h2.network { vertical-align: middle; } -.calendarWrapper { +.daybydayWrapper { max-width: 1400px; margin: 0 auto; - padding: 0 3px + padding: 0 /*3px*/ } -.calendar-row { +.day-of-week { float: left; width: 14.28%; - padding: 0px 2px; + padding: 0 2px; } -.calendar-row .day-number { +.day-of-week .day-number { position: relative; height: 40px; - background-color: #333; - color: #fff; } -.calendar-row .day-number .number { +.day-of-week .day-number .number { position: absolute; right: 5px; font-weight: bold; @@ -1524,7 +1517,7 @@ h2.day, h2.network { line-height: 38px; } -.calendar-row .day-number .day { +.day-of-week .day-number .day { position: absolute; left: 5px; top: 3px; @@ -1532,33 +1525,21 @@ h2.day, h2.network { font-weight: bold; } -.calendar-row .day-number .month { +.day-of-week .day-number .month { position: absolute; left: 5px; bottom: 3px; text-transform: uppercase; } -.today .day-number .number, .today .day-number .month, .today .day-number .day { - color: #c7db40; -} - -.calendar-show { +.daybyday-show { margin-top: 4px; padding: 4px; width: 100% } -.odd .calendar-show { - background-color: #F5F1E4; -} - -.even .calendar-show { - background-color: #DFDACF; -} - -.calendar-row .poster img { - border: 1px solid #CCC; +.day-of-week .poster img { + border: 1px solid; border-radius: 5px; margin-bottom: 2px; display: block; @@ -1566,15 +1547,25 @@ h2.day, h2.network { margin-right: auto; } -.calendar-row .text .airtime, -.calendar-row .text .episode-title { +.day-of-week .text .airtime, +.day-of-week .text .episode { overflow: hidden; text-overflow: ellipsis; display: block; font-size: 12px; } -.calendar-row .episode-blank { +.day-of-week .text .episode .season, +.day-of-week .text .episode .number { + font-weight: 900; +} +.day-of-week .text .episode .season { + margin-right: 2px; +} +.day-of-week .text .episode .number { + margin-left: 2px; +} +.day-of-week .episode-blank { width: 250px; height: 32px; text-align: center; @@ -1918,7 +1909,7 @@ div.metadata_example label { line-height: 21px; display: block; padding: 3px; - margin: 0px; + margin: 0; } div.metadata_options input { margin-right: 3px; @@ -1931,7 +1922,7 @@ div.metadataDiv .disabled { .notifier-icon { float: left; - margin: 6px 4px 0px 0px; + margin: 6px 4px 0 0; } /* ======================================================================= @@ -1963,7 +1954,7 @@ td.tableright { text-align: left; vertical-align: middle; width: 225px; - padding: 6px 0px; + padding: 6px 0; } .optionWrapper div.selectChoices { @@ -1997,9 +1988,8 @@ Global ========================================================================== */ span.path { - padding: 3px 6px; - color: #8b0000; - background-color: #f5f1e4; + padding: 3px; + margin-left: 3px; } .align-left { @@ -2013,13 +2003,13 @@ span.path { span.quality { font: 12px/13px "Open Sans", verdana, sans-serif; - background-image:-webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:-moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:-o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - background-image:linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 50%,rgba(0,0,0,0.25)); - -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: 0px 1px rgba(0, 0, 0, 0.8); + background-image:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:-moz-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:-o-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25)); + -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; display: inline-block; padding: 2px 4px; @@ -2139,7 +2129,7 @@ div.blackwhitelist span { } div.blackwhitelist.anidb, div.blackwhitelist.manual { - margin: 7px 0px; + margin: 7px 0; } @@ -2159,12 +2149,12 @@ html * { } input[type="checkbox"] { - margin: 2px 0px 0px; + margin: 2px 0 0; line-height: normal; } input[type="radio"] { - margin: 2px 0px 0px; + margin: 2px 0 0; line-height: normal; } @@ -2179,7 +2169,7 @@ input, textarea, select, .uneditable-input { } .navbar-brand { - padding: 0px; + padding: 0; } /* navbar styling */ @@ -2306,7 +2296,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .dropdown-menu { background-color: #F5F1E4; border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.176); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176); } .form-control { @@ -2863,7 +2853,7 @@ div.formpaginate .prev, div.formpaginate .next { .stepDiv.parent-folder { padding: 15px 0 0; width: 430px; - margin: 0px auto; + margin: 0 auto; } .stepDiv .nocheck { @@ -2985,7 +2975,7 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot tr { color: #fff; text-align: center; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); background-color: #333; border-collapse: collapse; } @@ -3205,6 +3195,10 @@ span.token-input-delete-token { .time-am-pm { margin-left: 2px; } +#content.episodeview-banner .time-am-pm, +#content.episodeview-poster .time-am-pm { + margin-left: 0; +} /* ======================================================================= jquery.confirm.css @@ -3217,8 +3211,8 @@ jquery.confirm.css top: 0; left: 0; background: url(../images/bg.gif); - background: -moz-linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.5)) repeat-x rgba(0,0,0,0.5); - background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0.5)), to(rgba(0,0,0,0.5))) repeat-x rgba(0,0,0,0.5); + background: -moz-linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)) repeat-x rgba(0, 0, 0, 0.5); + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.5))) repeat-x rgba(0, 0, 0, 0.5); z-index: 100000; } @@ -3230,7 +3224,7 @@ jquery.confirm.css top: 50%; margin: -130px 0 0 -230px; border: 1px solid #111; - box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.175); + box-shadow: 0 0 12px 0 rgba(0, 0, 0, 0.175); } #confirmBox h1, @@ -3265,7 +3259,7 @@ jquery.confirm.css display: inline-block; color: #fff; text-align:center; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); background-clip: padding-box; border: 1px solid #111; border-radius: 3px; @@ -3273,12 +3267,12 @@ jquery.confirm.css -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: -moz-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: -o-linear-gradient(top, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - background-image: linear-gradient(to bottom, rgba(255,255,255,0.08),rgba(255,255,255,0) 50%,rgba(0,0,0,0) 51%,rgba(0,0,0,0.25)); - -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); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 51%,rgba(0, 0, 0, 0.25)); + -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); } #confirmBox .button:last-child { diff --git a/gui/slick/interfaces/default/apiBuilder.tmpl b/gui/slick/interfaces/default/apiBuilder.tmpl index 43cfd914..c169fe2d 100644 --- a/gui/slick/interfaces/default/apiBuilder.tmpl +++ b/gui/slick/interfaces/default/apiBuilder.tmpl @@ -90,8 +90,8 @@ addOption("postprocess", "process_method", "&process_method=copy"); addOption("postprocess", "type", "&type=manual") addOption("sb.setdefaults", "Optional Param", "", 1); -addList("sb.setdefaults", "Exclude Paused Shows on ComingEps", "&future_show_paused=0", "sb.setdefaults-status"); -addList("sb.setdefaults", "Include Paused Shows on ComingEps", "&future_show_paused=1", "sb.setdefaults-status"); +addList("sb.setdefaults", "Exclude Paused Shows on EpisodeView", "&future_show_paused=0", "sb.setdefaults-status"); +addList("sb.setdefaults", "Include Paused Shows on EpisodeView", "&future_show_paused=1", "sb.setdefaults-status"); addOption("sb.setdefaults-status", "Optional Param", "", 1); addList("sb.setdefaults-status", "Wanted", "&status=wanted", "sb.setdefaults-opt"); diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl deleted file mode 100644 index f10003b4..00000000 --- a/gui/slick/interfaces/default/comingEpisodes.tmpl +++ /dev/null @@ -1,626 +0,0 @@ -#import sickbeard -#import datetime -#from sickbeard.common import * -#from sickbeard import sbdatetime -#from sickbeard.helpers import anon_url - -#set global $title = 'Coming Episodes' -#set global $header = 'Coming Episodes' - -#set global $sbPath = '..' - -#set global $topmenu = 'comingEpisodes' -#import os.path -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') -#set $sort = $sickbeard.COMING_EPS_SORT - -#if $varExists('header') -

$header

-#else -

$title

-#end if - - - - - -
- Layout: - - -   -#if 'calendar' != $layout: - Sort By: - - -   -#else - Sort By: - - -   -#end if - View Paused: - - -
- -
-#if 'calendar' != $layout: - Key: - Missed - Current - Future - Distant -#end if - - Subscribe -
- -
- -#if 'list' == $layout: - - - - - -#set $show_div = 'listing-default' - - - - - - - - - - - - - - - - - - - - -#for $cur_result in $sql_results: - #set $cur_indexer = int($cur_result['indexer']) - #set $runtime = $cur_result['runtime'] - - #if int($cur_result['paused']) and not $sickbeard.COMING_EPS_DISPLAY_PAUSED: - #continue - #end if - - #set $cur_ep_airdate = $cur_result['localtime'].date() - - #if $runtime: - #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) - #if $cur_ep_enddate < $today: - #set $show_div = 'listing-overdue' - #elif $cur_ep_airdate >= $next_week.date(): - #set $show_div = 'listing-toofar' - #elif $cur_ep_airdate >= $today.date() and $cur_ep_airdate < $next_week.date(): - #if $cur_ep_airdate == $today.date(): - #set $show_div = 'listing-current' - #else: - #set $show_div = 'listing-default' - #end if - #end if - #end if - - - - ## forced to use a div to wrap airdate, the column sort went crazy with a span - - - - - - - - - - - - - - - - - -#end for - - - - - - - - -
AirdateShowNext EpNext Ep NameNetworkQualityIndexersSearch
-
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
$time.mktime($cur_result['localtime'].timetuple()) - 		$cur_result['show_name'] -#if int($cur_result['paused']): - [paused] -#end if - - <%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %> - -#if $cur_result['description']: - -#else: - -#end if - $cur_result['name'] - - $cur_result['network'] - -#if int($cur_result['quality']) in $qualityPresets: - $qualityPresetStrings[int($cur_result['quality'])] -#else: - Custom -#end if - -#if $cur_result['imdb_id']: - [imdb] -#end if - $sickbeard.indexerApi($cur_indexer).name - - [search] -
 
- - - -#else if $layout in ['banner', 'poster']: - - - - - -#set $cur_segment = None -#set $too_late_header = False -#set $missed_header = False -#set $today_header = False -#set $show_div = 'ep_listing listing-default' - -#if 'show' == $sort: -

-#end if - -#for $cur_result in $sql_results: - #set $cur_indexer = int($cur_result['indexer']) - - - - #if int($cur_result['paused']) and not $sickbeard.COMING_EPS_DISPLAY_PAUSED: - #continue - #end if - - #set $runtime = $cur_result['runtime'] - - #if 'network' == $sort: - #set $show_network = $cur_result['network'] if $cur_result['network'] else 'no network' - #if $cur_segment != $show_network: -
-

$show_network

- #set $cur_segment = $cur_result['network'] - #end if - #set $cur_ep_airdate = $cur_result['localtime'].date() - - #if $runtime: - #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) - #if $cur_ep_enddate < $today: - #set $show_div = 'ep_listing listing-overdue' - #elif $cur_ep_airdate >= $next_week.date(): - #set $show_div = 'ep_listing listing-toofar' - #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): - #if $cur_ep_airdate == $today.date(): - #set $show_div = 'ep_listing listing-current' - #else: - #set $show_div = 'ep_listing listing-default' - #end if - #end if - #end if - - #elif 'date' == $sort: - #set $cur_ep_airdate = $cur_result['localtime'].date() - - #if $cur_segment != $cur_ep_airdate: - #if $runtime: - #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) - #if $cur_ep_enddate < $today and $cur_ep_airdate != $today.date() and not $missed_header: -

Missed

- #set $missed_header = True - #elif $cur_ep_airdate >= $next_week.date() and not $too_late_header: -

Later

- #set $too_late_header = True - #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): - #if $cur_ep_airdate == $today.date(): -

$sbdatetime.sbdatetime.sbfdate($cur_ep_airdate, '%A').decode($sickbeard.SYS_ENCODING).capitalize() [Today]

- #set $today_header = True - #else: -

$sbdatetime.sbdatetime.sbfdate($cur_ep_airdate, '%A').decode($sickbeard.SYS_ENCODING).capitalize()

- #end if - #end if - #end if - #set $cur_segment = $cur_ep_airdate - #end if - - #if $cur_ep_airdate == $today.date() and not $today_header: -
-

$sbdatetime.sbdatetime.sbfdate($cur_ep_airdate, '%A').decode($sickbeard.SYS_ENCODING).capitalize() [Today]

- #set $today_header = True - #end if - #if $runtime: - #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) - #if $cur_ep_enddate < $today: - #set $show_div = 'ep_listing listing-overdue' - #elif $cur_ep_airdate >= $next_week.date(): - #set $show_div = 'ep_listing listing-toofar' - #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): - #if $cur_ep_airdate == $today.date(): - #set $show_div = 'ep_listing listing-current' - #else: - #set $show_div = 'ep_listing listing-default' - #end if - #end if - #end if - - #elif 'show' == $sort: - #set $cur_ep_airdate = $cur_result['localtime'].date() - - #if $runtime: - #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) - #if $cur_ep_enddate < $today: - #set $show_div = 'ep_listing listing-overdue listingradius' - #elif $cur_ep_airdate >= $next_week.date(): - #set $show_div = 'ep_listing listing-toofar listingradius' - #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): - #if $cur_ep_airdate == $today.date(): - #set $show_div = 'ep_listing listing-current listingradius' - #else: - #set $show_div = 'ep_listing listing-default listingradius' - #end if - #end if - #end if - #end if - -
-
- - - -#if 'banner' == $layout: - - -#end if - - - - - - -
- -
-
- - $cur_result['show_name'] - #if int($cur_result['paused']): - [paused] - #end if - - - -#if $cur_result['imdb_id']: - [imdb] -#end if - $sickbeard.indexerApi($cur_indexer).name - [search] - -
- - Next Episode: <%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %> - $cur_result['name'] - -
- - Airs: $sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)<%= ('', ' on %s' % str(cur_result['network']))[None is not cur_result['network']] %> -
- -
- Quality: - #if int($cur_result['quality']) in $qualityPresets: - $qualityPresetStrings[int($cur_result['quality'])] - #else: - Custom - #end if -
-
-
-#if $cur_result['description']: - Plot: -
$cur_result['description']
-#else: - Plot: - -#end if -
-
-
-
- - -#end for - - -#end if - -#if 'calendar' == $layout: - -#set $today = datetime.date.today() -#set $dates = [$today + datetime.timedelta(days = $i) for $i in range(7)] -#set $tbl_day = 0 -
-
-
- - #for $day in $dates - #set $tbl_day += 1 - - #if $tbl_day == 1 - #set $showtoday = 'today' - #else - #set $showtoday = '' - #end if - -
-
-
$sbdatetime.sbdatetime.sbfdate($day, ' %d').decode($sickbeard.SYS_ENCODING).replace(' 0', ' ')
-
- $sbdatetime.sbdatetime.sbfdate($day, '%A').decode($sickbeard.SYS_ENCODING).capitalize() - -
-
- $sbdatetime.sbdatetime.sbfdate($day, '%B').decode($sickbeard.SYS_ENCODING).capitalize() - -
-
-
- - #set $day_has_show = False - #for $cur_result in $sql_results: - #if int($cur_result['paused']) and not $sickbeard.COMING_EPS_DISPLAY_PAUSED: - #continue - #end if - - #set $cur_indexer = int($cur_result['indexer']) - #set $runtime = $cur_result['runtime'] - #set $airday = $cur_result['localtime'].date() - - #if $airday == $day: - #set $day_has_show = True - #set $airtime = $sbdatetime.sbdatetime.sbftime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING) - - #if $sickbeard.TRIM_ZERO: - #set $airtime = re.sub(r'0(\d:\d\d)', r'\1', $airtime, 0, re.IGNORECASE | re.MULTILINE) - #end if - -
-
- -
-
-
- <%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %> - $cur_result['name'] -
-
- ${airtime} on $cur_result["network"] -
-
-
- - #end if - - #end for - #if not $day_has_show: - -
- No shows for this day -
- #end if -
-
- #end for - - -#end if - -
- - - -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index 410410c1..b375636c 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -570,7 +570,7 @@

-
All non-absolute folder locations are relative to $sickbeard.DATA_DIR
+
All non-absolute folder locations are relative to $sickbeard.DATA_DIR
diff --git a/gui/slick/interfaces/default/episodeView.tmpl b/gui/slick/interfaces/default/episodeView.tmpl new file mode 100644 index 00000000..f3d8fe7f --- /dev/null +++ b/gui/slick/interfaces/default/episodeView.tmpl @@ -0,0 +1,695 @@ +#import sickbeard +#import datetime +#from sickbeard.common import * +#from sickbeard import sbdatetime +#from sickbeard.helpers import anon_url + +#set global $title = 'Episode View' +#set global $header = 'Episode View' + +#set global $sbPath = '..' + +#set global $topmenu = 'episodeView' +#import os.path +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') + +#set $sort = $sickbeard.EPISODE_VIEW_SORT +#set $table_sort_header_codes = {'time': 0, 'show': 1, 'network': 4} +#if $sort not in $table_sort_header_codes: + #set $sort = 'time' +#end if + +#if 'daybyday' != $layout: + +#end if + +#if $varExists('header') +

$header

+#else +

$title

+#end if + +#if 'daybyday' == $layout: + + +#end if + + + +
+ Layout: + + +   + Sort +#if 'daybyday' == $layout: +   +#end if + By +#if 'daybyday' == $layout: + + + + +#end if + + +   + View Paused: + + +
+ +
+#if 'daybyday' != $layout: + Key: + Missed + Current + Future + Distant +#end if + + Subscribe +
+ +
+ + + +#if 'list' == $layout: + + + + + + #set $show_div = 'listing-default' + + + + + + + + + + + + + + + + + + + + + #for $cur_result in $sql_results: + #set $cur_indexer = int($cur_result['indexer']) + #set $runtime = $cur_result['runtime'] + + #if int($cur_result['paused']) and not $sickbeard.EPISODE_VIEW_DISPLAY_PAUSED: + #continue + #end if + + #set $cur_ep_airdate = $cur_result['localtime'].date() + + #if $runtime: + #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) + #if $cur_ep_enddate < $today: + #set $show_div = 'listing-overdue' + #elif $cur_ep_airdate >= $next_week.date(): + #set $show_div = 'listing-toofar' + #elif $cur_ep_airdate >= $today.date() and $cur_ep_airdate < $next_week.date(): + #if $cur_ep_airdate == $today.date(): + #set $show_div = 'listing-current' + #else: + #set $show_div = 'listing-default' + #end if + #end if + #end if + + + + ## forced to use a div to wrap airdate, the column sort went crazy with a span + + + + + + + + + + + + + + + + + + + #end for + + + + + + + + + +
AirdateShowNext EpNext Ep NameNetworkQualityIndexersSearch
+
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
$time.mktime($cur_result['localtime'].timetuple()) + 		$cur_result['show_name'] + #if int($cur_result['paused']): + [paused] + #end if + + <%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %> + + #if $cur_result['description']: + + #else: + + #end if + $cur_result['name'] + + $cur_result['network'] + + #if int($cur_result['quality']) in $qualityPresets: + $qualityPresetStrings[int($cur_result['quality'])] + #else: + Custom + #end if + + #if $cur_result['imdb_id']: + [imdb] + #end if + $sickbeard.indexerApi($cur_indexer).name + + [search] +
 
+ + + + +#else if $layout in ['banner', 'poster']: + + + + + #set $cur_segment = None + #set $too_late_header = False + #set $missed_header = False + #set $today_header = False + #set $show_div = 'ep_listing listing-default' + + #if 'show' == $sort: +

+ #end if + + #for $cur_result in $sql_results: + #set $cur_indexer = int($cur_result['indexer']) + + #if int($cur_result['paused']) and not $sickbeard.EPISODE_VIEW_DISPLAY_PAUSED: + #continue + #end if + + #set $runtime = $cur_result['runtime'] + + #if 'network' == $sort: + + #set $show_network = $cur_result['network'] if $cur_result['network'] else 'no network' + #if $cur_segment != $show_network: +
+

$show_network

+ #set $cur_segment = $cur_result['network'] + #end if + #set $cur_ep_airdate = $cur_result['localtime'].date() + + #if $runtime: + #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) + #if $cur_ep_enddate < $today: + #set $show_div = 'ep_listing listing-overdue' + #elif $cur_ep_airdate >= $next_week.date(): + #set $show_div = 'ep_listing listing-toofar' + #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): + #if $cur_ep_airdate == $today.date(): + #set $show_div = 'ep_listing listing-current' + #else: + #set $show_div = 'ep_listing listing-default' + #end if + #end if + #end if + + #elif 'time' == $sort: + + #set $cur_ep_airdate = $cur_result['localtime'].date() + + #if $cur_segment != $cur_ep_airdate: + #if $runtime: + #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) + #if $cur_ep_enddate < $today and $cur_ep_airdate != $today.date() and not $missed_header: +

Missed

+ #set $missed_header = True + #elif $cur_ep_airdate >= $next_week.date() and not $too_late_header: +

Later

+ #set $too_late_header = True + #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): + #if $cur_ep_airdate == $today.date(): +

$sbdatetime.sbdatetime.sbfdate($cur_ep_airdate, '%A').decode($sickbeard.SYS_ENCODING).capitalize() [Today]

+ #set $today_header = True + #else: +

$sbdatetime.sbdatetime.sbfdate($cur_ep_airdate, '%A').decode($sickbeard.SYS_ENCODING).capitalize()

+ #end if + #end if + #end if + #set $cur_segment = $cur_ep_airdate + #end if + + #if $cur_ep_airdate == $today.date() and not $today_header: +
+

$sbdatetime.sbdatetime.sbfdate($cur_ep_airdate, '%A').decode($sickbeard.SYS_ENCODING).capitalize() [Today]

+ #set $today_header = True + #end if + + #if $runtime: + #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) + #if $cur_ep_enddate < $today: + #set $show_div = 'ep_listing listing-overdue' + #elif $cur_ep_airdate >= $next_week.date(): + #set $show_div = 'ep_listing listing-toofar' + #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): + #if $cur_ep_airdate == $today.date(): + #set $show_div = 'ep_listing listing-current' + #else: + #set $show_div = 'ep_listing listing-default' + #end if + #end if + #end if + + #elif 'show' == $sort: + #set $cur_ep_airdate = $cur_result['localtime'].date() + + #if $runtime: + #set $cur_ep_enddate = $cur_result['localtime'] + datetime.timedelta(minutes = $runtime) + #if $cur_ep_enddate < $today: + #set $show_div = 'ep_listing listing-overdue listingradius' + #elif $cur_ep_airdate >= $next_week.date(): + #set $show_div = 'ep_listing listing-toofar listingradius' + #elif $cur_ep_enddate >= $today and $cur_ep_airdate < $next_week.date(): + #if $cur_ep_airdate == $today.date(): + #set $show_div = 'ep_listing listing-current listingradius' + #else: + #set $show_div = 'ep_listing listing-default listingradius' + #end if + #end if + #end if + #end if + + +
+
+ + + + + #if 'banner' == $layout: + + + #end if + + + + + + +
+ +
+
+ + $cur_result['show_name'] + #if int($cur_result['paused']): + [paused] + #end if + + + + #if $cur_result['imdb_id']: + [imdb] + #end if + $sickbeard.indexerApi($cur_indexer).name + [search] + +
+ + Next Episode: <%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %> - $cur_result['name'] + +
+ + Airdate: $sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)<%= ('', ' on %s' % str(cur_result['network']))[None is not cur_result['network']] %> +
+ +
+ Quality: + #if int($cur_result['quality']) in $qualityPresets: + $qualityPresetStrings[int($cur_result['quality'])] + #else: + Custom + #end if +
+
+
+ #if $cur_result['description']: + Plot: +
$cur_result['description']
+ #else: + Plot: + + #end if +
+
+
+
+ + #end for + +#end if + + + +#if 'daybyday' == $layout: + + #set $today = datetime.date.today() + #set $dates = [$today + datetime.timedelta(days = $i) for $i in range(7)] + #set $tbl_day = 0 + + + +
+
+
+ #for $day in $dates + #set $tbl_day += 1 + + #set $col_class = '' + #if 1 == $tbl_day + #set $col_class = 'today' + #end if + #set $col_class = '%s %s' % ($col_class, ('even', 'odd')[1 == tbl_day % 2]) + +
+
+
$sbdatetime.sbdatetime.sbfdate($day, ' %d').decode($sickbeard.SYS_ENCODING).replace(' 0', ' ')
+
+ $sbdatetime.sbdatetime.sbfdate($day, '%A').decode($sickbeard.SYS_ENCODING).capitalize() + +
+
+ $sbdatetime.sbdatetime.sbfdate($day, '%B').decode($sickbeard.SYS_ENCODING).capitalize() + +
+
+
+ + #set $day_has_show = False + #for $cur_result in $sql_results: + #if int($cur_result['paused']) and not $sickbeard.EPISODE_VIEW_DISPLAY_PAUSED: + #continue + #end if + + #set $cur_indexer = int($cur_result['indexer']) + #set $runtime = $cur_result['runtime'] + #set $airday = $cur_result['localtime'].date() + + #if $airday == $day: + #set $day_has_show = True + #set $airtime = $sbdatetime.sbdatetime.sbftime($cur_result['localtime'], markup=True).decode($sickbeard.SYS_ENCODING) + #set $img_tag = ' +
+ + ${img_tag} ${plot_class}" alt="" src="$sbRoot/showPoster/?show=${cur_result['showid']}&which=poster_thumb" /> +
+
+
+ ${airtime} $cur_result['network'] +
+
+ <%= '%i' % int(cur_result['season']) %>x<%= '%02i' % int(cur_result['episode']) %> + $cur_result['name'] + #if int($cur_result['paused']): + [paused] + #end if +
+
+
+ + #end if + + #end for + #if not $day_has_show: +
+ No shows for this day +
+ #end if +
+
+ #end for +
+ + +#end if + +
+ + + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/interfaces/default/home_trendingShows.tmpl b/gui/slick/interfaces/default/home_trendingShows.tmpl index 3197db5b..bef8709b 100644 --- a/gui/slick/interfaces/default/home_trendingShows.tmpl +++ b/gui/slick/interfaces/default/home_trendingShows.tmpl @@ -11,7 +11,7 @@ #set global $sbPath='..' -#set global $topmenu='comingEpisodes' +#set global $topmenu='episodeView' #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index e854d60f..d29591be 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -150,8 +150,8 @@ -