From 850c05ed04b39c95962606d046d7d7b95a690b6f Mon Sep 17 00:00:00 2001 From: "Alex M. Sielicki" Date: Wed, 9 Dec 2015 23:11:26 +0000 Subject: [PATCH] Updates to logout ui --- packages/slycat/web/server/engine.py | 10 +++++- web-server/js/slycat-navbar.js | 2 +- web-server/logout.html | 48 ---------------------------- 3 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 web-server/logout.html diff --git a/packages/slycat/web/server/engine.py b/packages/slycat/web/server/engine.py index 5810cef1a..63c572da3 100644 --- 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 index 94cc67fb4..49eac0b9c 100644 --- 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 deleted file mode 100644 index 6aa012b91..000000000 --- a/web-server/logout.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - 401 - - - - - -
- You Are Logged Out -
-
- Slycat Homepage -
- -