diff --git a/CHANGES.md b/CHANGES.md index 02708a13..427564d7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,43 @@ +### 0.6.0 (2015-01-18 05:05:00 UTC) + +* Add network logos BBC Canada, Crackle, El Rey Network, SKY Atlantic, and Watch +* Change Yahoo! screen network logo +* Add and update Discovery Network's channel logos +* Add A&E Network International/Scripps Networks International channel logos +* Remove non required duplicate network logos +* Add lowercase PM to the General Config/Interface/Time style selection +* Change General Config/Interface/Trim zero padding to Trim date and time, now handles 2:00 pm > 2 pm +* Fix trim zero of military time hour to not use 12 hr time +* Change ThePirateBay to use oldpiratebay as a temporary fix +* Change Search Settings/Torrent/Deluge option texts for improved understanding +* Fix Womble's Index searching (ssl disabled for now, old categories are the new active ones again) +* Fix Add From Trending Show page to work with Trakt changes +* Add anime unit test cases (port from lad1337/sickbeard) +* Fix normal tv show regex (port from midgetspy/sickbeard) +* Fix anime regex (port from lad1337/sickbeard) +* Add pull request checkout option to General Config/Advanced Settings +* Add BTN api call parameter debug logging +* Fix anime searches on BTN provider +* Change replace "Daily-Search" with "Recent-Search" +* Add daily search to recent search renaming to config migration code +* Fix 'NoneType' object is not iterable in trakt module +* Add log message for when trakt does not return a watchlist +* 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 +* Fix progress bars disappearing on home page + + ### 0.5.0 (2014-12-21 11:40:00 UTC) * Fix searches freezing due to unescaped ignored or required words diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index b78b3bc9..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,17 +1312,42 @@ h2.day, h2.network { color: #09A2FF; } -table.cal-odd { +.day-of-week .day-number { + background-color: #15528F; + color: #fff; +} + +.today .day-number .number, .today .day-number .month, .today .day-number .day { + color: #8dbeee; +} + +.odd .daybyday-show { background-color: #333; } -table.cal-even { + +.even .daybyday-show { background-color: #3d3d3d; } -.calendarShow .text .airtime { - color:#fff +.daybyday-show .episode-blank { + background-color: rgba(0,0,0,.1); + border-radius: 3px; } -.calendarShow .text .episode-title { - color:#aaa + +.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); } /* ======================================================================= @@ -1372,12 +1384,7 @@ config*.tmpl } #config div.field-pair { - padding: 12px 0px; -} - -#config div.field-pair input { - float: left; - margin-right: 6px; + padding: 12px 0; } #config .nocheck, #config div #customQuality, .metadataDiv { @@ -1415,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; @@ -1439,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; } /* ======================================================================= @@ -1562,7 +1569,7 @@ td.tableright { text-align: left; vertical-align: middle; width: 225px; - padding: 6px 0px; + padding: 6px 0; } .optionWrapper div.selectChoices { @@ -1596,7 +1603,6 @@ Global ========================================================================== */ span.path { - padding: 3px 6px; color: #09A2FF; background-color: #333; } @@ -1608,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; @@ -1705,7 +1711,7 @@ option.flag { div.blackwhitelist{ float:left; - text-align: center; + text-align: center; } div.blackwhitelist input { @@ -1734,7 +1740,7 @@ div.blackwhitelist span { } div.blackwhitelist.anidb, div.blackwhitelist.manual { - margin: 7px 0px; + margin: 7px 0; } @@ -1742,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; @@ -1751,7 +1757,7 @@ body { } input[type="radio"] { - margin: 2px 0px 0px; + margin: 2px 0 0; line-height: normal; } @@ -1766,7 +1772,7 @@ input, textarea, select, .uneditable-input { } .navbar-brand { - padding: 0px; + padding: 0; } /* navbar styling */ @@ -1906,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 { @@ -2384,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 { @@ -2425,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; } @@ -2496,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; } @@ -2648,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, @@ -2674,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; } @@ -2687,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, @@ -2701,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 { @@ -2722,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; @@ -2730,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 416ec481..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,17 +1294,39 @@ h2.day, h2.network { vertical-align: middle; } -table.cal-odd { - background-color: #ddd; +.day-of-week .day-number { + background-color: #333; + color: #fff; } -table.cal-even { - background-color: #d2d2d2; + +.today .day-number .number, .today .day-number .month, .today .day-number .day { + color: #c7db40; } -.calendarShow .text .airtime { - color:#000 + +.odd .daybyday-show { + background-color: #F5F1E4; } -.calendarShow .text .episode-title { - color:#888 + +.even .daybyday-show { + background-color: #DFDACF; +} + +.day-of-week .poster img { + border-color: #CCC; +} + +.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; } /* ======================================================================= @@ -1355,12 +1364,7 @@ config*.tmpl } #config div.field-pair { - padding: 12px 0px; -} - -#config div.field-pair input { - float: left; - margin-right: 6px; + padding: 12px 0; } #config .nocheck, #config div #customQuality, .metadataDiv { @@ -1538,7 +1542,7 @@ td.tableright { text-align: left; vertical-align: middle; width: 225px; - padding: 6px 0px; + padding: 6px 0; } .optionWrapper div.selectChoices { @@ -1572,7 +1576,6 @@ Global ========================================================================== */ span.path { - padding: 3px 6px; color: #8b0000; background-color: #f5f1e4; } @@ -1588,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; @@ -1685,7 +1688,7 @@ option.flag { div.blackwhitelist{ float:left; - text-align: center; + text-align: center; } div.blackwhitelist input { @@ -1714,7 +1717,7 @@ div.blackwhitelist span { } div.blackwhitelist.anidb, div.blackwhitelist.manual { - margin: 7px 0px; + margin: 7px 0; } @@ -1722,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; } @@ -1745,7 +1748,7 @@ input, textarea, select, .uneditable-input { } .navbar-brand { - padding: 0px; + padding: 0; } /* navbar styling */ @@ -1884,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 { @@ -2378,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; } @@ -2449,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; } @@ -2596,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 @@ -2622,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; } @@ -2635,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, @@ -2649,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 { @@ -2670,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; @@ -2678,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 7c00de52..d9d2351a 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -149,11 +149,14 @@ 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-"], +[class^="icon-"], [class*=" icon-"] { background-image: url("../images/glyphicons-halflings.png"); } @@ -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,46 +1492,87 @@ h2.day, h2.network { vertical-align: middle; } -.calendarWrapper { - width:1000px; - margin:0 auto; - padding:0 3px +.daybydayWrapper { + max-width: 1400px; + margin: 0 auto; + padding: 0 /*3px*/ } -.calendarTable { - float:left; - width:142px !important; - white-space:nowrap; - table-layout:fixed !important; +.day-of-week { + float: left; + width: 14.28%; + padding: 0 2px; } -.calendarShow { - padding:0 !important +.day-of-week .day-number { + position: relative; + height: 40px; } -.calendarShow .poster { - padding-bottom:2px -} -.calendarShow .poster img { - width:142px; - height:auto +.day-of-week .day-number .number { + position: absolute; + right: 5px; + font-weight: bold; + font-size: 32px; + line-height: 38px; } -.calendarShow .text { - padding:0 5px 10px 5px +.day-of-week .day-number .day { + position: absolute; + left: 5px; + top: 3px; + text-transform: uppercase; + font-weight: bold; } -.calendarShow .text .airtime, -.calendarShow .text .episode-title { - overflow:hidden; - text-overflow:ellipsis; - display:block; - font-size:11px +.day-of-week .day-number .month { + position: absolute; + left: 5px; + bottom: 3px; + text-transform: uppercase; } -.calendarShow .show-status { - padding:5px 10px 10px; - text-align:center +.daybyday-show { + margin-top: 4px; + padding: 4px; + width: 100% +} + +.day-of-week .poster img { + border: 1px solid; + border-radius: 5px; + margin-bottom: 2px; + display: block; + margin-left: auto; + margin-right: auto; +} + +.day-of-week .text .airtime, +.day-of-week .text .episode { + overflow: hidden; + text-overflow: ellipsis; + display: block; + font-size: 12px; +} + +.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; + font-style: italic; + display: table-cell; + vertical-align: middle; + font-size: 12px; } /* ======================================================================= @@ -1591,10 +1627,13 @@ config*.tmpl padding: 12px 0 } -.stepDiv .component-desc select, -.stepDiv .component-desc input, #config div.field-pair select, #config div.field-pair input { + margin-right: 6px; +} + +.stepDiv .component-desc select, +.stepDiv .component-desc input { margin-right: 15px; } @@ -1870,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; @@ -1883,7 +1922,7 @@ div.metadataDiv .disabled { .notifier-icon { float: left; - margin: 6px 4px 0px 0px; + margin: 6px 4px 0 0; } /* ======================================================================= @@ -1915,7 +1954,7 @@ td.tableright { text-align: left; vertical-align: middle; width: 225px; - padding: 6px 0px; + padding: 6px 0; } .optionWrapper div.selectChoices { @@ -1949,9 +1988,8 @@ Global ========================================================================== */ span.path { - padding: 3px 6px; - color: #8b0000; - background-color: #f5f1e4; + padding: 3px; + margin-left: 3px; } .align-left { @@ -1965,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; @@ -2091,7 +2129,7 @@ div.blackwhitelist span { } div.blackwhitelist.anidb, div.blackwhitelist.manual { - margin: 7px 0px; + margin: 7px 0; } @@ -2111,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; } @@ -2131,7 +2169,7 @@ input, textarea, select, .uneditable-input { } .navbar-brand { - padding: 0px; + padding: 0; } /* navbar styling */ @@ -2258,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 { @@ -2815,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 { @@ -2937,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; } @@ -3153,6 +3191,15 @@ span.token-input-delete-token { z-index: 0; background-image: url(../images/poster-dark.jpg) } + +.time-am-pm { + margin-left: 2px; +} +#content.episodeview-banner .time-am-pm, +#content.episodeview-poster .time-am-pm { + margin-left: 0; +} + /* ======================================================================= jquery.confirm.css ========================================================================== */ @@ -3164,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; } @@ -3177,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, @@ -3212,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; @@ -3220,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/images/network/aande.png b/gui/slick/images/network/aande.png deleted file mode 100644 index d13b6895..00000000 Binary files a/gui/slick/images/network/aande.png and /dev/null differ diff --git a/gui/slick/images/network/ahc.png b/gui/slick/images/network/ahc.png new file mode 100644 index 00000000..76b04b4e Binary files /dev/null and b/gui/slick/images/network/ahc.png differ diff --git a/gui/slick/images/network/animalplanet.png b/gui/slick/images/network/animalplanet.png deleted file mode 100644 index 22cf4f35..00000000 Binary files a/gui/slick/images/network/animalplanet.png and /dev/null differ diff --git a/gui/slick/images/network/bbc canada.png b/gui/slick/images/network/bbc canada.png new file mode 100644 index 00000000..598d0ea6 Binary files /dev/null and b/gui/slick/images/network/bbc canada.png differ diff --git a/gui/slick/images/network/bio..png b/gui/slick/images/network/bio.png similarity index 100% rename from gui/slick/images/network/bio..png rename to gui/slick/images/network/bio.png diff --git a/gui/slick/images/network/cartoonnetwork.png b/gui/slick/images/network/cartoonnetwork.png deleted file mode 100644 index bb76719b..00000000 Binary files a/gui/slick/images/network/cartoonnetwork.png and /dev/null differ diff --git a/gui/slick/images/network/comedycentral.png b/gui/slick/images/network/comedycentral.png deleted file mode 100644 index 66331182..00000000 Binary files a/gui/slick/images/network/comedycentral.png and /dev/null differ diff --git a/gui/slick/images/network/cooking channel.png b/gui/slick/images/network/cooking channel.png new file mode 100644 index 00000000..e97314c1 Binary files /dev/null and b/gui/slick/images/network/cooking channel.png differ diff --git a/gui/slick/images/network/crackle.png b/gui/slick/images/network/crackle.png new file mode 100644 index 00000000..77d54682 Binary files /dev/null and b/gui/slick/images/network/crackle.png differ diff --git a/gui/slick/images/network/crime & investigation network.png b/gui/slick/images/network/crime & investigation network.png new file mode 100644 index 00000000..b7394a59 Binary files /dev/null and b/gui/slick/images/network/crime & investigation network.png differ diff --git a/gui/slick/images/network/crime and investigation network.png b/gui/slick/images/network/crime and investigation network.png new file mode 100644 index 00000000..b7394a59 Binary files /dev/null and b/gui/slick/images/network/crime and investigation network.png differ diff --git a/gui/slick/images/network/destination america.png b/gui/slick/images/network/destination america.png new file mode 100644 index 00000000..33c36376 Binary files /dev/null and b/gui/slick/images/network/destination america.png differ diff --git a/gui/slick/images/network/discovery channel.png b/gui/slick/images/network/discovery channel.png index aa9041c5..83e886f1 100644 Binary files a/gui/slick/images/network/discovery channel.png and b/gui/slick/images/network/discovery channel.png differ diff --git a/gui/slick/images/network/discovery family.png b/gui/slick/images/network/discovery family.png new file mode 100644 index 00000000..3fec247e Binary files /dev/null and b/gui/slick/images/network/discovery family.png differ diff --git a/gui/slick/images/network/discovery kids.png b/gui/slick/images/network/discovery kids.png new file mode 100644 index 00000000..81e70635 Binary files /dev/null and b/gui/slick/images/network/discovery kids.png differ diff --git a/gui/slick/images/network/discovery real time.png b/gui/slick/images/network/discovery real time.png new file mode 100644 index 00000000..35ec2bd6 Binary files /dev/null and b/gui/slick/images/network/discovery real time.png differ diff --git a/gui/slick/images/network/discovery science.png b/gui/slick/images/network/discovery science.png new file mode 100644 index 00000000..759dbcd6 Binary files /dev/null and b/gui/slick/images/network/discovery science.png differ diff --git a/gui/slick/images/network/discovery.png b/gui/slick/images/network/discovery.png index aa9041c5..2601a03a 100644 Binary files a/gui/slick/images/network/discovery.png and b/gui/slick/images/network/discovery.png differ diff --git a/gui/slick/images/network/discoverychannel.png b/gui/slick/images/network/discoverychannel.png deleted file mode 100644 index aa9041c5..00000000 Binary files a/gui/slick/images/network/discoverychannel.png and /dev/null differ diff --git a/gui/slick/images/network/disneychannel.png b/gui/slick/images/network/disneychannel.png deleted file mode 100644 index df415d27..00000000 Binary files a/gui/slick/images/network/disneychannel.png and /dev/null differ diff --git a/gui/slick/images/network/el rey network.png b/gui/slick/images/network/el rey network.png new file mode 100644 index 00000000..c5ee7b38 Binary files /dev/null and b/gui/slick/images/network/el rey network.png differ diff --git a/gui/slick/images/network/food network canada.png b/gui/slick/images/network/food network canada.png new file mode 100644 index 00000000..58466bc0 Binary files /dev/null and b/gui/slick/images/network/food network canada.png differ diff --git a/gui/slick/images/network/fxnetworks.png b/gui/slick/images/network/fxnetworks.png deleted file mode 100644 index a6ad70c1..00000000 Binary files a/gui/slick/images/network/fxnetworks.png and /dev/null differ diff --git a/gui/slick/images/network/g4_2.png b/gui/slick/images/network/g4_2.png deleted file mode 100644 index 1df370a9..00000000 Binary files a/gui/slick/images/network/g4_2.png and /dev/null differ diff --git a/gui/slick/images/network/great american country.png b/gui/slick/images/network/great american country.png new file mode 100644 index 00000000..c8560012 Binary files /dev/null and b/gui/slick/images/network/great american country.png differ diff --git a/gui/slick/images/network/hgtv canada.png b/gui/slick/images/network/hgtv canada.png new file mode 100644 index 00000000..6e64a5d1 Binary files /dev/null and b/gui/slick/images/network/hgtv canada.png differ diff --git a/gui/slick/images/network/hgtv.png b/gui/slick/images/network/hgtv.png new file mode 100644 index 00000000..86ee82b2 Binary files /dev/null and b/gui/slick/images/network/hgtv.png differ diff --git a/gui/slick/images/network/investigation discovery.png b/gui/slick/images/network/investigation discovery.png new file mode 100644 index 00000000..084a3153 Binary files /dev/null and b/gui/slick/images/network/investigation discovery.png differ diff --git a/gui/slick/images/network/sky atlantic.png b/gui/slick/images/network/sky atlantic.png new file mode 100644 index 00000000..46dc6384 Binary files /dev/null and b/gui/slick/images/network/sky atlantic.png differ diff --git a/gui/slick/images/network/the discovery channel.png b/gui/slick/images/network/the discovery channel.png new file mode 100644 index 00000000..3765c50c Binary files /dev/null and b/gui/slick/images/network/the discovery channel.png differ diff --git a/gui/slick/images/network/the hub.png b/gui/slick/images/network/the hub.png new file mode 100644 index 00000000..34e5e0fb Binary files /dev/null and b/gui/slick/images/network/the hub.png differ diff --git a/gui/slick/images/network/the science channel.png b/gui/slick/images/network/the science channel.png new file mode 100644 index 00000000..759dbcd6 Binary files /dev/null and b/gui/slick/images/network/the science channel.png differ diff --git a/gui/slick/images/network/the-cw.png b/gui/slick/images/network/the-cw.png deleted file mode 100644 index 67f5abb1..00000000 Binary files a/gui/slick/images/network/the-cw.png and /dev/null differ diff --git a/gui/slick/images/network/thecw.png b/gui/slick/images/network/thecw.png deleted file mode 100644 index 67f5abb1..00000000 Binary files a/gui/slick/images/network/thecw.png and /dev/null differ diff --git a/gui/slick/images/network/thewb.png b/gui/slick/images/network/thewb.png deleted file mode 100644 index b575a09c..00000000 Binary files a/gui/slick/images/network/thewb.png and /dev/null differ diff --git a/gui/slick/images/network/tlc.png b/gui/slick/images/network/tlc.png new file mode 100644 index 00000000..c48a68e3 Binary files /dev/null and b/gui/slick/images/network/tlc.png differ diff --git a/gui/slick/images/network/usa-network.png b/gui/slick/images/network/usa-network.png deleted file mode 100644 index 8bec2afc..00000000 Binary files a/gui/slick/images/network/usa-network.png and /dev/null differ diff --git a/gui/slick/images/network/usanetwork.png b/gui/slick/images/network/usanetwork.png deleted file mode 100644 index 8bec2afc..00000000 Binary files a/gui/slick/images/network/usanetwork.png and /dev/null differ diff --git a/gui/slick/images/network/velocity.png b/gui/slick/images/network/velocity.png new file mode 100644 index 00000000..ff4700ee Binary files /dev/null and b/gui/slick/images/network/velocity.png differ diff --git a/gui/slick/images/network/watch.png b/gui/slick/images/network/watch.png new file mode 100644 index 00000000..8b9f9264 Binary files /dev/null and b/gui/slick/images/network/watch.png differ diff --git a/gui/slick/images/network/yahoo! screen.png b/gui/slick/images/network/yahoo! screen.png index e9efa1b6..7e16628b 100644 Binary files a/gui/slick/images/network/yahoo! screen.png and b/gui/slick/images/network/yahoo! screen.png differ 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 9e012219..00000000 --- a/gui/slick/interfaces/default/comingEpisodes.tmpl +++ /dev/null @@ -1,549 +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: - - -   - - Sort By: - - -   - - 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 - - - - #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 - - - - - #end if - - #end for - #if not $day_has_show: - - #end if - -
$sbdatetime.sbdatetime.sbfdate($day, '%A').decode($sickbeard.SYS_ENCODING).capitalize()
-
- -
-
- - ${airtime} on $cur_result["network"] - - - <%= 'S%02iE%02i' % (int(cur_result['season']), int(cur_result['episode'])) %> - $cur_result['name'] - -
-
No shows for this day
- #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 02e2a74c..b375636c 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -103,9 +103,9 @@ as the default selection when adding new shows @@ -127,7 +127,7 @@ Show root directories

