From 9727204ed66ef0d6acfbf4df0bf49f5e4d9c10ba Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 12 Jan 2015 14:49:50 +0200 Subject: login+logout: using ajax, not POST, plus document.window (worst of both worlds) --- res/client/css/partials/top-bar.scss | 6 +----- res/client/css/style.css | 3 --- res/templates/index.html | 2 +- res/templates/login.html | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 32 insertions(+), 12 deletions(-) (limited to 'res') diff --git a/res/client/css/partials/top-bar.scss b/res/client/css/partials/top-bar.scss index 5aec704c..cffd200a 100644 --- a/res/client/css/partials/top-bar.scss +++ b/res/client/css/partials/top-bar.scss @@ -57,8 +57,4 @@ background: url(../img/CRI-logo.png); min-height: 30px; min-width: 30px; -} - -.logout-form { - display: inline; -} +} \ No newline at end of file diff --git a/res/client/css/style.css b/res/client/css/style.css index b4008d93..b6231384 100644 --- a/res/client/css/style.css +++ b/res/client/css/style.css @@ -826,9 +826,6 @@ body.debug .debug-ui-right { min-height: 30px; min-width: 30px; } -.logout-form { - display: inline; } - /* Headings */ h1 { font-size: 30px; } diff --git a/res/templates/index.html b/res/templates/index.html index 6ef39e25..13913ba2 100644 --- a/res/templates/index.html +++ b/res/templates/index.html @@ -23,7 +23,7 @@
AN -
Welcome Anonymous!
+
Welcome Anonymous! Logout
diff --git a/res/templates/login.html b/res/templates/login.html index 3e32eee3..57bbdec4 100644 --- a/res/templates/login.html +++ b/res/templates/login.html @@ -4,7 +4,34 @@ Welcome to Rhizi + +
@@ -18,9 +45,9 @@
-
- - + + + forgot password?
-- cgit v1.3.1