diff --git a/CHANGES.md b/CHANGES.md index 9f463eb7..9aab7b63 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,6 +32,7 @@ * Change Show List progress bar code, smaller page load, efficient use of js render engine * Change values used for date sorting on home page and episode view for improved compatibility with posix systems * Change response handling in downloaders to simplify logic. +* Change reduce html payload across page template files [develop changelog] Fix issue changing a custom show list group name that is in use. The bug resulted in the db containing stale group names diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index da88aa60..268b70a4 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -557,6 +557,10 @@ home.tmpl margin-right:5px } +.imgsmallposter.small{ + font-size:100% +} + #HomeLayout{margin-top:-35px} #HomeLayout.not-poster{height:75px} #HomeLayout div.not-poster{position:relative;top:38px} @@ -627,6 +631,17 @@ home.tmpl border-radius:3px } +.yes, +.no{ + display:inline-block; + vertical-align:middle; + width:16px; + height:16px +} + +.yes{background-image:url("../images/yes16.png")} +.no{background-image:url("../images/no16.png")} + #container{ margin:0 auto } @@ -817,6 +832,21 @@ td.tvShow a:hover{ color:#428BCA } + +#rename th, #rename td, +#failed th, #failed td, +#backlog th, #backlog td, +#show-list th, #show-list td { + text-align:center +} + +#rename th.text-left, #rename td.text-left, +#failed th.text-left, #failed td.text-left, +#backlog th.text-left, #backlog td.text-left, +#show-list th.text-left, #show-list td.text-left { + text-align:left +} + /* ======================================================================= home_addShows.tmpl ========================================================================== */ @@ -1615,6 +1645,10 @@ td.col-search{ width:46px } +#testRenameTable tbody td.col-checkbox, +#testRenameTable tbody td.col-ep {width:1%;vertical-align:middle} +#testRenameTable tbody td.col-name {width:49%} + .input-scene{ height:20px; line-height:1.5; @@ -1631,7 +1665,7 @@ td.col-search{ episodeView.tmpl ========================================================================== */ -.sort_data{ +.sort-data{ display:none } diff --git a/gui/slick/interfaces/default/404.tmpl b/gui/slick/interfaces/default/404.tmpl index 42da8b52..533d24ef 100644 --- a/gui/slick/interfaces/default/404.tmpl +++ b/gui/slick/interfaces/default/404.tmpl @@ -1,33 +1,19 @@ #import sickbeard - +## #set global $title = '404' - #set global $sbPath = '..' - #set global $topmenu = '404' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - - - - - - +
+

404

+

Page Not Found

+ +
- SickGear - BRANCH:[$sickbeard.BRANCH] - $title - - - - - - - - -
-

404

-

Page Not Found

- -
- + + + \ No newline at end of file diff --git a/gui/slick/interfaces/default/cache.tmpl b/gui/slick/interfaces/default/cache.tmpl index 83aa6128..55b96455 100644 --- a/gui/slick/interfaces/default/cache.tmpl +++ b/gui/slick/interfaces/default/cache.tmpl @@ -1,16 +1,13 @@ #import sickbeard +## +#set global $title = 'Cache' +#set global $header = 'Cache' +#set global $sbPath = '..' +#set global $topmenu = 'cache' +## #import os.path -#set global $title='Cache' -#set global $header='Cache' -#set global $sbPath='..' -#set global $topmenu='cache'# - #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - - @@ -121,7 +120,6 @@ - diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index 9abf8e25..128f7b89 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -1,7 +1,6 @@ -#import os.path +#import sickbeard #import datetime #import locale -#import sickbeard #from sickbeard.common import * #from sickbeard.sbdatetime import * #from sickbeard import config @@ -10,13 +9,13 @@ #from sickbeard.helpers import anon_url #from sickbeard.logger import reverseNames as file_logging_presets #from sickbeard.helpers import maybe_plural - +## #set global $title = 'Config - General' #set global $header = 'General Configuration' - #set global $sbPath = '../..' - #set global $topmenu = 'config' +## +#import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') #if $varExists('header') @@ -24,9 +23,10 @@ #else

$title

#end if +## #set $checked = ' checked="checked"' #set $selected = ' selected="selected"' - +## #set $indexer = 0 #if $sickbeard.INDEXER_DEFAULT #set $indexer = $sickbeard.INDEXER_DEFAULT @@ -532,7 +532,7 @@ - +

select branch to use (restart required)

@@ -673,4 +673,4 @@ //--> -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl index c1d8d8f8..5cfe06af 100644 --- a/gui/slick/interfaces/default/config_notifications.tmpl +++ b/gui/slick/interfaces/default/config_notifications.tmpl @@ -1,13 +1,12 @@ #import sickbeard #import re #from sickbeard.helpers import anon_url, starify - +## #set global $title = 'Config - Notifications' #set global $header = 'Notifications' - #set global $sbPath = '../..' - #set global $topmenu = 'config' +## #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -43,7 +42,7 @@ Enable -

should SickGear send XBMC commands ?

+

should SickGear send XBMC commands ?

 @@ -167,7 +166,7 @@ Enable -

should SickGear send Kodi commands ?

+

should SickGear send Kodi commands ?

 @@ -1248,7 +1247,7 @@ Enable -

should SickGear send Pushalot notifications ? +

should SickGear send Pushalot notifications ?

 @@ -1432,7 +1431,7 @@ Step One @@ -1737,9 +1736,11 @@
