diff --git a/CHANGES.md b/CHANGES.md index fad0b878..04de6adf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -64,17 +64,22 @@ * Change increase frequency of updating show data * Remove Animenzb provider * Change increase the scope and number of non release group text that is identified and removed -* Add a general config setting to allow adding incomplete show data +* Add general config setting to allow adding incomplete show data * Change to throttle connection rate on thread initiation for adba library * Change default manage episodes selector to Snatched episodes if items exist else Wanted on Episode Status Manage page * Change snatched row colour on Episode Status Manage page to match colour used on the show details page * Change replace trakt with libtrakt for API v2 -* Change Trakt notification config to only handle PIN authentication with the service +* Change improve robustness of Trakt communications +* Change Trakt notification config to use PIN authentication with the service +* Add multiple Trakt account support to Config/Notifications/Social +* Add setting to Trakt notification to update collection with downloaded episode info +* Change trakt notifier logo * Remove all other Trakt deprecated API V1 service features pending reconsideration * Change increase show search capability when using plain text and also add TVDB id, IMDb id and IMDb url search * Change improve existing show page and the handling when an attempt to add a show to an existing location * Change consolidate Trakt Trending and Recommended views into an "Add From Trakt" view which defaults to trending -* Change Trakt view drop down "Show" to reveal Brand-new Shows, Season Premieres, Recommendations and Trending views +* Change Add from Trakt/"Shows:" with Anticipated, New Seasons, New Shows, Popular, Recommendations, and Trending views +* Change Add from Trakt/"Shows:" with Most Watched, Collected during the last month on Trakt * Change add season info to "Show: Trakt New Seasons" view on the Add from Trakt page * Change increase number of displayed Trakt shows to 100 * Add genres and rating to all Trakt shows @@ -102,6 +107,8 @@ * Change to always display branch and commit hash on 'Help & Info' page * Add option to create season search exceptions from editShow page * Change sab to use requests library +* Add "View Changes" to tools menu +* Change disable connection attempts and remove UI references to the TVRage info source ### 0.10.0 (2015-08-06 11:05:00 UTC) diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 715cb0ec..69da66e5 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -528,6 +528,15 @@ h2.day, h2.network{ border-color:#8DBEEE } +/* ======================================================================= +viewchanges.tmpl +========================================================================== */ +#changes{ + color:rgb(255,255,255); + background-color:rgb(61,61,61); + border:1px solid rgb(17,17,17) +} + /* ======================================================================= config*.tmpl ========================================================================== */ @@ -626,6 +635,14 @@ div.metadataDiv .disabled{ background:url("../images/warning16.png") no-repeat right 5px center #fff } +.solid-border{ + border:1px solid #555 +} + +.solid-border-top{ + border-top:1px solid #555 +} + /* ======================================================================= manage*.tmpl ========================================================================== */ @@ -1181,7 +1198,7 @@ browser.css #fileBrowserDialog ul li a:hover{ color:#09a2ff; - background:none + background: rgb(61, 61, 61) none } .ui-menu .ui-menu-item{ @@ -1215,6 +1232,10 @@ div.stepsguide .step p{ color:#646464 } +#newShowPortal #addShowForm .stepsguide .disabledstep:hover > .smalltext{ + color:#ccc; +} + div.stepsguide .disabledstep p{ border-color:#1178B3 } diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index 258ca6d3..0b30169b 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -510,6 +510,15 @@ h2.day, h2.network{ border-color:#C7DB40 } +/* ======================================================================= +viewchanges.tmpl +========================================================================== */ +#changes{ + color:rgb(51,51,51); + background-color:rgb(245,245,245); + border:1px solid rgb(204,204,204) +} + /* ======================================================================= config*.tmpl ========================================================================== */ @@ -601,6 +610,14 @@ div.metadataDiv .disabled{ background:url("../images/warning16.png") no-repeat right 5px center #fff } +.solid-border{ + border:1px solid #ccc +} + +.solid-border-top{ + border-top:1px solid #ccc +} + /* ======================================================================= manage*.tmpl ========================================================================== */ @@ -1143,7 +1160,7 @@ browser.css #fileBrowserDialog ul li a:hover{ color:#00f; - background:none + background: rgb(220, 220, 220) none } .ui-menu .ui-menu-item{ @@ -1181,6 +1198,10 @@ div.stepsguide .disabledstep p{ border-color:#8a775e } +#newShowPortal #addShowForm .stepsguide .disabledstep:hover > .smalltext{ + color:#8a775e; +} + div.formpaginate .prev, div.formpaginate .next{ color:#fff; background:#57442b diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index ae724e74..9e591042 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -2103,6 +2103,36 @@ td.col-cache{ width:20px } +/* ======================================================================= +viewchanges.tmpl +========================================================================== */ +#changes{ + display:block; + padding:9.5px; + border-radius:4px 4px 4px 4px; + font:12px/13px "Open Sans",verdana,sans-serif +} + +#changes .release{ + margin:15px 5px 6px 0; + padding-bottom:3px; + border-bottom:1px solid gray +} + +#changes .ver{font:16px/17px "Open Sans",verdana,sans-serif;margin-right:0.2em;} +#changes .old{padding-top:15px} + +#changes div{margin:0 0 8px} +#changes .btn-text{width:5em;margin-right:0.2em;float:left} +#changes .change-text{display:block;margin-left:5.5em;padding-top:2px} + +.change-add{background-color:rgb(63,127,0)} +.change-change{background-color:rgb(91,153,13)} +.change-fix{background-color:rgb(38,114,182)} +.change-port{background-color:rgb(102,102,102)} +.change-remove{} +.change-update{background-color:rgb(98,25,147)} + /* ======================================================================= config*.tmpl @@ -2529,6 +2559,32 @@ div.metadataDiv .disabled{ margin:6px 4px 0 0 } +#trakt-collection th,#trakt-collection td{ + padding:3px 5px +} + +#trakt-collection .col-1{ + text-align:left +} + +#trakt-collection th,#trakt-collection td.opt{ + text-align:center +} + +#trakt-collection .col-1{ + width:192px +} + +#config #trakt-collection input{ + float:none; + margin:0; + vertical-align:middle +} + +#config .trakt.component-desc{ + margin-left:0 +} + /* ======================================================================= manage*.tmpl ========================================================================== */ @@ -2630,6 +2686,7 @@ span.path{ line-height:18px } +span.btn-text, 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)); diff --git a/gui/slick/images/notifiers/trakt.png b/gui/slick/images/notifiers/trakt.png index a767eea4..e91f57f1 100644 Binary files a/gui/slick/images/notifiers/trakt.png and b/gui/slick/images/notifiers/trakt.png differ diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index ece49e06..4021ad1e 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -122,22 +122,22 @@ - +#if 1 < $len($indexers)
- +#end if
diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl index 86ce8193..242fd89e 100644 --- a/gui/slick/interfaces/default/config_notifications.tmpl +++ b/gui/slick/interfaces/default/config_notifications.tmpl @@ -1,3 +1,4 @@ +#import base64 #import sickbeard #import re #from lib.libtrakt import TraktAPI @@ -13,9 +14,9 @@ -#if $varExists('header') +#if $varExists('header')

