diff --git a/gui/slick/views/layouts/main.mako b/gui/slick/views/layouts/main.mako index 9da4508649d58ef1f425dbfef31bd897daf1fe8f..a839a7706455cbf7b1c11bcc940a9db95cb7da56 100644 --- a/gui/slick/views/layouts/main.mako +++ b/gui/slick/views/layouts/main.mako @@ -234,8 +234,7 @@ </div><!-- /.navbar-collapse --> </div><!-- /.container-fluid --> </nav> - - % if not submenu is UNDEFINED: + % if submenu: <div id="SubMenu" class="hidden-print"> <span> <% first = True %> @@ -261,7 +260,6 @@ </span> </div> % endif - % if sickbeard.BRANCH and sickbeard.BRANCH != 'master' and not sickbeard.DEVELOPER and srLogin: <div class="alert alert-danger upgrade-notification hidden-print" role="alert"> <span>You're using the ${sickbeard.BRANCH} branch. Please use 'master' unless specifically asked</span> diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 5a6f3333392909fd69864efb76b75022513fea53..cdfe0e10cfd1f82cb508ab43e335682e6e86af4a 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -143,6 +143,7 @@ class PageTemplate(MakoTemplate): self.arguments['title'] = "FixME" self.arguments['header'] = "FixME" self.arguments['topmenu'] = "FixME" + self.arguments['submenu'] = [] self.arguments['controller'] = "FixME" self.arguments['action'] = "FixME" @@ -999,7 +1000,7 @@ class Home(WebRoot): size = 0 for r in rows: NotifyList = {'emails':'', 'prowlAPIs':''} - if (r['notify_list'] and len(r['notify_list']) > 0): + if r['notify_list'] and len(r['notify_list']) > 0: # First, handle legacy format (emails only) if not r['notify_list'][0] == '{': NotifyList['emails'] = r['notify_list']