Logout button added

Pavion · Apr 30, 2016 · 3e68025 · 3e68025
1 parent aca799d
commit 3e68025
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,6 @@
 2016-04-xx 1.2.8 Password-free IP mask added into advanced configuration
+                 Fix for login on iOS devices
+                 Logout link added
 
 2016-04-06 1.2.7 Fix for table switches
                  Fix for overnight records using EPG chart

diff --git a/css/tvstreamrecord.basic.css b/css/tvstreamrecord.basic.css
@@ -14,7 +14,7 @@ body {
 
 #tabs {
     position: absolute;
-    min-width: 1000px;
+    min-width: 970px;
     float:left;
 }
 
@@ -293,4 +293,8 @@ div#users-contain table th { font-weight: bold; }
 .grabepgclass {
     float: left;
     margin: -5px 0 10px 10px;
+}
+
+#mainmenu {
+    font-family: Arial, Helvetica, sans-serif;
 }
diff --git a/tvstreamrecord.py b/tvstreamrecord.py
@@ -128,6 +128,12 @@ def postLogin():
 
     redirect("/")
 
+@route('/logoff')
+def postLogout():
+    response.delete_cookie(b"tvstreamrecord_user")
+    if config.checkIP(request.remote_addr) == True:
+        return template('login')
+
 @post('/setpass')
 def setPass():
     global credentials
@@ -199,7 +205,7 @@ def internationalize(templ,noheader=False):
     else:
         #TEMPLATES.clear() # debug only, should be turned off! 
         if not noheader:
-            header = template('header', style=config.cfg_theme, version=version, language=config.cfg_language, locale=config.cfg_locale )
+            header = template('header', style=config.cfg_theme, version=version, language=config.cfg_language, locale=config.cfg_locale, logout=(not credentials=="") )
             footer = template('footer')
             templ = header + templ + footer
         if not config.cfg_language == "english":

diff --git a/views/header.tpl b/views/header.tpl
@@ -37,14 +37,17 @@
     <div id="loaderImage"></div>
 <div id="tabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
   <ul id="mainmenu" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li><a id="mobipic" title="tvstreamrecord Mobile" class="ui-tabs-anchor" href="/mobile"><img src="images/iphone-control-panel-px-png.png"></a></li>
+    <li><a id="mobipic" class="ui-tabs-anchor" href="/mobile"><img src="images/iphone-control-panel-px-png.png"></a></li>
     <li id="menu-0" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/records">§Records§</a></li>
     <li id="menu-1" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/list">§Channels§</a></li>
     <li id="menu-2" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/epgchart">§EPG Chart§</a></li>
     <li id="menu-3" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/epglist">§EPG List§</a></li>
     <li id="menu-4" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/config">§Config§</a></li>
     <li id="menu-5" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/log">§Log§</a></li>
     <li id="menu-6" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/about">§About§</a></li>
+%if logout:
+    <li id="menu-7" class="ui-state-default ui-corner-top"><a class="ui-tabs-anchor" href="/logoff">X</a></li>
+%end    
   </ul>
 </div>
 %from datetime import datetime