From 9d92840c8da6cb049b1d8c1b28ec338f6117a56d Mon Sep 17 00:00:00 2001 From: Dustyn Gibson <miigotu@gmail.com> Date: Thu, 30 Jul 2015 10:27:26 -0700 Subject: [PATCH] More mako --- gui/slick/interfaces/default/comingEpisodes.mako | 1 - gui/slick/interfaces/default/config.mako | 1 - gui/slick/interfaces/default/config_anime.mako | 1 - gui/slick/interfaces/default/config_backuprestore.mako | 1 - gui/slick/interfaces/default/config_general.mako | 5 ++--- gui/slick/interfaces/default/config_notifications.mako | 1 - gui/slick/interfaces/default/config_postProcessing.mako | 1 - gui/slick/interfaces/default/config_providers.mako | 1 - gui/slick/interfaces/default/config_search.mako | 1 - gui/slick/interfaces/default/config_subtitles.mako | 1 - gui/slick/interfaces/default/editShow.mako | 1 - gui/slick/interfaces/default/errorlogs.mako | 3 +-- gui/slick/interfaces/default/genericMessage.mako | 1 - gui/slick/interfaces/default/history.mako | 1 - gui/slick/interfaces/default/home.mako | 3 +-- gui/slick/interfaces/default/home_addExistingShow.mako | 1 - gui/slick/interfaces/default/home_addShows.mako | 1 - gui/slick/interfaces/default/home_newShow.mako | 1 - gui/slick/interfaces/default/home_newShow.tmpl | 1 - gui/slick/interfaces/default/home_postprocess.mako | 1 - gui/slick/interfaces/default/home_recommendedShows.mako | 1 - gui/slick/interfaces/default/home_trendingShows.mako | 1 - gui/slick/interfaces/default/home_trendingShows.tmpl | 1 - gui/slick/interfaces/default/inc_top.mako | 1 - gui/slick/interfaces/default/login.mako | 1 - gui/slick/interfaces/default/manage.mako | 1 - gui/slick/interfaces/default/manage_backlogOverview.mako | 1 - gui/slick/interfaces/default/manage_episodeStatuses.mako | 1 - gui/slick/interfaces/default/manage_episodeStatuses.tmpl | 1 - gui/slick/interfaces/default/manage_failedDownloads.mako | 1 - gui/slick/interfaces/default/manage_failedDownloads.tmpl | 1 - gui/slick/interfaces/default/manage_manageSearches.mako | 1 - gui/slick/interfaces/default/manage_manageSearches.tmpl | 1 - gui/slick/interfaces/default/manage_massEdit.mako | 1 - gui/slick/interfaces/default/manage_subtitleMissed.mako | 1 - gui/slick/interfaces/default/manage_torrents.mako | 1 - gui/slick/interfaces/default/restart.mako | 1 - gui/slick/interfaces/default/status.mako | 1 - gui/slick/interfaces/default/testRename.mako | 1 - gui/slick/interfaces/default/testRename.tmpl | 1 - gui/slick/interfaces/default/viewlogs.mako | 1 - sickbeard/webserve.py | 6 +++++- 42 files changed, 9 insertions(+), 46 deletions(-) diff --git a/gui/slick/interfaces/default/comingEpisodes.mako b/gui/slick/interfaces/default/comingEpisodes.mako index d6219d1a6..f823dd7c6 100644 --- a/gui/slick/interfaces/default/comingEpisodes.mako +++ b/gui/slick/interfaces/default/comingEpisodes.mako @@ -8,7 +8,6 @@ global title = 'Coming Episodes' global header = 'Coming Episodes' - global sbPath = '..' global topmenu = 'comingEpisodes' import os.path diff --git a/gui/slick/interfaces/default/config.mako b/gui/slick/interfaces/default/config.mako index 70a0f7ea6..560fd8165 100644 --- a/gui/slick/interfaces/default/config.mako +++ b/gui/slick/interfaces/default/config.mako @@ -11,7 +11,6 @@ global title="Configuration" global header="Configuration" - global sbPath=".." global topmenu="config" include os.path.join(sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.mako") diff --git a/gui/slick/interfaces/default/config_anime.mako b/gui/slick/interfaces/default/config_anime.mako index 4e0a7aa8e..dc8440fe9 100644 --- a/gui/slick/interfaces/default/config_anime.mako +++ b/gui/slick/interfaces/default/config_anime.mako @@ -5,7 +5,6 @@ global $title="Config - Anime" global $header="Anime" - global $sbPath="../.." global $topmenu="config"# include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.mako") diff --git a/gui/slick/interfaces/default/config_backuprestore.mako b/gui/slick/interfaces/default/config_backuprestore.mako index 61ae88794..5f7795251 100644 --- a/gui/slick/interfaces/default/config_backuprestore.mako +++ b/gui/slick/interfaces/default/config_backuprestore.mako @@ -11,7 +11,6 @@ global title = "Config - Backup/Restore" global header = "Backup/Restore" - global sbPath="../.." global topmenu="config"# include os.path.join(sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.mako") diff --git a/gui/slick/interfaces/default/config_general.mako b/gui/slick/interfaces/default/config_general.mako index e9f2c11d1..476fecf6d 100644 --- a/gui/slick/interfaces/default/config_general.mako +++ b/gui/slick/interfaces/default/config_general.mako @@ -10,10 +10,9 @@ from sickbeard.metadata.generic import GenericMetadata from sickbeard.helpers import anon_url - global title = 'Config - General' - global header = 'General Configuration' + title = 'Config - General' + header = 'General Configuration' - global sbPath = '../..' global topmenu = 'config' include os.path.join(sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.mako') diff --git a/gui/slick/interfaces/default/config_notifications.mako b/gui/slick/interfaces/default/config_notifications.mako index c6bdd8e23..ea22e858c 100644 --- a/gui/slick/interfaces/default/config_notifications.mako +++ b/gui/slick/interfaces/default/config_notifications.mako @@ -6,7 +6,6 @@ global title="Config - Notifications" global header="Notifications" - global sbPath="../.." global topmenu="config"# include os.path.join(sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.mako") diff --git a/gui/slick/interfaces/default/config_postProcessing.mako b/gui/slick/interfaces/default/config_postProcessing.mako index ba4bbde2c..7dab8ea6b 100644 --- a/gui/slick/interfaces/default/config_postProcessing.mako +++ b/gui/slick/interfaces/default/config_postProcessing.mako @@ -9,7 +9,6 @@ global title = "Config - Post Processing" global header = "Post Processing" - global sbPath="../.." global topmenu="config"# include os.path.join(sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.mako") diff --git a/gui/slick/interfaces/default/config_providers.mako b/gui/slick/interfaces/default/config_providers.mako index 6f2ba93bb..a6376b6ed 100644 --- a/gui/slick/interfaces/default/config_providers.mako +++ b/gui/slick/interfaces/default/config_providers.mako @@ -7,7 +7,6 @@ global title="Config - Providers" global header="Search Providers" - global sbPath="../.." global topmenu="config" import os.path diff --git a/gui/slick/interfaces/default/config_search.mako b/gui/slick/interfaces/default/config_search.mako index de9abf583..e7084f376 100644 --- a/gui/slick/interfaces/default/config_search.mako +++ b/gui/slick/interfaces/default/config_search.mako @@ -4,7 +4,6 @@ global title = 'Config - Episode Search' global header = 'Search Settings' - global sbPath = '../..' global topmenu = 'config' import os.path diff --git a/gui/slick/interfaces/default/config_subtitles.mako b/gui/slick/interfaces/default/config_subtitles.mako index 8a463479c..386492f39 100644 --- a/gui/slick/interfaces/default/config_subtitles.mako +++ b/gui/slick/interfaces/default/config_subtitles.mako @@ -5,7 +5,6 @@ global title="Config - Subtitles" global header="Subtitles" - global sbPath="../.." global topmenu="config" import os.path diff --git a/gui/slick/interfaces/default/editShow.mako b/gui/slick/interfaces/default/editShow.mako index bb4343281..0f22b792d 100644 --- a/gui/slick/interfaces/default/editShow.mako +++ b/gui/slick/interfaces/default/editShow.mako @@ -9,7 +9,6 @@ global title="Edit " + $show.name global header="Edit " + $show.name - global sbPath=".." global topmenu="home" import os.path diff --git a/gui/slick/interfaces/default/errorlogs.mako b/gui/slick/interfaces/default/errorlogs.mako index 86b09d2ca..2fd30689d 100644 --- a/gui/slick/interfaces/default/errorlogs.mako +++ b/gui/slick/interfaces/default/errorlogs.mako @@ -1,9 +1,8 @@ <% from sickbeard import classes - global header="Logs & Errors" + header="Logs & Errors" title="Logs & Errors" - sbPath = ".." topmenu="errorlogs" %> diff --git a/gui/slick/interfaces/default/genericMessage.mako b/gui/slick/interfaces/default/genericMessage.mako index 16e31754e..e86fc7313 100644 --- a/gui/slick/interfaces/default/genericMessage.mako +++ b/gui/slick/interfaces/default/genericMessage.mako @@ -1,6 +1,5 @@ <% global title="" - global sbPath="../.." global topmenu="home" %> <%!include file="/inc_top.tmpl"/> diff --git a/gui/slick/interfaces/default/history.mako b/gui/slick/interfaces/default/history.mako index f5f5867e3..98ff640e8 100644 --- a/gui/slick/interfaces/default/history.mako +++ b/gui/slick/interfaces/default/history.mako @@ -10,7 +10,6 @@ from sickbeard.common import * global title="History" global header="History" - global sbPath=".." global topmenu="history"# layout = sickbeard.HISTORY_LAYOUT history_limit = sickbeard.HISTORY_LIMIT diff --git a/gui/slick/interfaces/default/home.mako b/gui/slick/interfaces/default/home.mako index aef0a695b..478ee51e9 100644 --- a/gui/slick/interfaces/default/home.mako +++ b/gui/slick/interfaces/default/home.mako @@ -12,7 +12,6 @@ import calendar <%inherit file="/inc_top.mako"/> -##<% return STOP_RENDERING %> <% myDB = db.DBConnection() today = str(datetime.date.today().toordinal()) @@ -319,7 +318,7 @@ import calendar dateHasTime : false, dateFormat : '${sickbeard.DATE_PRESET}', timeFormat : '${sickbeard.TIME_PRESET}', - trimZero : ${('true', 'false')[sickbeard.TRIM_ZERO == True]} + trimZero : ${('false', 'true')[sickbeard.TRIM_ZERO == True]} }); % endif diff --git a/gui/slick/interfaces/default/home_addExistingShow.mako b/gui/slick/interfaces/default/home_addExistingShow.mako index 3aa614c91..0fae977b9 100644 --- a/gui/slick/interfaces/default/home_addExistingShow.mako +++ b/gui/slick/interfaces/default/home_addExistingShow.mako @@ -5,7 +5,6 @@ global title="Existing Show" global header="Existing Show" - global sbPath="../.." global statpath="../.." global topmenu="home" diff --git a/gui/slick/interfaces/default/home_addShows.mako b/gui/slick/interfaces/default/home_addShows.mako index f0a979f3a..574d948c8 100644 --- a/gui/slick/interfaces/default/home_addShows.mako +++ b/gui/slick/interfaces/default/home_addShows.mako @@ -5,7 +5,6 @@ global title="Add Show" global header="Add Show" - global sbPath="../.." global statpath="../.." global topmenu="home" diff --git a/gui/slick/interfaces/default/home_newShow.mako b/gui/slick/interfaces/default/home_newShow.mako index 05f98857a..6bbe811bf 100644 --- a/gui/slick/interfaces/default/home_newShow.mako +++ b/gui/slick/interfaces/default/home_newShow.mako @@ -5,7 +5,6 @@ #set global $header="New Show" #set global $title="New Show" -#set global $sbPath="../.." #set global $statpath="../.."# #set global $topmenu="home"# diff --git a/gui/slick/interfaces/default/home_newShow.tmpl b/gui/slick/interfaces/default/home_newShow.tmpl index 05f98857a..6bbe811bf 100644 --- a/gui/slick/interfaces/default/home_newShow.tmpl +++ b/gui/slick/interfaces/default/home_newShow.tmpl @@ -5,7 +5,6 @@ #set global $header="New Show" #set global $title="New Show" -#set global $sbPath="../.." #set global $statpath="../.."# #set global $topmenu="home"# diff --git a/gui/slick/interfaces/default/home_postprocess.mako b/gui/slick/interfaces/default/home_postprocess.mako index 77bcaf8dc..c658e379c 100644 --- a/gui/slick/interfaces/default/home_postprocess.mako +++ b/gui/slick/interfaces/default/home_postprocess.mako @@ -2,7 +2,6 @@ global header="Post Processing" global title="Post Processing" - global $sbPath="../.." global topmenu="home" %> diff --git a/gui/slick/interfaces/default/home_recommendedShows.mako b/gui/slick/interfaces/default/home_recommendedShows.mako index 1f8e8ba1b..77f990568 100644 --- a/gui/slick/interfaces/default/home_recommendedShows.mako +++ b/gui/slick/interfaces/default/home_recommendedShows.mako @@ -9,7 +9,6 @@ global title="Recommended Shows" global header="Recommended Shows" - global sbPath='..' global topmenu='home' import os.path diff --git a/gui/slick/interfaces/default/home_trendingShows.mako b/gui/slick/interfaces/default/home_trendingShows.mako index 03a25bcba..3446f457d 100644 --- a/gui/slick/interfaces/default/home_trendingShows.mako +++ b/gui/slick/interfaces/default/home_trendingShows.mako @@ -8,7 +8,6 @@ #set global $title='Trending Shows' #set global $header='Trending Shows' -#set global $sbPath='..' #set global $topmenu='home' #import os.path diff --git a/gui/slick/interfaces/default/home_trendingShows.tmpl b/gui/slick/interfaces/default/home_trendingShows.tmpl index 03a25bcba..3446f457d 100644 --- a/gui/slick/interfaces/default/home_trendingShows.tmpl +++ b/gui/slick/interfaces/default/home_trendingShows.tmpl @@ -8,7 +8,6 @@ #set global $title='Trending Shows' #set global $header='Trending Shows' -#set global $sbPath='..' #set global $topmenu='home' #import os.path diff --git a/gui/slick/interfaces/default/inc_top.mako b/gui/slick/interfaces/default/inc_top.mako index c1a5ace4a..899efe91b 100644 --- a/gui/slick/interfaces/default/inc_top.mako +++ b/gui/slick/interfaces/default/inc_top.mako @@ -1,7 +1,6 @@ <% import sickbeard sbRoot = sickbeard.WEB_ROOT - sbPID = 25112 %> <!DOCTYPE html> diff --git a/gui/slick/interfaces/default/login.mako b/gui/slick/interfaces/default/login.mako index b4bb1f89b..ef7e79f39 100644 --- a/gui/slick/interfaces/default/login.mako +++ b/gui/slick/interfaces/default/login.mako @@ -2,7 +2,6 @@ import sickbeard global title="Login" - global sbPath = ".." global topmenu="login" import os.path diff --git a/gui/slick/interfaces/default/manage.mako b/gui/slick/interfaces/default/manage.mako index 12777be2e..fdad261c4 100644 --- a/gui/slick/interfaces/default/manage.mako +++ b/gui/slick/interfaces/default/manage.mako @@ -4,7 +4,6 @@ global title="Mass Update" global header="Mass Update" - global sbPath="../.." global topmenu="manage" import os.path diff --git a/gui/slick/interfaces/default/manage_backlogOverview.mako b/gui/slick/interfaces/default/manage_backlogOverview.mako index 3b75e6ecf..94843dc00 100644 --- a/gui/slick/interfaces/default/manage_backlogOverview.mako +++ b/gui/slick/interfaces/default/manage_backlogOverview.mako @@ -6,7 +6,6 @@ global title = 'Backlog Overview' global header = 'Backlog Overview' - global sbPath = '..' global topmenu = 'manage'# import os.path diff --git a/gui/slick/interfaces/default/manage_episodeStatuses.mako b/gui/slick/interfaces/default/manage_episodeStatuses.mako index 622d7e48a..85f35e0c8 100644 --- a/gui/slick/interfaces/default/manage_episodeStatuses.mako +++ b/gui/slick/interfaces/default/manage_episodeStatuses.mako @@ -5,7 +5,6 @@ global title="Episode Overview" global header="Episode Overview" - global sbPath=".." global topmenu="manage"# import os.path diff --git a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl index 90a4e2dc8..93587bcbf 100644 --- a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl +++ b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl @@ -4,7 +4,6 @@ #set global $title="Episode Overview" #set global $header="Episode Overview" -#set global $sbPath=".." #set global $topmenu="manage"# #import os.path diff --git a/gui/slick/interfaces/default/manage_failedDownloads.mako b/gui/slick/interfaces/default/manage_failedDownloads.mako index 9efc3f12b..0acde87d3 100644 --- a/gui/slick/interfaces/default/manage_failedDownloads.mako +++ b/gui/slick/interfaces/default/manage_failedDownloads.mako @@ -9,7 +9,6 @@ global header="Failed Downloads" global title="Failed Downloads" - global sbPath=".." global topmenu="manage"# include file=os.path.join(sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.mako") diff --git a/gui/slick/interfaces/default/manage_failedDownloads.tmpl b/gui/slick/interfaces/default/manage_failedDownloads.tmpl index d7070514b..4ba6bc506 100644 --- a/gui/slick/interfaces/default/manage_failedDownloads.tmpl +++ b/gui/slick/interfaces/default/manage_failedDownloads.tmpl @@ -8,7 +8,6 @@ #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") diff --git a/gui/slick/interfaces/default/manage_manageSearches.mako b/gui/slick/interfaces/default/manage_manageSearches.mako index 7e977dda0..68524f2b5 100644 --- a/gui/slick/interfaces/default/manage_manageSearches.mako +++ b/gui/slick/interfaces/default/manage_manageSearches.mako @@ -4,7 +4,6 @@ from sickbeard.common import * global title="Manage Searches" global header="Manage Searches" - global sbPath=".." global topmenu="manage"# import os.path diff --git a/gui/slick/interfaces/default/manage_manageSearches.tmpl b/gui/slick/interfaces/default/manage_manageSearches.tmpl index 03f421370..2337db910 100644 --- a/gui/slick/interfaces/default/manage_manageSearches.tmpl +++ b/gui/slick/interfaces/default/manage_manageSearches.tmpl @@ -3,7 +3,6 @@ #from sickbeard.common import * #set global $title="Manage Searches" #set global $header="Manage Searches" -#set global $sbPath=".." #set global $topmenu="manage"# #import os.path diff --git a/gui/slick/interfaces/default/manage_massEdit.mako b/gui/slick/interfaces/default/manage_massEdit.mako index 2a2c7895b..d38110d06 100644 --- a/gui/slick/interfaces/default/manage_massEdit.mako +++ b/gui/slick/interfaces/default/manage_massEdit.mako @@ -6,7 +6,6 @@ global $title="Mass Edit" global $header="Mass Edit" - global $sbPath=".." global $topmenu="manage"# import os.path diff --git a/gui/slick/interfaces/default/manage_subtitleMissed.mako b/gui/slick/interfaces/default/manage_subtitleMissed.mako index d262afd73..c75328cbc 100644 --- a/gui/slick/interfaces/default/manage_subtitleMissed.mako +++ b/gui/slick/interfaces/default/manage_subtitleMissed.mako @@ -6,7 +6,6 @@ global title="Episode Overview" global header="Episode Overview" - global sbPath=".." global topmenu="manage"# import os.path diff --git a/gui/slick/interfaces/default/manage_torrents.mako b/gui/slick/interfaces/default/manage_torrents.mako index d85e4660e..44211329d 100644 --- a/gui/slick/interfaces/default/manage_torrents.mako +++ b/gui/slick/interfaces/default/manage_torrents.mako @@ -4,7 +4,6 @@ from sickbeard.common import * global title="Manage Torrents" global header="Manage Torrents" - global sbPath=".." global topmenu="manage"# import os.path diff --git a/gui/slick/interfaces/default/restart.mako b/gui/slick/interfaces/default/restart.mako index 42279f2c3..f68dbf0dd 100644 --- a/gui/slick/interfaces/default/restart.mako +++ b/gui/slick/interfaces/default/restart.mako @@ -7,7 +7,6 @@ global title="Home" global header="Restarting SickRage" - global sbPath = ".." global topmenu="home" import os.path diff --git a/gui/slick/interfaces/default/status.mako b/gui/slick/interfaces/default/status.mako index 8f45682fb..4fab79f78 100644 --- a/gui/slick/interfaces/default/status.mako +++ b/gui/slick/interfaces/default/status.mako @@ -5,7 +5,6 @@ global title="Status" global header="Status" - global sbPath=".." global topmenu="config"# include os.path.join(sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") diff --git a/gui/slick/interfaces/default/testRename.mako b/gui/slick/interfaces/default/testRename.mako index 953f5efb0..522bd54af 100644 --- a/gui/slick/interfaces/default/testRename.mako +++ b/gui/slick/interfaces/default/testRename.mako @@ -3,7 +3,6 @@ #from sickbeard import exceptions #set global $title="Test Rename" #set global $header = '<a href="' + $sbRoot + '/home/displayShow?show=%d">%s</a>' % ($show.indexerid, $show.name) -#set global $sbPath=".." #set global $topmenu="home"# #import os.path diff --git a/gui/slick/interfaces/default/testRename.tmpl b/gui/slick/interfaces/default/testRename.tmpl index 953f5efb0..522bd54af 100644 --- a/gui/slick/interfaces/default/testRename.tmpl +++ b/gui/slick/interfaces/default/testRename.tmpl @@ -3,7 +3,6 @@ #from sickbeard import exceptions #set global $title="Test Rename" #set global $header = '<a href="' + $sbRoot + '/home/displayShow?show=%d">%s</a>' % ($show.indexerid, $show.name) -#set global $sbPath=".." #set global $topmenu="home"# #import os.path diff --git a/gui/slick/interfaces/default/viewlogs.mako b/gui/slick/interfaces/default/viewlogs.mako index 193490069..3acac80ce 100644 --- a/gui/slick/interfaces/default/viewlogs.mako +++ b/gui/slick/interfaces/default/viewlogs.mako @@ -7,7 +7,6 @@ header="Log File" title="Logs" - sbPath = ".." topmenu="errorlogs" %> diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index c53a37ae9..cc1b40fc4 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -145,6 +145,10 @@ class PageTemplate(MakoTemplate): {'title': logPageTitle, 'key': 'errorlogs'}, ] + self.arguments['title'] = "FixME" + self.arguments['header'] = "FixME" + #self.arguments['title'] = "FixME" + def render(self, *args, **kwargs): kwargs.update(self.arguments) return super(PageTemplate, self).render(*args, **kwargs) @@ -744,7 +748,7 @@ class Home(WebRoot): else: showlists = [["Shows", sickbeard.showList]] - return t.render(title="Home", header="Home", topmenu="home", sbPath="..", showlists=showlists, submenu=self.HomeMenu()) + return t.render(title="Home", header="Home", topmenu="home", showlists=showlists, submenu=self.HomeMenu()) def is_alive(self, *args, **kwargs): if 'callback' in kwargs and '_' in kwargs: -- GitLab