From 7afbc14912a37e4328947299f7e3055e7e7f6b4a Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Fri, 9 Jan 2015 22:11:34 +0100
Subject: Updated login forms and login template.

---
 pyaggr3g470r/forms.py             |  2 +-
 pyaggr3g470r/templates/login.html | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pyaggr3g470r/forms.py b/pyaggr3g470r/forms.py
index bf6d136d..3e987082 100644
--- a/pyaggr3g470r/forms.py
+++ b/pyaggr3g470r/forms.py
@@ -37,7 +37,7 @@ from pyaggr3g470r.models import User
 
 class SignupForm(Form):
     nickname = TextField(lazy_gettext("Nickname"), [validators.Required(lazy_gettext("Please enter your nickname."))])
-    email = EmailField(lazy_gettext("Email"), [validators.Length(min=6, max=35), validators.Required(lazy_gettext("Please enter your email."))])
+    email = EmailField(lazy_gettext("Email"), [validators.Length(min=6, max=35), validators.Required(lazy_gettext("Please enter your email address."))])
     password = PasswordField(lazy_gettext("Password"), [validators.Required(lazy_gettext("Please enter a password.")), validators.Length(min=6, max=100)])
     recaptcha = RecaptchaField()
     submit = SubmitField(lazy_gettext("Sign up"))
diff --git a/pyaggr3g470r/templates/login.html b/pyaggr3g470r/templates/login.html
index 2930a8ee..ae0797a5 100644
--- a/pyaggr3g470r/templates/login.html
+++ b/pyaggr3g470r/templates/login.html
@@ -3,25 +3,22 @@
 <div class="container">
     <div class="jumbotron">
         <h2>{{ _('Log In') }}</h2>
-
-        {% for message in form.email.errors %}
-            <div class="flash">{{ message }}</div>
-        {% endfor %}
-
-        {% for message in form.password.errors %}
-            <div class="flash">{{ message }}</div>
-        {% endfor %}
-
         <form action="{{ url_for('login') }}" method=post>
             {{ form.hidden_tag() }}
 
             <div class="form-group">
             {{ form.email(class_="form-control", placeholder=_('Your email')) }}
             </div>
+            {% for message in form.email.errors %}
+                <div class="alert alert-warning" role="alert">{{ message }}</div>
+            {% endfor %}
 
             <div class="form-group">
             {{ form.password(class_="form-control", placeholder=_('Your Password')) }}
             </div>
+            {% for message in form.password.errors %}
+                <div class="alert alert-warning" role="alert">{{ message }}</div>
+            {% endfor %}
 
             {{ form.submit(class_="btn btn-default") }}
         </form>
-- 
cgit