+ -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/config_postProcessing.tmpl b/gui/slick/interfaces/default/config_postProcessing.tmpl index 5277ecfe..cbc0adb6 100644 --- a/gui/slick/interfaces/default/config_postProcessing.tmpl +++ b/gui/slick/interfaces/default/config_postProcessing.tmpl @@ -1,4 +1,3 @@ -#import os.path #import sickbeard #from sickbeard.common import * #from sickbeard.helpers import anon_url @@ -6,13 +5,13 @@ #from sickbeard import metadata #from sickbeard.metadata.generic import GenericMetadata #from sickbeard import naming - +## #set global $title = 'Config - Post Processing' #set global $header = 'Post Processing' - #set global $sbPath = '../..' - #set global $topmenu = 'config' +## +#import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -23,9 +22,10 @@ #else

$title

#end if + +## #set $checked = 'checked="checked"' #set $selected = 'selected="selected" class="selected"' -
@@ -1258,4 +1258,5 @@ jQuery('#tv_download_dir').fileBrowser({ title: 'Select completed TV downloads directory' }); //--> -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl index 37fc899f..f0489db9 100644 --- a/gui/slick/interfaces/default/config_providers.tmpl +++ b/gui/slick/interfaces/default/config_providers.tmpl @@ -2,13 +2,12 @@ #from sickbeard.providers.generic import GenericProvider #from sickbeard.providers import thepiratebay #from sickbeard.helpers import anon_url, starify - +## #set global $title="Config - Providers" #set global $header="Search Providers" - #set global $sbPath = '../..' - #set global $topmenu = 'config' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -18,9 +17,6 @@

$title

#end if -#set $html_selected = ' selected="selected"' -#set $html_checked = 'checked="checked" ' - @@ -63,6 +59,9 @@ #end if +## +#set $html_selected = ' selected="selected"' +#set $html_checked = 'checked="checked" '
@@ -740,4 +739,5 @@ jQuery('#config-components').tabs(); //--> -#include $os.path.join($sickbeard.PROG_DIR,'gui/slick/interfaces/default/inc_bottom.tmpl') + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl index fb9a356f..627f9f7b 100755 --- a/gui/slick/interfaces/default/config_search.tmpl +++ b/gui/slick/interfaces/default/config_search.tmpl @@ -1,13 +1,12 @@ #import sickbeard #from sickbeard import clients #from sickbeard.helpers import starify - +## #set global $title = 'Config - Episode Search' #set global $header = 'Search Settings' - #set global $sbPath = '../..' - #set global $topmenu = 'config' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -20,9 +19,9 @@

$title

#end if +## #set $html_selected = ' selected="selected"' #set $html_checked = ' checked="checked"' -
diff --git a/gui/slick/interfaces/default/config_subtitles.tmpl b/gui/slick/interfaces/default/config_subtitles.tmpl index f8890202..9da260ba 100644 --- a/gui/slick/interfaces/default/config_subtitles.tmpl +++ b/gui/slick/interfaces/default/config_subtitles.tmpl @@ -1,15 +1,14 @@ -#from sickbeard import subtitles #import sickbeard +#from sickbeard import subtitles #from sickbeard.helpers import anon_url - -#set global $title="Config - Subtitles" -#set global $header="Subtitles" - -#set global $sbPath="../.." - -#set global $topmenu="config" +## +#set global $title = 'Config - Subtitles' +#set global $header = 'Subtitles' +#set global $sbPath = '../..' +#set global $topmenu = 'config' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -26,7 +25,7 @@ hintText: "Write to search a language and select it", preventDuplicates: true, prePopulate: - + [ <%= ",\r\n".join("{id: \"" + lang + "\", name: \"" + subtitles.getLanguageName(lang) + "\"}" for lang in sickbeard.SUBTITLES_LANGUAGES) if sickbeard.SUBTITLES_LANGUAGES != '' else '' @@ -37,9 +36,9 @@ }); -#if $varExists('header') +#if $varExists('header')

$header

-#else +#else

$title

