+
Initial
#set $anyQualityList = filter(lambda x: x > $Quality.NONE, $Quality.qualityStrings)
#for $curQuality in sorted($anyQualityList):
- $Quality.qualityStrings[$curQuality]
+ $Quality.qualityStrings[$curQuality]
#end for
@@ -40,7 +42,7 @@
#set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings)
#for $curQuality in sorted($bestQualityList):
- $Quality.qualityStrings[$curQuality]
+ $Quality.qualityStrings[$curQuality]
#end for
-
- SickGear will be dropping support for Python 2.7.8 and below. We recommend updating to latest version:
- Download here
-
+
+
As per notify 29 Nov 2015, SickGear no longer supports Python 2.7.8 and older2.7.9 or newer (not 3.x.x): Download here
+
#end if
#if $sickbeard.NEWEST_VERSION_STRING
diff --git a/gui/slick/js/configNotifications.js b/gui/slick/js/configNotifications.js
index d616e3c3..1e55af94 100644
--- a/gui/slick/js/configNotifications.js
+++ b/gui/slick/js/configNotifications.js
@@ -37,22 +37,30 @@
});
});
- $('#testXBMC').click(function () {
- var xbmc_host = $.trim($('#xbmc_host').val());
- var xbmc_username = $.trim($('#xbmc_username').val());
- var xbmc_password = $.trim($('#xbmc_password').val());
- if (!xbmc_host) {
- $('#testXBMC-result').html('Please fill out the necessary fields above.');
- $('#xbmc_host').addClass('warning');
+ $('#testEMBY').click(function () {
+ var emby_host = $('#emby_host').val();
+ var emby_apikey = $('#emby_apikey').val();
+ if (!emby_host || !emby_apikey) {
+ $('#testEMBY-result').html('Please fill out the necessary fields above.');
+ if (!emby_host) {
+ $('#emby_host').addClass('warning');
+ } else {
+ $('#emby_host').removeClass('warning');
+ }
+ if (!emby_apikey) {
+ $('#emby_apikey').addClass('warning');
+ } else {
+ $('#emby_apikey').removeClass('warning');
+ }
return;
}
- $('#xbmc_host').removeClass('warning');
+ $('#emby_host, #emby_apikey').removeClass('warning');
$(this).prop('disabled', true);
- $('#testXBMC-result').html(loading);
- $.get(sbRoot + '/home/testXBMC', {'host': xbmc_host, 'username': xbmc_username, 'password': xbmc_password})
+ $('#testEMBY-result').html(loading);
+ $.get(sbRoot + '/home/testEMBY', {'host': emby_host, 'apikey': emby_apikey})
.done(function (data) {
- $('#testXBMC-result').html(data);
- $('#testXBMC').prop('disabled', false);
+ $('#testEMBY-result').html(data);
+ $('#testEMBY').prop('disabled', false);
});
});
@@ -75,6 +83,25 @@
});
});
+ $('#testXBMC').click(function () {
+ var xbmc_host = $.trim($('#xbmc_host').val());
+ var xbmc_username = $.trim($('#xbmc_username').val());
+ var xbmc_password = $.trim($('#xbmc_password').val());
+ if (!xbmc_host) {
+ $('#testXBMC-result').html('Please fill out the necessary fields above.');
+ $('#xbmc_host').addClass('warning');
+ return;
+ }
+ $('#xbmc_host').removeClass('warning');
+ $(this).prop('disabled', true);
+ $('#testXBMC-result').html(loading);
+ $.get(sbRoot + '/home/testXBMC', {'host': xbmc_host, 'username': xbmc_username, 'password': xbmc_password})
+ .done(function (data) {
+ $('#testXBMC-result').html(data);
+ $('#testXBMC').prop('disabled', false);
+ });
+ });
+
// show instructions for plex when enabled
$('#use_plex').click(function() {
if ( $(this).is(':checked') ) {
diff --git a/gui/slick/js/editShow.js b/gui/slick/js/editShow.js
index 9c6cc74b..1717bd91 100644
--- a/gui/slick/js/editShow.js
+++ b/gui/slick/js/editShow.js
@@ -2,81 +2,72 @@
$(document).ready(function () {
- $.getJSON(sbRoot + '/home/addShows/getIndexerLanguages', {}, function (data) {
- var resultStr, flag, selected, current_lang_added = '';
-
- if (data.results.length === 0) {
- flag = ' class="flag" style="background-image:url(' + sbRoot + '/images/flags/' + config.show_lang + '.png)"';
- resultStr = '
' + config.show_lang + ' ';
- } else {
- current_lang_added = false;
- $.each(data.results, function (index, obj) {
-
- if (obj === config.show_lang) {
- selected = ' selected="selected"';
- current_lang_added = true;
- }
- else {
- selected = '';
- }
-
- flag = ' class="flag" style="background-image:url(' + sbRoot + '/images/flags/' + obj + '.png);"';
- resultStr += '
' + obj + ' ';
- });
-
- if (!current_lang_added) {
- resultStr += '
' + config.show_lang + ' ';
- }
-
- }
- $('#indexerLangSelectEdit').html(resultStr);
-
- });
-
-
- var all_exceptions = [];
-
$('#location').fileBrowser({title: 'Select Show Location'});
- $('#submit').click(function () {
- all_exceptions = [];
+ function htmlFlag(lang) {
+ return ' class="flag" style="background-image:url(' + sbRoot + '/images/flags/' + lang + '.png)"'
+ }
- $('#exceptions_list').find('option').each (function () {
- all_exceptions.push($(this).val());
+ $.getJSON(sbRoot + '/home/addShows/getIndexerLanguages', {}, function (data) {
+ var result = '', currentLangAdded = '', selected = ' selected="selected"';
+
+ if (0 == data.results.length) {
+ result = '
'
+ + config.showLang + ' ';
+ } else {
+ currentLangAdded = !1;
+ $.each(data.results, function (index, strLang) {
+
+ var htmlSelected = '';
+ if (strLang === config.showLang) {
+ currentLangAdded = !0;
+ htmlSelected = selected;
+ }
+
+ result += '
'
+ + strLang + ' ';
+ });
+
+ if (!currentLangAdded)
+ result += '
' + config.showLang + ' ';
+ }
+
+ $('#indexerLangSelectEdit').html(result);
+ });
+
+ function getExceptions() {
+ var allExceptions = [];
+
+ $('#exceptions_list').find('option').each(function () {
+ allExceptions.push($(this).val());
});
- $('#exceptions_list').val(all_exceptions);
- if (config.show_isanime) {
+ return allExceptions
+ }
+
+ $('#submit').click(function () {
+ $('#exceptions_list').val(getExceptions());
+ if (config.showIsAnime)
generate_bwlist();
- }
});
$('#addSceneName').click(function () {
- var scene_ex = $('#SceneName').val();
- var scene_ex_season = $('#SceneNameSeason').val();
- var option = $('
');
- all_exceptions = [];
+ var elSceneName = $('#SceneName'), elSceneNameSeason = $('#SceneNameSeason'),
+ sceneEx = elSceneName.val(), sceneExSeason = elSceneNameSeason.val();
- $('#exceptions_list').find('option').each (function () {
- all_exceptions.push($(this).val());
- });
+ elSceneName.val('');
+ elSceneNameSeason.val('');
- $('#SceneName').val('');
- $('#SceneNameSeason').val('');
-
- if ($.inArray(scene_ex_season + '|' + scene_ex, all_exceptions) > -1 || (scene_ex === '')) {
+ if (-1 < $.inArray(sceneExSeason + '|' + sceneEx, getExceptions()) || ('' === sceneEx))
return;
- }
- $('#SceneException').show();
- option.attr('value', scene_ex_season + '|' + scene_ex);
- if (scene_ex_season === "-1") {
- option.html('S*: ' + scene_ex);
- }
- else {
- option.html('S' + scene_ex_season + ': ' + scene_ex);
- }
- return option.appendTo('#exceptions_list');
+ $('#SceneException').fadeIn('fast', 'linear');
+
+ var option = $(' ');
+ option.attr('value', sceneExSeason + '|' + sceneEx);
+ option.html((config.showIsAnime ? 'S' + ('-1' === sceneExSeason ? '*' : sceneExSeason) + ': ' : '') + sceneEx);
+
+ return option.appendTo($('#exceptions_list'));
});
$('#removeSceneName').click(function () {
@@ -86,21 +77,41 @@ $(document).ready(function () {
});
$.fn.toggle_SceneException = function () {
- all_exceptions = [];
+ var elSceneException = $('#SceneException');
- $('#exceptions_list').find('option').each (function () {
- all_exceptions.push($(this).val());
- });
-
- if ('' === all_exceptions) {
- $('#SceneException').hide();
- }
- else {
- $('#SceneException').show();
- }
+ if (0 == getExceptions().length)
+ elSceneException.fadeOut('fast', 'linear');
+ else
+ elSceneException.fadeIn('fast', 'linear');
};
$(this).toggle_SceneException();
+ var elABD = $('#air_by_date'), elScene = $('#scene'), elSports = $('#sports'), elAnime = $('#anime');
-});
\ No newline at end of file
+ function uncheck(el){el.prop('checked', !1)}
+ function checked(el){return el.prop('checked')}
+
+ function isAnime(){
+ uncheck(elABD); uncheck(elSports);
+ if (config.showIsAnime){ $('#blackwhitelist').fadeIn('fast', 'linear'); } return !0; }
+ function isScene(){ uncheck(elABD); uncheck(elSports); }
+ function isABD(){ uncheck(elAnime); uncheck(elScene); $('#blackwhitelist').fadeOut('fast', 'linear'); }
+ function isSports(){ uncheck(elAnime); uncheck(elScene); $('#blackwhitelist').fadeOut('fast', 'linear'); }
+
+ if (checked(elAnime)) { isAnime(); }
+ if (checked(elScene)) { isScene(); }
+ if (checked(elABD)) { isABD(); }
+ if (checked(elSports)) { isSports() }
+
+ elAnime.on('click', function() {
+ if (checked(elAnime))
+ isAnime() && !config.showIsAnime && $('#anime-options').fadeIn('fast', 'linear');
+ else
+ $('#blackwhitelist, #anime-options').fadeOut('fast', 'linear');
+ });
+ elScene.on('click', function() { isScene(); });
+ elABD.on('click', function() { isABD(); });
+ elSports.on('click', function() { isSports() });
+
+});
diff --git a/gui/slick/js/inc_top.js b/gui/slick/js/inc_top.js
index 2af9b287..00187472 100644
--- a/gui/slick/js/inc_top.js
+++ b/gui/slick/js/inc_top.js
@@ -27,10 +27,12 @@ function initActions() {
$('#SubMenu a:contains("Show Queue Overview")').addClass('btn').html(' 
+ 
+ 
@@ -396,7 +450,6 @@
diff --git a/gui/slick/interfaces/default/editShow.tmpl b/gui/slick/interfaces/default/editShow.tmpl
index 2b219273..8fa311ab 100644
--- a/gui/slick/interfaces/default/editShow.tmpl
+++ b/gui/slick/interfaces/default/editShow.tmpl
@@ -6,9 +6,10 @@
#import sickbeard.blackandwhitelist
##
#set global $title = 'Edit ' + $show.name
-#set global $header = 'Edit ' + $show.name
+#set global $header = $show.name
#set global $sbPath = '..'
#set global $topmenu = 'home'
+#set global $page_body_attr = 'edit-show'
##
#import os.path
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
@@ -16,13 +17,10 @@
#if $varExists('header')
-