From d56efb8f8290f2e88e5a584b8ae6806023035003 Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Thu, 4 Sep 2014 15:26:00 +0200
Subject: [PATCH 1/7] Display validation errors on login form

---
 .../templates/rest_framework/login_base.html  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 43860e53ea..75e6d47276 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -18,17 +18,32 @@
                     <div class="row-fluid">
                         <div>
                             <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
+                                {% if form.non_field_errors %}
+                                    {% for error in form.non_field_errors %}
+                                        <p class="alert">{{ error }}</p>
+                                    {% endfor %}
+                                {% endif %}
                                 {% csrf_token %}
                                 <div id="div_id_username" class="clearfix control-group">
                                     <div class="controls">
+                                        {% if form.username.errors %}
+                                            <p class="alert">
+                                                {{ form.username.errors|striptags }}
+                                            </p>
+                                        {% endif %}
                                         <Label class="span4">Username:</label>
-                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username">
+                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required>
                                     </div>
                                 </div>
                                 <div id="div_id_password" class="clearfix control-group">
-                                    <div class="controls">
+                                        <div class="controls">
+                                        {% if form.password.errors %}
+                                            <p class="alert">
+                                                {{ form.password.errors|striptags }}
+                                            </p>
+                                        {% endif %}
                                         <Label class="span4">Password:</label>
-                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password">
+                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required>
                                     </div>
                                 </div>
                                 <input type="hidden" name="next" value="{{ next }}" />

From ea259e8bde2d4ea6b018f28900288a71ab2db05a Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Thu, 4 Sep 2014 16:01:27 +0200
Subject: [PATCH 2/7] Error messages are displayed below the input fields

---
 .../templates/rest_framework/login_base.html  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 75e6d47276..3a75e8b35f 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -18,38 +18,38 @@
                     <div class="row-fluid">
                         <div>
                             <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
-                                {% if form.non_field_errors %}
-                                    {% for error in form.non_field_errors %}
-                                        <p class="alert">{{ error }}</p>
-                                    {% endfor %}
-                                {% endif %}
                                 {% csrf_token %}
                                 <div id="div_id_username" class="clearfix control-group">
                                     <div class="controls">
+                                        <Label class="span4">Username:</label>
+                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required>
                                         {% if form.username.errors %}
-                                            <p class="alert">
+                                            <p class="alert" style="margin-top: 10px">
                                                 {{ form.username.errors|striptags }}
                                             </p>
                                         {% endif %}
-                                        <Label class="span4">Username:</label>
-                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required>
                                     </div>
                                 </div>
                                 <div id="div_id_password" class="clearfix control-group">
                                         <div class="controls">
+                                        <Label class="span4">Password:</label>
+                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required>
                                         {% if form.password.errors %}
-                                            <p class="alert">
+                                            <p class="alert" style="margin-top: 10px">
                                                 {{ form.password.errors|striptags }}
                                             </p>
                                         {% endif %}
-                                        <Label class="span4">Password:</label>
-                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required>
                                     </div>
                                 </div>
                                 <input type="hidden" name="next" value="{{ next }}" />
                                 <div class="form-actions-no-box">
                                     <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
                                 </div>
+                                {% if form.non_field_errors %}
+                                    {% for error in form.non_field_errors %}
+                                        <div class="alert" style="margin-top: 10px">{{ error }}</div>
+                                    {% endfor %}
+                                {% endif %}
                             </form>
                         </div>
                     </div><!-- /.row-fluid -->

From 3bc858c30b04a1c042d1b0d5196994a2e1e3fe64 Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Thu, 4 Sep 2014 17:51:45 +0200
Subject: [PATCH 3/7] General message error goes above submit button

---
 rest_framework/templates/rest_framework/login_base.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 3a75e8b35f..49dad3aeb3 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -42,14 +42,14 @@
                                     </div>
                                 </div>
                                 <input type="hidden" name="next" value="{{ next }}" />
