diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index ccb8734ac2dad9b45d5644ff1f414f42446f1f16..b9ffa8e060d021a202781c0b68b1aee4f3ccb491 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -574,6 +574,14 @@ config*.mako color: #fff; } +#provider_order_list .ui-state-default.torrent-provider { + background-color: #555 !important; +} + +#provider_order_list .ui-state-default.nzb-provider { + background-color: #222 !important; +} + [class^="icon16-"], [class*=" icon16-"] { background-image: url("../images/glyphicons-config-white.png"); background-position: -40px 0; diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 7e9ccc96a97a2bb27a7a2630a9175d58a8845151..c1fc73535bed00339e44ad523d418d56c44885d2 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -1656,6 +1656,14 @@ select .selected { font-size: 14px; } +#provider_order_list .ui-state-default.torrent-provider { + background-color: #FFFFFF !important; +} + +#provider_order_list .ui-state-default.nzb-provider { + background-color: #DDD !important; +} + #provider_order_list input, #service_order_list input { margin: 0px 2px; diff --git a/gui/slick/views/config_providers.mako b/gui/slick/views/config_providers.mako index 1078218c57e6d998341afd2cd4dde42b9d898532..09ed191ad52e1cc9cbfcaac45c865a42fee832c6 100644 --- a/gui/slick/views/config_providers.mako +++ b/gui/slick/views/config_providers.mako @@ -79,12 +79,13 @@ $('#config-components').tabs(); curName = curProvider.getID() %> - <li class="ui-state-default ${('private', 'public')[bool(curProvider.public)]}" id="${curName}"> + <li class="ui-state-default ${('nzb-provider', 'torrent-provider')[bool(curProvider.providerType == "torrent")]}" id="${curName}"> <input type="checkbox" id="enable_${curName}" class="provider_enabler" ${('', 'checked="checked"')[curProvider.isEnabled() == True]}/> <a href="${anon_url(curProvider.url)}" class="imgLink" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;"><img src="${sbRoot}/images/providers/${curProvider.imageName()}" alt="${curProvider.name}" title="${curProvider.name}" width="16" height="16" style="vertical-align:middle;"/></a> <span style="vertical-align:middle;">${curProvider.name}</span> ${('*', '')[bool(curProvider.supportsBacklog)]} <span class="ui-icon ui-icon-arrowthick-2-n-s pull-right" style="vertical-align:middle;"></span> + <span class="ui-icon ${('ui-icon-locked','ui-icon-unlocked')[bool(curProvider.public)]} pull-right" style="vertical-align:middle;"></span> </li> % endfor </ul> diff --git a/gui/slick/views/editShow.mako b/gui/slick/views/editShow.mako index 66c75be55fc4ab25e91ceebe96f43ad667bad24b..ffce6c2fa4cddf409af077790c63d3b165ce45a0 100644 --- a/gui/slick/views/editShow.mako +++ b/gui/slick/views/editShow.mako @@ -71,6 +71,9 @@ $(this).toggle_SceneException(); </script> +% if show.is_anime: + <script type="text/javascript" src="${sbRoot}/js/blackwhite.js?${sbPID}"></script> +% endif </%block> <%block name="content"> % if not header is UNDEFINED: @@ -189,7 +192,6 @@ Separate words with a comma, e.g. "word1,word2,word3"<br /> % if show.is_anime: <%include file="/inc_blackwhitelist.mako"/> - <script type="text/javascript" src="${sbRoot}/js/blackwhite.js?${sbPID}"></script> % endif <input type="submit" id="submit" value="Submit" class="btn btn-primary" /> diff --git a/gui/slick/views/home.mako b/gui/slick/views/home.mako index 38c2b76c763d669bd5c48f22c161e4b1282d28bf..9acb800665c78346dfbe8721bd371c2dbff60e80 100644 --- a/gui/slick/views/home.mako +++ b/gui/slick/views/home.mako @@ -391,7 +391,7 @@ <div class="${fuzzydate}"> <time datetime="${pdatetime.isoformat('T')}" class="date">${temp_sbfdate_prev}</time> </div> - <span class="sort_data">${temp_sbfdate_prev}</span> + <span class="sort_data">${temp_timegm_prev}</span> </td> % except ValueError: <td align="center" class="nowrap"></td> diff --git a/gui/slick/views/manage_manageSearches.mako b/gui/slick/views/manage_manageSearches.mako index 42039f29c8d1a43db93ebf407944c8b9bc021458..647ed15f3d919edd30968447c470438fd513ecd2 100644 --- a/gui/slick/views/manage_manageSearches.mako +++ b/gui/slick/views/manage_manageSearches.mako @@ -35,7 +35,9 @@ ${('Not in progress', 'In Progress')[dailySearchStatus]}<br /> <h3>Find Propers Search:</h3> <a class="btn ${('disabled', '')[bool(sickbeard.DOWNLOAD_PROPERS)]}" href="${sbRoot}/manage/manageSearches/forceFindPropers"><i class="icon-exclamation-sign"></i> Force</a> -% if not findPropersStatus: +% if not sickbeard.DOWNLOAD_PROPERS: + Propers search disabled <br /> +% elif not findPropersStatus: Not in progress<br /> % else: In Progress<br /> diff --git a/sickbeard/providers/binsearch.py b/sickbeard/providers/binsearch.py index 6dba1f55289623bd46f8a89c5f6e4844e833a74f..d1462ea1b8db3d1ad550e0ea4177d31942f06a01 100644 --- a/sickbeard/providers/binsearch.py +++ b/sickbeard/providers/binsearch.py @@ -27,6 +27,7 @@ class BinSearchProvider(generic.NZBProvider): def __init__(self): generic.NZBProvider.__init__(self, "BinSearch") self.enabled = False + self.public = True self.cache = BinSearchCache(self) self.urls = {'base_url': 'https://www.binsearch.info/'} self.url = self.urls['base_url']