$header

-#else +#else

$title

#end if @@ -155,7 +156,7 @@ -
+

Kodi

@@ -275,7 +276,7 @@
- +
@@ -1481,16 +1482,77 @@
+
+ +
+ +#set num_accounts = len($trakt_accounts) +#set $num_columns = (1, num_accounts)[1 < num_accounts] + + + + + + + +#if not len($trakt_accounts) + +#end if +#for $void, $account in $trakt_accounts.items() + +#end for + + + +#if not $root_dirs: + #set $root_dirs = [{'root_def': False, 'loc': 'all folders. Multiple parent folders will appear here.', 'b64': ''}] +#end if +#for $root_info in $root_dirs: + + + #if not len($trakt_accounts) + + #end if + #for $void, $account in $trakt_accounts.items() + #set $cur_selected = ('', ' checked="checked"')[$root_info['loc'] in $sickbeard.TRAKT_UPDATE_COLLECTION.get($account.account_id, '')] + #set $id_loc = "update_trakt_%s_%s" % ($account.account_id, $root_info['b64']) + + #end for + + + + +#end for + +
Update multiple accounts with downloaded episode info#echo not len($trakt_accounts) and 'Connect New Pin' or 1 < len($trakt_accounts) and 'Trakt accounts' or 'Account'#
..$account.name#if $account.active then '' else '
(inactive)'#
Update collection.. + +
for #if $root_info['root_def'] then '*' else ''#$root_info['loc']
+ +
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/interfaces/default/home_browseShows.tmpl b/gui/slick/interfaces/default/home_browseShows.tmpl index 1a6c7cb3..2c565f9f 100644 --- a/gui/slick/interfaces/default/home_browseShows.tmpl +++ b/gui/slick/interfaces/default/home_browseShows.tmpl @@ -128,10 +128,18 @@ #if 'Trakt' == $browse_type #set $mode = $kwargs and $kwargs.get('mode', None) #set $selected = ' class="selected"' - - + - + + + + + + #for $account in $sickbeard.TRAKT_ACCOUNTS + #if $sickbeard.TRAKT_ACCOUNTS[$account].active and $sickbeard.TRAKT_ACCOUNTS[$account].name + + #end if + #end for #end if diff --git a/gui/slick/interfaces/default/home_massAddTable.tmpl b/gui/slick/interfaces/default/home_massAddTable.tmpl index 96aa8246..b27181e1 100644 --- a/gui/slick/interfaces/default/home_massAddTable.tmpl +++ b/gui/slick/interfaces/default/home_massAddTable.tmpl @@ -31,13 +31,16 @@ #set $indexer = $curDir['existing_info'][2] #end if + #set $indexer = $sickbeard.INDEXER_DEFAULT + +#* #set $indexer = 0 #if $curDir['existing_info'][0] #set $indexer = $curDir['existing_info'][2] #elif 0 < $sickbeard.INDEXER_DEFAULT #set $indexer = $sickbeard.INDEXER_DEFAULT #end if - +*# @@ -58,7 +61,9 @@ diff --git a/gui/slick/interfaces/default/home_newShow.tmpl b/gui/slick/interfaces/default/home_newShow.tmpl index f8eb5166..f62c723e 100644 --- a/gui/slick/interfaces/default/home_newShow.tmpl +++ b/gui/slick/interfaces/default/home_newShow.tmpl @@ -49,20 +49,29 @@ #else + #if 2 > $len($indexers) + + + #end if   -  * - -   - +  * + + #if 1 < $len($indexers) + + #end if +   +