-                                <div class="form-actions-no-box">
-                                    <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
-                                </div>
                                 {% if form.non_field_errors %}
                                     {% for error in form.non_field_errors %}
                                         <div class="alert" style="margin-top: 10px">{{ error }}</div>
                                     {% endfor %}
                                 {% endif %}
+                                <div class="form-actions-no-box">
+                                    <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
+                                </div>
                             </form>
                         </div>
                     </div><!-- /.row-fluid -->

From 6106701c063ea2efab7dbe82bbdfc02f9eb40421 Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Fri, 5 Sep 2014 09:38:54 +0200
Subject: [PATCH 4/7] Input fields get hightlighted if login fails and username
 is persisted

---
 .../templates/rest_framework/login_base.html  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 49dad3aeb3..7569c77ad6 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -17,25 +17,32 @@
         
                     <div class="row-fluid">
                         <div>
-                            <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
+                            <form action="{% url 'rest_framework:login' %}" role="form" method="post">
                                 {% csrf_token %}
-                                <div id="div_id_username" class="clearfix control-group">
+                                <div id="div_id_username"
+                                    class="clearfix control-group {% if form.username.errors %}warning{% endif %}">
                                     <div class="controls">
                                         <Label class="span4">Username:</label>
-                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required>
+                                        <input style="height: 25px" type="text" name="username" maxlength="100"
+                                            autocapitalize="off" autocorrect="off" class="textinput textInput"
+                                            id="id_username"
+                                            {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
                                         {% if form.username.errors %}
-                                            <p class="alert" style="margin-top: 10px">
+                                            <p class="text-warning" style="margin-top: 10px">
                                                 {{ form.username.errors|striptags }}
                                             </p>
                                         {% endif %}
                                     </div>
                                 </div>
-                                <div id="div_id_password" class="clearfix control-group">
+                                    <div id="div_id_password"
+                                        class="clearfix control-group {% if form.password.errors %}warning{% endif %}">
                                         <div class="controls">
                                         <Label class="span4">Password:</label>
-                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required>
+                                        <input style="height: 25px" type="password" name="password" maxlength="100"
+                                            autocapitalize="off" autocorrect="off" class="textinput textInput"
+                                            id="id_password">
                                         {% if form.password.errors %}
-                                            <p class="alert" style="margin-top: 10px">
+                                            <p class="text-warning" style="margin-top: 10px">
                                                 {{ form.password.errors|striptags }}
                                             </p>
                                         {% endif %}
@@ -44,7 +51,7 @@
                                 <input type="hidden" name="next" value="{{ next }}" />
                                 {% if form.non_field_errors %}
                                     {% for error in form.non_field_errors %}
-                                        <div class="alert" style="margin-top: 10px">{{ error }}</div>
+                                        <div class="text-warning" style="margin: 10px 0">{{ error }}</div>
                                     {% endfor %}
                                 {% endif %}
                                 <div class="form-actions-no-box">

From d3ee26ba9972619bdbe191b7d90d4dd60fb65983 Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Fri, 5 Sep 2014 10:55:49 +0200
Subject: [PATCH 5/7] Change bootstrap class warning to error

---
 .../templates/rest_framework/login_base.html           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 7569c77ad6..fb355d5281 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -20,7 +20,7 @@
                             <form action="{% url 'rest_framework:login' %}" role="form" method="post">
                                 {% csrf_token %}
                                 <div id="div_id_username"
-                                    class="clearfix control-group {% if form.username.errors %}warning{% endif %}">
+                                    class="clearfix control-group {% if form.username.errors %}error{% endif %}">
                                     <div class="controls">
                                         <Label class="span4">Username:</label>
                                         <input style="height: 25px" type="text" name="username" maxlength="100"
@@ -28,21 +28,21 @@
                                             id="id_username"
                                             {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
                                         {% if form.username.errors %}
-                                            <p class="text-warning" style="margin-top: 10px">
+                                            <p class="text-error">
                                                 {{ form.username.errors|striptags }}
                                             </p>
                                         {% endif %}
                                     </div>
                                 </div>
                                     <div id="div_id_password"
-                                        class="clearfix control-group {% if form.password.errors %}warning{% endif %}">
+                                        class="clearfix control-group {% if form.password.errors %}error{% endif %}">
                                         <div class="controls">
                                         <Label class="span4">Password:</label>
                                         <input style="height: 25px" type="password" name="password" maxlength="100"
                                             autocapitalize="off" autocorrect="off" class="textinput textInput"
                                             id="id_password">
                                         {% if form.password.errors %}
-                                            <p class="text-warning" style="margin-top: 10px">
+                                            <p class="text-error">
                                                 {{ form.password.errors|striptags }}
                                             </p>
                                         {% endif %}
@@ -51,7 +51,7 @@
                                 <input type="hidden" name="next" value="{{ next }}" />
                                 {% if form.non_field_errors %}
                                     {% for error in form.non_field_errors %}
-                                        <div class="text-warning" style="margin: 10px 0">{{ error }}</div>
+                                        <div class="text-error" style="margin: 10px 0">{{ error }}</div>
                                     {% endfor %}
                                 {% endif %}
                                 <div class="form-actions-no-box">

From 34b3ee9ea1d9c6f389424186c446dbfa8b9a58c6 Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Fri, 5 Sep 2014 11:06:30 +0200
Subject: [PATCH 6/7] Place general error message in well

---
 .../templates/rest_framework/login_base.html          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index fb355d5281..582a7f273d 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -24,8 +24,9 @@
                                     <div class="controls">
                                         <Label class="span4">Username:</label>
                                         <input style="height: 25px" type="text" name="username" maxlength="100"
-                                            autocapitalize="off" autocorrect="off" class="textinput textInput"
-                                            id="id_username"
+                                            autocapitalize="off"
+                                            autocorrect="off" class="span12 textinput textInput"
+                                            id="id_username" required
                                             {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
                                         {% if form.username.errors %}
                                             <p class="text-error">
@@ -39,8 +40,8 @@
                                         <div class="controls">
                                         <Label class="span4">Password:</label>
                                         <input style="height: 25px" type="password" name="password" maxlength="100"
-                                            autocapitalize="off" autocorrect="off" class="textinput textInput"
-                                            id="id_password">
+                                            autocapitalize="off" autocorrect="off" class="span12 textinput textInput"
+                                            id="id_password" required>
                                         {% if form.password.errors %}
                                             <p class="text-error">
                                                 {{ form.password.errors|striptags }}
@@ -51,7 +52,7 @@
                                 <input type="hidden" name="next" value="{{ next }}" />
                                 {% if form.non_field_errors %}
                                     {% for error in form.non_field_errors %}
-                                        <div class="text-error" style="margin: 10px 0">{{ error }}</div>
+                                        <div class="well well-small text-error">{{ error }}</div>
                                     {% endfor %}
                                 {% endif %}
                                 <div class="form-actions-no-box">

From 2531b5cd864bd5138fe9456d069400363337f206 Mon Sep 17 00:00:00 2001
From: Cezar Pendarovski <cezar.pendarovski@dsmz.de>
Date: Fri, 5 Sep 2014 13:28:47 +0200
Subject: [PATCH 7/7] Remove light gray bordering from the well with general
 message error

---
 rest_framework/templates/rest_framework/login_base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 582a7f273d..8ab682ac8b 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -52,7 +52,7 @@
                                 <input type="hidden" name="next" value="{{ next }}" />
                                 {% if form.non_field_errors %}
                                     {% for error in form.non_field_errors %}
-                                        <div class="well well-small text-error">{{ error }}</div>
+                                        <div class="well well-small text-error" style="border: none">{{ error }}</div>
                                     {% endfor %}
                                 {% endif %}
                                 <div class="form-actions-no-box">