#end if @@ -53,14 +52,14 @@
  • Subtitles Search
  • Subtitles Plugin
    • - +

    Subtitles Search

    Settings that dictate how SickGear handles subtitles search results.

    - +
    @@ -105,7 +104,7 @@ Subtitles History Log downloaded Subtitle on History page? -
    +


    @@ -153,8 +152,9 @@
    -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_bottom.tmpl") + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl index 70af1d00..a5f03439 100644 --- a/gui/slick/interfaces/default/displayShow.tmpl +++ b/gui/slick/interfaces/default/displayShow.tmpl @@ -1,18 +1,18 @@ #import sickbeard +#import datetime #import re #from sickbeard import subtitles, sbdatetime, network_timezones #import sickbeard.helpers #from sickbeard.common import * #from sickbeard.helpers import anon_url #from lib import subliminal -#import os.path, os -#import datetime - +## #set global $title = $show.name #set global $topmenu = 'home' #set $exceptions_string = ', '.join($show.exceptions) - #set global $page_body_attr = 'display-show' +## +#import os.path, os #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -34,11 +34,11 @@ #set $fuzzydate = 'airdate' #if $sickbeard.FUZZY_DATING fuzzyMoment({ - containerClass : '.${fuzzydate}', - dateHasTime : false, - dateFormat : '${sickbeard.DATE_PRESET}', - timeFormat : '${sickbeard.TIME_PRESET}', - trimZero : #if $sickbeard.TRIM_ZERO then 'true' else 'false'# + containerClass: '.${fuzzydate}', + dateHasTime: !1, + dateFormat: '${sickbeard.DATE_PRESET}', + timeFormat: '${sickbeard.TIME_PRESET}', + trimZero: #echo ('!1', '!0')[$sickbeard.TRIM_ZERO]# }); #end if #raw @@ -76,7 +76,7 @@ #set $curShowType = $curShowList[0] #set $curShowList = $curShowList[1] #if 1 < len($sortedShowLists) -$displayshowlist.append('\t\t\t' % $curShowType) +#set void = $displayshowlist.append('\t\t\t' % $curShowType) #end if #for $curShow in $curShowList #set void = $displayshowlist.append('\t\t\t' % ($curShow.indexerid, ('', ' selected="selected"')[$curShow == $show], $curShow.name)) @@ -85,8 +85,7 @@ $displayshowlist.append('\t\t\t' % $curShowType) #set void = $displayshowlist.append('\t\t\t') #end if #end for - -#slurp +##
    <<
    @@ -317,4 +316,5 @@ //-->
    -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/episodeView.tmpl b/gui/slick/interfaces/default/episodeView.tmpl index fc204e38..17fc3168 100644 --- a/gui/slick/interfaces/default/episodeView.tmpl +++ b/gui/slick/interfaces/default/episodeView.tmpl @@ -4,13 +4,12 @@ #from sickbeard.common import * #from sickbeard import sbdatetime #from sickbeard.helpers import anon_url - +## #set global $title = 'Episode View' #set global $header = 'Episode View' - #set global $sbPath = '..' - #set global $topmenu = 'episodeView' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -42,7 +41,7 @@ jQuery.each(\$container, function(j) { this.isotope({ itemSelector: '.daybyday-show', - sortBy : '$sort', + sortBy: '$sort', layoutMode: 'vertical', transitionDuration: 0, getSortData: { @@ -269,11 +268,11 @@ #set $fuzzydate = 'airdate' #if $sickbeard.FUZZY_DATING: fuzzyMoment({ - containerClass : '.${fuzzydate}', - dateHasTime : true, - dateFormat : '${sickbeard.DATE_PRESET}', - timeFormat : '${sickbeard.TIME_PRESET}', - trimZero : #if $sickbeard.TRIM_ZERO then 'true' else 'false'# + containerClass: '.${fuzzydate}', + dateHasTime: !0, + dateFormat: '${sickbeard.DATE_PRESET}', + timeFormat: '${sickbeard.TIME_PRESET}', + trimZero: #echo ('!1', '!0')[$sickbeard.TRIM_ZERO]# }); #end if @@ -332,7 +331,7 @@ ## forced to use a div to wrap airdate, the column sort went crazy with a span -
    $sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
    $cur_result['localtime'].strftime('%Y%m%d%H%M') +
    $sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
    $cur_result['localtime'].strftime('%Y%m%d%H%M') $cur_result['show_name'] @@ -366,9 +365,9 @@ #end if - + #if sickbeard.USE_IMDB_INFO and $cur_result['imdb_id']: - [imdb] + [imdb] #end if $sickbeard.indexerApi($cur_indexer).name @@ -413,13 +412,13 @@ #set $fuzzydate = 'airdate' #if $sickbeard.FUZZY_DATING: fuzzyMoment({ - dtInline : true, - dtGlue : ' at ', - containerClass : '.${fuzzydate}', - dateHasTime : true, - dateFormat : '${sickbeard.DATE_PRESET}', - timeFormat : '${sickbeard.TIME_PRESET}', - trimZero : #if $sickbeard.TRIM_ZERO then 'true' else 'false'# + dtInline: !0, + dtGlue: ' at ', + containerClass: '.${fuzzydate}', + dateHasTime: !0, + dateFormat: '${sickbeard.DATE_PRESET}', + timeFormat: '${sickbeard.TIME_PRESET}', + trimZero: #echo ('!1', '!0')[$sickbeard.TRIM_ZERO]# }); #end if }); diff --git a/gui/slick/interfaces/default/errorlogs.tmpl b/gui/slick/interfaces/default/errorlogs.tmpl index 08b21c22..c2121e1d 100644 --- a/gui/slick/interfaces/default/errorlogs.tmpl +++ b/gui/slick/interfaces/default/errorlogs.tmpl @@ -1,32 +1,33 @@ #import sickbeard #from sickbeard import classes #from sickbeard.common import * -#set global $header="Logs & Errors" -#set global $title="Logs & Errors" - -#set global $sbPath = ".." - -#set global $topmenu="errorlogs"# +## +#set global $header = 'Logs & Errors' +#set global $title = 'Logs & Errors' +#set global $sbPath = '..' +#set global $topmenu = 'errorlogs' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") -#if $varExists('header') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') + +#if $varExists('header')

    $header

    #else

    $title

    #end if + 
    -#if $classes.ErrorViewer.errors:
-#for $curError in sorted($classes.ErrorViewer.errors, key=lambda error: error.time, reverse=True)[:500]:
-$curError.time $curError.message
-#end for
+#if $classes.ErrorViewer.errors
+    #for $curError in sorted($classes.ErrorViewer.errors, key=lambda error: error.time, reverse=True)[:500]
+        #echo '%s %s' % ($curError.time, $curError.message)
+    #end for
 #end if
