moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-16 06:15:09 -05:00
Code Issues Releases Wiki Activity

Merge pull request #45 from JackDandy/feature/FixRestartRef

Browse Source 
Fix theme identification for spinner when restarting.
This commit is contained in:
JackDandy 2014-10-28 04:35:28 +00:00
commit 4ab2b141a1
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gui/slick/interfaces/default/restart_bare.tmpl
View File

@ -5,11 +5,13 @@
#set curSBHttpPort = $sbHttpPort #set curSBHttpPort = $sbHttpPort
#set curSBHttpsEnabled = $sbHttpsEnabled #set curSBHttpsEnabled = $sbHttpsEnabled
#set curSBHandleReverseProxy = $sbHandleReverseProxy #set curSBHandleReverseProxy = $sbHandleReverseProxy
#set themeSpinner = $sbThemeName
#except NameMapper.NotFound: #except NameMapper.NotFound:
#set curSBHost = "localhost" #set curSBHost = "localhost"
#set curSBHttpPort = $sickbeard.WEB_PORT #set curSBHttpPort = $sickbeard.WEB_PORT
#set curSBHttpsEnabled = "False" #set curSBHttpsEnabled = "False"
#set curSBHandleReverseProxy = "False" #set curSBHandleReverseProxy = "False"
#set themeSpinner = $sickbeard.THEME_NAME
#end try #end try
sbRoot = "$sbRoot"; sbRoot = "$sbRoot";
sbHttpPort = "$curSBHttpPort"; sbHttpPort = "$curSBHttpPort";
@ -22,18 +24,7 @@ sbHost = "$curSBHost";
<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script>
#try: #set themeSpinner = '-dark' if 'dark' == themeSpinner else ''
#sickbeard
#except NameError:
#set themeSpinner = '';
#else:
#if 'dark' != sickbeard.THEME_NAME:
#set themeSpinner = ''
#else:
#set themeSpinner = '-dark'
#end if
#end try
<h2>Performing Restart</h2> <h2>Performing Restart</h2>
<br /> <br />
<div id="shut_down_message"> <div id="shut_down_message">

1
sickbeard/webserve.py
View File

@ -513,6 +513,7 @@ class PageTemplate(Template):
self.sbHttpsPort = sickbeard.WEB_PORT self.sbHttpsPort = sickbeard.WEB_PORT
self.sbHttpsEnabled = sickbeard.ENABLE_HTTPS self.sbHttpsEnabled = sickbeard.ENABLE_HTTPS
self.sbHandleReverseProxy = sickbeard.HANDLE_REVERSE_PROXY self.sbHandleReverseProxy = sickbeard.HANDLE_REVERSE_PROXY
self.sbThemeName = sickbeard.THEME_NAME
if headers['Host'][0] == '[': if headers['Host'][0] == '[':
self.sbHost = re.match("^\[.*\]", headers['Host'], re.X | re.M | re.S).group(0) self.sbHost = re.match("^\[.*\]", headers['Host'], re.X | re.M | re.S).group(0)