where the files of shows are located

- #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_rootDirs.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_rootDirs.tmpl')
@@ -246,10 +246,10 @@
@@ -259,16 +259,16 @@ Date style: @@ -279,11 +279,12 @@ Time style: - note: seconds are only shown on the History page + note: seconds are only shown on the History page @@ -450,9 +451,9 @@ Branch version:

select branch to use (restart required)

@@ -460,6 +461,24 @@ + #set pulls = sickbeard.versionCheckScheduler.action.list_remote_pulls() + #if len(pulls) > 0 and $sickbeard.BRANCH != 'master': +
+ +
+ #end if +

-
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/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl index 7eaccdf6..8c4c31ee 100644 --- a/gui/slick/interfaces/default/config_providers.tmpl +++ b/gui/slick/interfaces/default/config_providers.tmpl @@ -214,13 +214,13 @@ #end if - #if $hasattr($curNewznabProvider, 'enable_daily'): + #if $hasattr($curNewznabProvider, 'enable_recentsearch'):
-
@@ -292,13 +292,13 @@ #end if - #if $hasattr($curNzbProvider, 'enable_daily'): + #if $hasattr($curNzbProvider, 'enable_recentsearch'):
-
@@ -512,13 +512,13 @@ #end if - #if $hasattr($curTorrentProvider, 'enable_daily'): + #if $hasattr($curTorrentProvider, 'enable_recentsearch'):
-
diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl index 96fa4c25..92cc1e79 100755 --- a/gui/slick/interfaces/default/config_search.tmpl +++ b/gui/slick/interfaces/default/config_search.tmpl @@ -90,10 +90,10 @@
@@ -139,11 +139,11 @@
-
@@ -421,6 +421,7 @@

URL to your torrent client (e.g. http://localhost:8000/)

+
@@ -436,7 +437,7 @@ -
+