Updates to logout ui

sandialabs · Dec 9, 2015 · 850c05e · 850c05e
1 parent 83aef3e
commit 850c05e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 50 deletions.
diff --git a/packages/slycat/web/server/engine.py b/packages/slycat/web/server/engine.py
@@ -212,7 +212,15 @@ def log_configuration(tree, indent=""):
     "tools.expires.on": True,
     "tools.expires.secs": 3600,
     "tools.%s.on" % authentication : False,
-    "tools.staticfile.filename": abspath("logout.html"),
+    "tools.staticfile.filename": abspath("templates/slycat-logout.html"),
+    "tools.staticfile.on": True,
+    }
+  configuration["/resources/global/slycat-logo-navbar.png"] = {
+    "tools.expires.force": True,
+    "tools.expires.on": True,
+    "tools.expires.secs": 3600,
+    "tools.%s.on" % authentication : False,
+    "tools.staticfile.filename": abspath("css/slycat-logo-navbar.png"),
     "tools.staticfile.on": True,
     }
   # Load plugin modules.

diff --git a/web-server/js/slycat-navbar.js b/web-server/js/slycat-navbar.js
@@ -392,7 +392,7 @@ define("slycat-navbar", ["slycat-server-root", "slycat-web-client", "slycat-chan
       {
         client.sign_out({ 
           success: function(){ 
-            window.location.href = "/";
+            window.location.href = "/logout.html";
           }, 
           error: function(){ 
             window.alert("Sorry, something went wrong and you are not signed out."); 

diff --git a/web-server/logout.html b/web-server/logout.html