From dce80a929b76a7b0d98b482a90e67ce6070df5aa Mon Sep 17 00:00:00 2001
From: david
Date: Thu, 10 Nov 2016 00:43:06 +0100
Subject: [PATCH] small changes
---
app.py | 13 ++++++++-----
static/css/signin.css | 6 ++++++
static/favicon.ico | Bin 0 -> 9662 bytes
views/default.tpl | 14 +++++++-------
views/login.tpl | 14 ++++++++++++++
5 files changed, 35 insertions(+), 12 deletions(-)
create mode 100644 static/favicon.ico
diff --git a/app.py b/app.py
index 41c2d30..84b883a 100644
--- a/app.py
+++ b/app.py
@@ -66,7 +66,8 @@ def login():
redirect('/')
else:
#render login page
- return template('login', app_name=app_name, cookie_max_age=cookie_max_age)
+ message = request.get_cookie(cookie_name + "_message", secret=cookie_secret)
+ return template('login', app_name=app_name, cookie_max_age=cookie_max_age, message=message)
# get login credentials
@post('/login')
@@ -74,7 +75,7 @@ def post_login():
username = request.forms.get('username')
password = request.forms.get('password')
if miab_auth(username, password):
- message = { "message": "You have logged in successfully!", "alert": "success" }
+ message = { "message": "You have logged in successfully", "alert": "success" }
response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
redirect('/')
else:
@@ -86,6 +87,8 @@ def post_login():
def logout():
if logged_in():
response.delete_cookie(cookie_name)
+ message = { "message": "You have logged out successfully", "alert": "success" }
+ response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
redirect('/')
else:
redirect('/')
@@ -108,15 +111,15 @@ def post_password():
data = { "email": username, "password": newpassword }
a = requests.post(miab_url + "/mail/users/add", data=data, auth=(miab_admin, miab_passwd))
if r.status_code == 200 and a.status_code == 200:
- message = { "message": "Your password has been changed successfully!", "alert": "primary" }
+ message = { "message": "Your password has been changed successfully", "alert": "success" }
response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
redirect('/')
else:
- message = { "message": "Something went wrong while changing your password!", "alert": "danger" }
+ message = { "message": "Something went wrong while changing your password", "alert": "danger" }
response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
redirect('/')
else:
- message = { "message": "Your supplied password is wrong!", "alert": "danger" }
+ message = { "message": "Your supplied password is wrong", "alert": "danger" }
response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
redirect('/')
else:
diff --git a/static/css/signin.css b/static/css/signin.css
index 2c959ea..22dd66a 100644
--- a/static/css/signin.css
+++ b/static/css/signin.css
@@ -38,3 +38,9 @@ body {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
+
+@media (min-width: 600px) {
+ .container{
+ max-width: 600px;
+ }
+}
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d6bb62b6e73a9aa0dc3687f7faf9c5e521d727f8
GIT binary patch
literal 9662
zcmeHLNoZ4H5dM=i2^cpJL=4)B23kR=AR=Pv)sr{Di&$?Wf`};MLMtluAT9^*9$Kv%
zN-rX6DF`ZV2M>xUVl60E(L+JB#y-DE-;{Yn-q!pnTHb^&Gyg2#KbgF|CB~%iYHc-m
zZ!&!)V-^}?ngO^>2SENrk_jXeNG6a>Aelfifyx9f;N1zpoJ!Wj8`(j*+eGekndbv~
z8bxfjXoPI?`F(~hBG;Ok&*y`Q*Qhi^l9Lb5B9+?C5y#=z%TzSV#G;%(;gm4r_;Re2?RPkLGMD&=aV;7S;_d0
zD)Fhh`cNpjHIIx9>Y!MU!RFi{_P4dQvB@#gJK1SLUjm2Z)|4`KM+e2aYX2fW$%Etj
zr0~~j_JClLy9$|%O|}1ZYL7=)Uj%4&wV*eZO1)FuSbD@p|7*a=JmbPL*#yg{VOD2et$nj?bndnGUC(=_4OUN4*1Ce1Q==9a!+j^z;QXB@^P<3
zdLSfU*6*b{w{{-%jey!Wh~+5P#a!s9BKOp`zJIt4Qk~b0(QUT*zg#Enter your old password and your desired password and hit the change button.
Watch typos! I will not watch for you.
@@ -85,9 +85,9 @@
@@ -100,9 +100,9 @@
diff --git a/views/login.tpl b/views/login.tpl
index 81a9767..741c391 100644
--- a/views/login.tpl
+++ b/views/login.tpl
@@ -21,6 +21,14 @@
+
+ %if message:
+
+
+ {{ message['message'] }}.
+
+ %end
+
+
+
+
+
+