Enter show name, TVDB ID, IMDb Url, or IMDb ID.  *SickGear supports english, language is used for show/episode data

diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index 9177b287..02d2c25f 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -168,9 +168,11 @@
  • System
      -
    • Force Version Check
      • +
    • Check for Updates
      • +
    • View Changes
      • +
    • #if $sickbeard.WEB_USERNAME or $sickbeard.WEB_PASSWORD -
    • Logout
      • +
    • Logout
      • #end if
    • Restart
    • Shutdown
      • diff --git a/gui/slick/interfaces/default/viewchanges.tmpl b/gui/slick/interfaces/default/viewchanges.tmpl new file mode 100644 index 00000000..140d3417 --- /dev/null +++ b/gui/slick/interfaces/default/viewchanges.tmpl @@ -0,0 +1,20 @@ +#import sickbeard +## +#set global $header = 'Changes' +#set global $title = 'Changes' +#set global $topmenu = '' +## +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') + +

      $header

      + +
      +
      +#for $i, $change in $enumerate($changelist)##if 'rel' == $change['type']# +
      $change['ver'] $change['date']
      +#else#
      $change['type'] $change['text']
      +#end if##end for# +
      +
      + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/js/configNotifications.js b/gui/slick/js/configNotifications.js index 1f47dcbd..9bfde006 100644 --- a/gui/slick/js/configNotifications.js +++ b/gui/slick/js/configNotifications.js @@ -1,4 +1,4 @@ -$(document).ready(function(){ +$(document).ready(function(){ var loading = ''; $('#testGrowl').click(function () { @@ -353,28 +353,162 @@ $(document).ready(function(){ }); var elTraktAuth = $('#trakt-authenticate'), elTraktAuthResult = $('#trakt-authentication-result'); - elTraktAuth.click(function() { - var elTrakt = $('#trakt_pin'), traktPin = $.trim(elTrakt.val()); - if(!traktPin) { - elTrakt.addClass('warning'); + + function trakt_send_auth(){ + var elAccountSelect = $('#trakt_accounts'), strCurAccountId = elAccountSelect.find('option:selected').val(), + elTraktPin = $('#trakt_pin'), strPin = $.trim(elTraktPin.val()); + + elTraktAuthResult.html(loading); + + $.get(sbRoot + '/home/trakt_authenticate', {'pin': strPin, 'account': strCurAccountId}) + .done(function(data) { + elTraktAuth.prop('disabled', !1); + elTraktPin.val(''); + + var JSONData = $.parseJSON(data); + + elTraktAuthResult.html('Success' == JSONData.result + ? JSONData.result + ' account: ' + JSONData.account_name + : JSONData.result + ' ' + JSONData.error_message); + + if ('Success' == JSONData.result) { + var elUpdateRows = $('#trakt-collection').find('tr'); + if ('new' == strCurAccountId) { + elAccountSelect.append($('