-
    -
    +
    -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/genericMessage.tmpl b/gui/slick/interfaces/default/genericMessage.tmpl index f62d0809..7a42e88d 100644 --- a/gui/slick/interfaces/default/genericMessage.tmpl +++ b/gui/slick/interfaces/default/genericMessage.tmpl @@ -1,14 +1,13 @@ #import sickbeard -#set global $title="" - -#set global $sbPath="../.." - - -#set global $topmenu="home"# +## +#set global $title = '' +#set global $sbPath = '../..' +#set global $topmenu="home" +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

    $subject

    $message -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/history.tmpl b/gui/slick/interfaces/default/history.tmpl index a101eef4..d83e2fcc 100644 --- a/gui/slick/interfaces/default/history.tmpl +++ b/gui/slick/interfaces/default/history.tmpl @@ -1,27 +1,23 @@ #import sickbeard -#import os.path #import datetime #import re +#from sickbeard.common import * +#from sickbeard import sbdatetime #from sickbeard import history #from sickbeard import providers -#from sickbeard import sbdatetime #from sickbeard.providers import generic -#from sickbeard.common import * +## #set global $title = 'History' #set global $header = 'History' #set global $sbPath = '..' #set global $topmenu = 'history' #set $layout = $sickbeard.HISTORY_LAYOUT - +## +#import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - - + #if $varExists('header')

    $header

    #else @@ -86,7 +82,7 @@ #end if #set $html_selected = ' selected="selected"' - +##
    Limit:  
    + Layout: #else @@ -185,7 +183,6 @@ - #if 'poster' == $layout Sort By: @@ -196,6 +193,7 @@ + Sort Order: -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/home_addShows.tmpl b/gui/slick/interfaces/default/home_addShows.tmpl index b82f59b4..a5269960 100644 --- a/gui/slick/interfaces/default/home_addShows.tmpl +++ b/gui/slick/interfaces/default/home_addShows.tmpl @@ -1,15 +1,13 @@ -#import os.path -#import urllib #import sickbeard +#import urllib +## #set global $title = 'Add Show' #set global $header = 'Add Show' - #set global $sbPath = '../..' - #set global $statpath = '../..' #set global $topmenu = 'home' +## #import os.path - #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') #if $varExists('header') diff --git a/gui/slick/interfaces/default/home_newShow.tmpl b/gui/slick/interfaces/default/home_newShow.tmpl index eb9d8a50..fb2bc8f7 100644 --- a/gui/slick/interfaces/default/home_newShow.tmpl +++ b/gui/slick/interfaces/default/home_newShow.tmpl @@ -1,16 +1,13 @@ -#import os.path #import sickbeard #from sickbeard.helpers import anon_url - +## #set global $header = 'New Show' #set global $title = 'New Show' - #set global $sbPath = '../..' - #set global $statpath = '../..' #set global $topmenu = 'home' +## #import os.path - #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -115,4 +112,4 @@
    -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/home_postprocess.tmpl b/gui/slick/interfaces/default/home_postprocess.tmpl index 69fa1068..8eb074c6 100644 --- a/gui/slick/interfaces/default/home_postprocess.tmpl +++ b/gui/slick/interfaces/default/home_postprocess.tmpl @@ -1,12 +1,13 @@ #import sickbeard +## #set global $header="Post Processing" #set global $title="Post Processing" - #set global $sbPath="../.." - -#set global $topmenu="home"# +#set global $topmenu="home" +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +
    #if $varExists('header')

    $header

    diff --git a/gui/slick/interfaces/default/home_recommendedShows.tmpl b/gui/slick/interfaces/default/home_recommendedShows.tmpl index 5d5bdccd..57aab215 100644 --- a/gui/slick/interfaces/default/home_recommendedShows.tmpl +++ b/gui/slick/interfaces/default/home_recommendedShows.tmpl @@ -1,15 +1,14 @@ #import os.path #import json #import sickbeard -#set global $header="Recommended Shows" -#set global $title="Recommended Shows" - -#set global $sbPath="../.." - -#set global $statpath="../.."# -#set global $topmenu="home"# +## +#set global $header = "Recommended Shows" +#set global $title = "Recommended Shows" +#set global $sbPath = "../.." +#set global $statpath = "../.." +#set global $topmenu = "home" +## #import os.path - #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") @@ -70,4 +69,4 @@
    -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") \ No newline at end of file diff --git a/gui/slick/interfaces/default/home_trendingShows.tmpl b/gui/slick/interfaces/default/home_trendingShows.tmpl index a7955e00..e2a4c2fe 100644 --- a/gui/slick/interfaces/default/home_trendingShows.tmpl +++ b/gui/slick/interfaces/default/home_trendingShows.tmpl @@ -5,13 +5,12 @@ #from sickbeard.common import * #from sickbeard import sbdatetime #from sickbeard.helpers import anon_url - +## #set global $title='Trending Shows' #set global $header='Trending Shows' - #set global $sbPath='..' - #set global $topmenu='episodeView' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -167,4 +166,4 @@ window.setInterval('location.reload(true)', 600000); // Refresh every 10 minutes //--> -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/inc_bottom.tmpl b/gui/slick/interfaces/default/inc_bottom.tmpl index abd697f6..06081128 100644 --- a/gui/slick/interfaces/default/inc_bottom.tmpl +++ b/gui/slick/interfaces/default/inc_bottom.tmpl @@ -3,12 +3,12 @@ #import re #from sickbeard import db, sbdatetime #from sickbeard.common import * +## +
    + - - - - - + \ No newline at end of file diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index 96c3dc3b..3912e07b 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -32,6 +32,7 @@ + @@ -64,7 +65,7 @@ #end if @@ -74,7 +75,7 @@ @@ -204,7 +204,6 @@
  • General
  • Search Settings
  • Search Providers
    • -
  • Search Providers
  • Subtitles Settings
  • Post Processing
  • Notifications
    • @@ -241,19 +240,20 @@ #set $inner_first = True #for $cur_link in $menuItem.path #if $inner_first then '' else '· ' - #slurp + ## $cur_link #set $inner_first = False #end for #else - #slurp + ## $menuItem.title #set $first = False #end if #end if #end for - + + #end if ## #if $sickbeard.NEWEST_VERSION_STRING @@ -264,12 +264,12 @@ ## #set $items = [] #try - $items.append($topmenu) + #set void = $items.append($topmenu) #except (NameError, NotFound) #pass #end try #try - $items.append($layout) + #set void = $items.append($layout) #except (NameError, NotFound) #pass #end try diff --git a/gui/slick/interfaces/default/manage.tmpl b/gui/slick/interfaces/default/manage.tmpl index c4d25674..311eb0d1 100644 --- a/gui/slick/interfaces/default/manage.tmpl +++ b/gui/slick/interfaces/default/manage.tmpl @@ -1,14 +1,14 @@ #import sickbeard #from sickbeard.common import * +## #set global $title = 'Mass Update' #set global $header = 'Mass Update' - #set global $sbPath = '../..' - #set global $topmenu = 'manage' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - +## #set $has_any_sports = False #set $has_any_anime = False #set $has_any_flat_folders = False @@ -35,6 +35,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) }, type: 'text' }); + \$.tablesorter.addParser({ id: 'quality', is: function(s) { @@ -45,7 +46,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) }, type: 'numeric' }); - +## #set $columns_total = 15 - ((1, 0)[$has_any_sports] + (1, 0)[$has_any_anime] + (1, 0)[$has_any_flat_folders] + (1, 0)[$sickbeard.USE_SUBTITLES]) #set $column_headers = [('false', False), ("'showNames'", False), ("'quality'", False), ((None, "'sports'")[$has_any_sports], True), @@ -61,9 +62,9 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) #continue #end if #set $column += 1 - $headers.append('\t\t\t%s: { sorter: %s }' % ($column, $c)) + #set void = $headers.append('\t\t\t%s: { sorter: %s }' % ($column, $c)) #if $img_extract - $text_extract.append('\t\t\t%s%s' % ($column, ": function(node) {return $(node).find('img').attr('alt')}")) + #set void = $text_extract.append('\t\t\t%s%s' % ($column, ": function(node) {return $(node).find('img').attr('alt')}")) #end if #end for @@ -137,39 +138,39 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) #set $yes = 'yes16.png" title="Yes" alt="Yes' #for $curShow in $myShowList #set $option_state = ''.format(str($curShow.indexerid)) - #slurp + ## #set $curUpdate_disabled = $sickbeard.showQueueScheduler.action.isBeingUpdated($curShow)\ or $sickbeard.showQueueScheduler.action.isInUpdateQueue($curShow) #set $reason = $disabled_inprogress_tip % 'Update' #set $curUpdate = '%s>%s' % (('', $reason)[$curUpdate_disabled], $option_state % ('update', 'update', ('', $disabled + $reason)[$curUpdate_disabled])) - #slurp + ## #set $curRefresh_disabled = $sickbeard.showQueueScheduler.action.isBeingRefreshed($curShow)\ or $sickbeard.showQueueScheduler.action.isInRefreshQueue($curShow) #set $reason = $disabled_inprogress_tip % 'Rescan' #set $curRefresh = '%s>%s' % (('', $reason)[$curRefresh_disabled], $option_state % ('refresh', 'refresh', ('', $disabled + $reason)[$curRefresh_disabled])) - #slurp + ## #set $curRename_disabled = $sickbeard.showQueueScheduler.action.isBeingRenamed($curShow)\ or $sickbeard.showQueueScheduler.action.isInRenameQueue($curShow) #set $reason = $disabled_inprogress_tip % 'Rename' #set $curRename = '%s>%s' % (('', $reason)[$curRename_disabled], $option_state % ('rename', 'rename', ('', $disabled + $reason)[$curRename_disabled])) - #slurp + ## #set $subtitles_disabled = not $curShow.subtitles\ or $sickbeard.showQueueScheduler.action.isBeingSubtitled($curShow)\ or $sickbeard.showQueueScheduler.action.isInSubtitleQueue($curShow) #set $reason = ($disabled_inprogress_tip % 'Search subtitle', $disabled_subtitles_tip)[not $curShow.subtitles] #set $curSubtitle = '%s>%s' % (('', $reason)[$subtitles_disabled], $option_state % ('subtitle', 'subtitle', ('', $disabled + $reason)[$subtitles_disabled])) - #slurp + ## #set $curDelete_disabled = $sickbeard.showQueueScheduler.action.isBeingRenamed($curShow)\ or $sickbeard.showQueueScheduler.action.isInRenameQueue($curShow)\ or $sickbeard.showQueueScheduler.action.isInRefreshQueue($curShow) #set $reason = $disabled_inprogress_tip % 'Rename or rescan' #set $curDelete = '%s>%s' % (('', $reason)[$curDelete_disabled], $option_state % ('delete', 'delete', ('', $disabled + $reason)[$curDelete_disabled])) - #slurp + ## #set $curRemove_disabled = $sickbeard.showQueueScheduler.action.isBeingRenamed($curShow)\ or $sickbeard.showQueueScheduler.action.isInRenameQueue($curShow)\ or $sickbeard.showQueueScheduler.action.isInRefreshQueue($curShow) @@ -212,4 +213,4 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/manage_backlogOverview.tmpl b/gui/slick/interfaces/default/manage_backlogOverview.tmpl index 1c79430c..7d91ea62 100644 --- a/gui/slick/interfaces/default/manage_backlogOverview.tmpl +++ b/gui/slick/interfaces/default/manage_backlogOverview.tmpl @@ -2,12 +2,13 @@ #import datetime #from sickbeard.common import * #from sickbeard import sbdatetime, network_timezones +## #set global $title = 'Backlog Overview' #set global $header = 'Backlog Overview' - #set global $sbPath = '..' - #set global $topmenu = 'manage' +#set global $page_body_attr = 'backlog' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -25,34 +26,32 @@ #set $fuzzydate = 'airdate' #if $sickbeard.FUZZY_DATING: fuzzyMoment({ - containerClass : '.${fuzzydate}', - dateHasTime : false, - dateFormat : '${sickbeard.DATE_PRESET}', - timeFormat : '${sickbeard.TIME_PRESET}', - trimZero : #if $sickbeard.TRIM_ZERO then 'true' else 'false'# + containerClass: '.${fuzzydate}', + dateHasTime: !1, + dateFormat: '${sickbeard.DATE_PRESET}', + timeFormat: '${sickbeard.TIME_PRESET}', + trimZero: #echo ('!1', '!0')[$sickbeard.TRIM_ZERO]# }); #end if - }); //-->
    - +## #if $varExists('header')

    $header

    #else

    $title

    #end if - +## #set $totalWanted = 0 #set $totalQual = 0 - -#for $curShow in $sickbeard.showList: +#for $curShow in $sickbeard.showList #set $totalWanted += $showCounts[$curShow.indexerid][$Overview.WANTED] #set $totalQual += $showCounts[$curShow.indexerid][$Overview.QUAL] #end for - +##
    Wanted: $totalWanted Low Quality: $totalQual @@ -70,16 +69,15 @@ Jump to Show
    - - +
    #for $curShow in sorted($sickbeard.showList, key = operator.attrgetter('name')): - + ## #if 0 == $showCounts[$curShow.indexerid][$Overview.QUAL] + $showCounts[$curShow.indexerid][$Overview.WANTED]: #continue #end if - - - + + ## #for $curResult in $showSQLResults[$curShow.indexerid]: #set $whichStr = $str($curResult['season']) + 'x' + $str($curResult['episode']) #try: @@ -103,21 +101,20 @@ Jump to Show #except Exception #continue #end try - + ## #if $overview not in ($Overview.QUAL, $Overview.WANTED): #continue #end if - - - + + + - #end for #end for
    +

    $curShow.name

    @@ -94,8 +92,8 @@ Jump to Show
    EpisodeNameAirdate
    EpisodeNameAirdate
    $whichStr$curResult["name"]
    #if int($curResult['airdate']) == 1 then 'never' else $sbdatetime.sbdatetime.sbfdate($sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($curResult['airdate'],$curShow.airs,$curShow.network)))#
    		$whichStr$curResult["name"]
    #if int($curResult['airdate']) == 1 then 'never' else $sbdatetime.sbdatetime.sbfdate($sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($curResult['airdate'],$curShow.airs,$curShow.network)))#
    -#include $os.path.join($sickbeard.PROG_DIR,'gui/slick/interfaces/default/inc_bottom.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl index 0b69403b..85a3eb3c 100644 --- a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl +++ b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl @@ -1,12 +1,12 @@ #import sickbeard #import datetime #from sickbeard import common - +## #set global $title = 'Episode Overview' #set global $header = 'Episode Overview' #set global $sbPath = '..' #set global $topmenu = 'manage' - +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -15,9 +15,9 @@ #else

    $title

    #end if - +## #if not $whichStatus or ($whichStatus and not $ep_counts) - +## #if $whichStatus:

    no episodes have status $common.statusStrings[$int($whichStatus)].lower()

    #end if @@ -34,9 +34,8 @@ - +## #else - #if $whichStatus in ($common.ARCHIVED, $common.IGNORED, $common.SNATCHED): #set $row_class = 'good' #else @@ -109,5 +108,4 @@ #end if - -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/manage_failedDownloads.tmpl b/gui/slick/interfaces/default/manage_failedDownloads.tmpl index 6faa5dc4..f2838773 100644 --- a/gui/slick/interfaces/default/manage_failedDownloads.tmpl +++ b/gui/slick/interfaces/default/manage_failedDownloads.tmpl @@ -1,31 +1,32 @@ #import sickbeard -#import os.path #import datetime #import re #from sickbeard import providers #from sickbeard.providers import generic #from sickbeard.common import * -#set global $header="Failed Downloads" -#set global $title="Failed Downloads" - -#set global $sbPath=".." - -#set global $topmenu="manage"# -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +## +#set global $header = 'Failed Downloads' +#set global $title = 'Failed Downloads' +#set global $sbPath = '..' +#set global $topmenu = 'manage' +#set global $page_body_attr = 'failed' +## +#import os.path +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -36,56 +37,51 @@ #else

    $title

    #end if - +#set selected = ' selected="selected"'
    Limit: - +
    - - +
    + + + + + + + + + + + + + + + + +#for $hItem in $failedResults - - - - - - - - - - - - -#for $hItem in $failedResults: -#set $curRemove = "" - - - - + + #set $provider = $providers.getProviderClass($generic.GenericProvider.makeID($hItem['provider'])) + #if None is not $provider: + + #else + #end if - - - + + #end for - +
    ReleaseSizeProviderRemove
    + +
    + +
    ReleaseSizeProviderRemove
    - -
    $hItem["release"] - #if $hItem["size"] != -1 - $hItem["size"] - #else - ? - #end if - - #set $provider = $providers.getProviderClass($generic.GenericProvider.makeID($hItem["provider"])) - #if $provider != None: - $provider.name - #else: - missing provider + #echo re.sub('"', '', $hItem['release'])##echo ($hItem['size'], '?')[-1 == $hItem['size']]#$provider.namemissing provider$curRemove
    -#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') \ No newline at end of file diff --git a/gui/slick/interfaces/default/manage_manageSearches.tmpl b/gui/slick/interfaces/default/manage_manageSearches.tmpl index d3849fbc..3241c0e7 100644 --- a/gui/slick/interfaces/default/manage_manageSearches.tmpl +++ b/gui/slick/interfaces/default/manage_manageSearches.tmpl @@ -1,61 +1,63 @@ #import sickbeard #import datetime #from sickbeard.common import * -#set global $title="Manage Searches" -#set global $header="Manage Searches" -#set global $sbPath=".." - -#set global $topmenu="manage"# +## +#set global $title = 'Manage Searches' +#set global $header = 'Manage Searches' +#set global $sbPath = '..' +#set global $topmenu = 'manage' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
    - #if $varExists('header') -

    $header

    - #else -

    $title

    - #end if +#if $varExists('header') +

    $header

    +#else +

    $title

    +#end if -
    -

    Backlog Search:

    - Force - #if $backlogPaused then "Unpause" else "Pause"# +
    +

    Backlog Search:

    + Force + #if $backlogPaused then 'Unpause' else 'Pause'# #if not $backlogRunning: -Not in progress
    -#else: -#if $backlogPaused then "Paused: " else ""# -Currently running
    + Not in progress
    +#else + #if $backlogPaused then 'Paused: ' else ''# + Currently running
    + #end if +
    + +

    Recent Search:

    + Force +#if not $recentSearchStatus + Not in progress
    +#else + In Progress
    #end if -
    +
    -

    Recent Search:

    - Force -#if not $recentSearchStatus: -Not in progress
    -#else: -In Progress
    +

    Find Propers Search:

    + Force +#if not $findPropersStatus + Not in progress
    +#else + In Progress
    #end if -
    - -

    Find Propers Search:

    - Force -#if not $findPropersStatus: -Not in progress
    -#else: -In Progress
    -#end if -
    - -

    Version Check:

    - Force Check -

    - -

    Search Queue:

    -Backlog: $queueLength['backlog'] pending items
    -Recent: $queueLength['recent'] pending items
    -Manual: $queueLength['manual'] pending items
    -Failed: $queueLength['failed'] pending items
    +
    + +

    Version Check:

    + Force Check +

    + +

    Search Queue:

    + Backlog: $queueLength['backlog'] pending items
    + Recent: $queueLength['recent'] pending items
    + Manual: $queueLength['manual'] pending items
    + Failed: $queueLength['failed'] pending items
    +
    -
    -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_bottom.tmpl") + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/manage_massEdit.tmpl b/gui/slick/interfaces/default/manage_massEdit.tmpl index c4944579..682ac73c 100644 --- a/gui/slick/interfaces/default/manage_massEdit.tmpl +++ b/gui/slick/interfaces/default/manage_massEdit.tmpl @@ -1,14 +1,15 @@ #import sickbeard #from sickbeard import common #from sickbeard import exceptions +## #set global $title = 'Mass Edit' #set global $header = 'Mass Edit' - #set global $sbPath = '..' - -#set global $topmenu = 'manage'# +#set global $topmenu = 'manage' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') + #if None is not $quality_value: #set $initial_quality = int($quality_value) #else: diff --git a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl index 2b0713ad..eb0b48ca 100644 --- a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl +++ b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl @@ -1,66 +1,67 @@ #import sickbeard -#from lib import subliminal #import datetime +#from lib import subliminal #from sickbeard import common -#set global $title="Episode Overview" -#set global $header="Episode Overview" - -#set global $sbPath=".." - -#set global $topmenu="manage"# +## +#set global $title = 'Episode Overview' +#set global $header = 'Episode Overview' +#set global $sbPath = '..' +#set global $topmenu = 'manage' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') +
    #if $varExists('header') -

    $header

    +

    $header

    #else -

    $title

    +

    $title

    #end if -#if $whichSubs: -#set subsLanguage = $subliminal.language.Language($whichSubs) if not $whichSubs == 'all' else 'All' +## +#if $whichSubs + #set subsLanguage = $subliminal.language.Language($whichSubs) if not $whichSubs == 'all' else 'All' #end if -#if not $whichSubs or ($whichSubs and not $ep_counts): +#if not $whichSubs or ($whichSubs and not $ep_counts) + #if $whichSubs: -#if $whichSubs: -

    All of your episodes have $subsLanguage subtitles.

    -
    -#end if - -
    -Manage episodes without -subtitles - -
    +

    All of your episodes have $subsLanguage subtitles.

    +
    + #end if +
    + Manage episodes without + + subtitles + +
    #else - - -
    -

    Episodes without $subsLanguage subtitles.

    -
    -Download missed subtitles for selected episodes -
    - - -
    -
    - -#for $cur_indexer_id in $sorted_show_ids: - - - - -#end for -
    $show_names[$cur_indexer_id] ($ep_counts[$cur_indexer_id])
    -
    + +
    +

    Episodes without $subsLanguage subtitles.

    +
    + Download missed subtitles for selected episodes +
    + + +
    +
    + + #for $cur_indexer_id in $sorted_show_ids: + + + + + #end for +
    $show_names[$cur_indexer_id] ($ep_counts[$cur_indexer_id])
    +
    #end if
    -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/manage_torrents.tmpl b/gui/slick/interfaces/default/manage_torrents.tmpl index 6053563a..455eeaca 100644 --- a/gui/slick/interfaces/default/manage_torrents.tmpl +++ b/gui/slick/interfaces/default/manage_torrents.tmpl @@ -1,22 +1,23 @@ #import sickbeard #import datetime #from sickbeard.common import * -#set global $title="Manage Torrents" -#set global $header="Manage Torrents" -#set global $sbPath=".." - -#set global $topmenu="manage"# +## +#set global $title = 'Manage Torrents' +#set global $header = 'Manage Torrents' +#set global $sbPath = '..' +#set global $topmenu = 'manage' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - #if $varExists('header') -

    $header

    - #else -

    $title

    - #end if +#if $varExists('header') +

    $header

    +#else +

    $title

    +#end if -$info_download_station - + $info_download_station + -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/restart.tmpl b/gui/slick/interfaces/default/restart.tmpl index 2e0be2d3..7ad6fdfe 100644 --- a/gui/slick/interfaces/default/restart.tmpl +++ b/gui/slick/interfaces/default/restart.tmpl @@ -2,16 +2,15 @@ #import datetime #from sickbeard.common import * #from sickbeard import db - -#set global $title="Home" -#set global $header="Restarting SickGear" - -#set global $sbPath = ".." - -#set global $topmenu="home"# +## +#set global $title = 'Home' +#set global $header = 'Restarting SickGear' +#set global $sbPath = '..' +#set global $topmenu = 'home' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/restart_bare.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/restart_bare.tmpl') -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/interfaces/default/testRename.tmpl b/gui/slick/interfaces/default/testRename.tmpl index 36509ff4..b90e7388 100644 --- a/gui/slick/interfaces/default/testRename.tmpl +++ b/gui/slick/interfaces/default/testRename.tmpl @@ -1,11 +1,13 @@ #import sickbeard #from sickbeard import common #from sickbeard import exceptions +## #set global $title = 'Test Rename ' + $show.name #set global $header = '%s' % ($show.indexerid, $show.name) #set global $sbPath = '..' - #set global $topmenu = 'home' +#set global $page_body_attr = 'rename' +## #import os.path #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -30,9 +32,9 @@ #end if +## #set $curSeason = -1 #set $odd = False -
    @@ -40,55 +42,57 @@ Cancel Rename - +
    +## +#for $cur_ep_obj in $ep_obj_list + #set $curLoc = $cur_ep_obj.location[len($cur_ep_obj.show.location)+1:] + #set $curExt = $curLoc.split('.')[-1] + #set $newLoc = $cur_ep_obj.proper_path() + '.' + $curExt -#for $cur_ep_obj in $ep_obj_list: -#set $curLoc = $cur_ep_obj.location[len($cur_ep_obj.show.location)+1:] -#set $curExt = $curLoc.split('.')[-1] -#set $newLoc = $cur_ep_obj.proper_path() + '.' + $curExt + #if int($cur_ep_obj.season) != $curSeason: + + + + + + + + + + + + #set $curSeason = int($cur_ep_obj.season) -#if int($cur_ep_obj.season) != $curSeason: - - - - - - - - - - - -#set $curSeason = int($cur_ep_obj.season) -#end if - + #end if +## #set $odd = not $odd -#set $epStr = str($cur_ep_obj.season) + "x" + str($cur_ep_obj.episode) +#set $epStr = str($cur_ep_obj.season) + 'x' + str($cur_ep_obj.episode) #set $epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.relatedEps]) -#if len($epList) > 1: +#if 1 < len($epList) #set $epList = [$min($epList), $max($epList)] #end if - - - - - - - - + + + #if $curLoc != $newLoc + + #else + + #end if + + + + + #end for -
    +

    #if 0 == int($cur_ep_obj.season) then 'Specials' else 'Season %s' % $cur_ep_obj.season#

    +
    EpisodeOld LocationNew Location
    -

    #if int($cur_ep_obj.season) == 0 then "Specials" else "Season "+str($cur_ep_obj.season)#

    -
    EpisodeOld LocationNew Location
    - #if $curLoc != $newLoc: - " /> - #end if - <%= "-".join(map(str, epList)) %>$curLoc$newLoc
    + + <%= '-'.join(map(str, epList)) %>$curLoc$newLoc

    - Cancel Rename -#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') + + + +
    + Cancel Rename +
    + +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/gui/slick/interfaces/default/viewlogs.tmpl b/gui/slick/interfaces/default/viewlogs.tmpl index 9ef73ebe..95b13d98 100644 --- a/gui/slick/interfaces/default/viewlogs.tmpl +++ b/gui/slick/interfaces/default/viewlogs.tmpl @@ -2,56 +2,45 @@ #from sickbeard import classes #from sickbeard.common import * #from sickbeard.logger import reverseNames -#set global $header="Log File" -#set global $title="Logs" - -#set global $sbPath = ".." - -#set global $topmenu="errorlogs"# +## +#set global $header = 'Log File' +#set global $title = 'Logs' +#set global $sbPath = '..' +#set global $topmenu = 'errorlogs' +## #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - - -#if $varExists('header') +#if $varExists('header')

    $header

    #else

    $title

    #end if -
    Minimum logging level to display: #set $levels = $reverseNames.keys() -$levels.sort(lambda x,y: cmp($reverseNames[$x], $reverseNames[$y])) -#for $level in $levels: - +#set void = $levels.sort(lambda x,y: cmp($reverseNames[$x], $reverseNames[$y])) +#for $level in $levels + #end for - +
    -
    -
    -$logLines
-
    -
    -
    - + +
    +#echo $logLines
+
    -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') \ No newline at end of file diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index daf44105..76e3d3f7 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -3237,7 +3237,8 @@ class Manage(MainHandler): toRemove = toRemove.split('|') if toRemove is not None else [] for release in toRemove: - myDB.action('DELETE FROM failed WHERE release = ?', [release]) + item = re.sub('_{3,}', '%', release) + myDB.action('DELETE FROM failed WHERE release like ?', [item]) if toRemove: return self.redirect('/manage/failedDownloads/')