Merge tag 'release_2015-04-13' into archweb-generic

Fix up 'None' display in places

2 files changed, 5 insertions, 10 deletions

diff --git a/templates/registration/login.html b/templates/registration/login.html
index c722527d..ff360de3 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -5,21 +5,15 @@
 
 {% block content %}
 <div id="dev-login" class="box">
-
     <h2>Developer Login</h2>
 
-    {% if form.has_errors %}
-    <p class="login-error">Your username and password didn't match. Please try again.</p>
-    {% endif %}
-
     <form id="dev-login-form" method="post">{% csrf_token %}
         <fieldset>
-            <legend>Enter login credentials</legend>
+            <legend>Please enter your credentials to login.</legend>
             {{ form.as_p }}
-            <p><label></label> <input type="submit" value="Login" /></p>
+            <p><label></label><input type="submit" value="Login"/></p>
         </fieldset>
     </form>
-
 </div>
 {% endblock %}
 
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
index 71daa2e8..5c296c5d 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -1,11 +1,12 @@
 {% extends "base.html" %}
+
 {% block title %}{{ BRANDING_DISTRONAME }} - Logout successful{% endblock %}
 
 {% block content %}
 <div id="dev-logout" class="box">
     <h2>Developer Logout</h2>
 
-    <p>Logout was successful.<p>
+    <p>Logout was successful.
+    <a href='{% url 'login' %}'>Click here to login again.</a></p>
 </div>
 {% endblock %}
-