Merge branch 'redesign'

Conflicts:
	templates/public/download.html

2 files changed, 18 insertions, 20 deletions

diff --git a/templates/registration/login.html b/templates/registration/login.html
index b3b264c3..2f626566 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,23 +1,22 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Developer Login{% endblock %}
 
 {% block content %}
+<div id="dev-login" class="box">
 
-<div class="greybox">
-<h2 class="title">Developer Login</h2>
-{% if form.has_errors %}
-<p class="error">Your username and password didn't match. Please try again.</p>
-{% endif %}
-<br /><br />
+    <h2>Developer Login</h2>
 
-<form method="post" action=".">
-<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
-<table>
-	<tr><td><label for="id_username">Username:</label></td><td>{{ form.username }}</td></tr>
-	<tr><td><label for="id_password">Password:</label></td><td>{{ form.password }}</td></tr>
-	<tr><td colspan="2" align="right"><input type="submit" value="Login" /></td></tr>
-</table>
-</form>
-</div>
+    {% if form.has_errors %}
+    <p class="login-error">Your username and password didn't match. Please try again.</p>
+    {% endif %}
 
-{% endblock %}
+    <form id="dev-login-form" method="post" action=".">
+        <fieldset>
+            <legend>Enter login credentials</legend>
+            {{ form.as_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 2b829869..f8e07621 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -1,10 +1,9 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Logout successful{% endblock %}
 
 {% block content %}
-
-<div class="greybox">
-You've been logged out.
+<div id="dev-logout" class="box">
+	<p>Logout successful.<p>
 </div>
-
 {% endblock %}