3 files changed, 36 insertions, 29 deletions

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index d645dbe..85b044e 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -26,8 +26,8 @@
 							 <li><a class="mm_logout" href="{% url user_logout %}">Logout</a></li>
 							 <li><a href="{% url user_profile %}">{{ user.username }}</a></li>
 						{% else %}
-							 <li><a class="mm_user" href="{% url user_login %}?next={{next|default:request.path}}">Login</a></li>
-							 <li><a href="{% url user_registration %}?next={{next|default:request.path}}"> Sign Up </a></li>
+							 <li><a class="mm_user" href="{% url user_login %}?next={{next|default:request.path|urlencode}}">Login</a></li>
+							 <li><a href="{% url user_registration %}?next={{next|default:request.path|urlencode}}"> Sign Up </a></li>
 						{% endif %}
 						</ul>
 
diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html
index 9bce6ee..17d8d4b 100644
--- a/hyperkitty/templates/login.html
+++ b/hyperkitty/templates/login.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load crispy_forms_tags %}
 
 
 {% block title %}
@@ -8,37 +9,37 @@
 
 {% block content %}
 
-<div id="loginform">
+<div id="login">
 
-<h2>Login with username and password</h2>
-
-
-<form action="{{ request.path }}?next={{ next }}" method="post" class="login mm_clear">
-	{% csrf_token %}
-	{{ form.as_p }}
-	<div class="field">
-		<button class="btn btn-primary" type="submit">
-			{% trans "Login" %}
-		</button>
-	</div>
-</form>
-
-
-<ul class="socialLogin">
-	<li><a title="Google" class="socialaccount_provider google" href="{% url socialauth_begin backend='google' %}"><img src="{{ STATIC_URL }}img/login/google.png" alt="Google"></a></li>
-
-	<li><a title="Yahoo" class="socialaccount_provider yahoo" href="{% url socialauth_begin backend='yahoo' %}"><img src="{{ STATIC_URL }}img/login/yahoo.png" alt="Yahoo"></a></li>
 
+<h2>Login with your email</h2>
+<ul class="social-login inline">
 	<li>
 		<form method="post" action="{% url socialauth_complete "browserid" %}?next={{ next }}">
 			{% csrf_token %}
 			<input type="hidden" name="assertion" value="" />
-			<a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}img/login/browserid.png" alt="Login using BrowserID" /></a>
+			<a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}img/login/persona-large.png" alt="Login using Persona" /></a>
 		</form>
 	</li>
+	<li><a title="Google" class="socialaccount_provider google" href="{% url socialauth_begin backend='google' %}"><img src="{{ STATIC_URL }}img/login/google.png" alt="Google"></a></li>
 
+	<li><a title="Yahoo" class="socialaccount_provider yahoo" href="{% url socialauth_begin backend='yahoo' %}"><img src="{{ STATIC_URL }}img/login/yahoo.png" alt="Yahoo"></a></li>
 </ul>
 
+
+<h2>Login with username and password</h2>
+
+<form action="{{ request.path }}?next={{ next|urlencode }}" method="post" class="form-horizontal">
+	{% csrf_token %}
+	{{ form|crispy }}
+	<div class="control-group">
+		<div class="controls">
+			<button type="submit" class="btn btn-primary">{% trans "Login" %}</button>
+		</div>
+	</div>
+</form>
+
+
 </div>
 
 {% endblock %}
diff --git a/hyperkitty/templates/register.html b/hyperkitty/templates/register.html
index 7d665ab..71d4d6a 100644
--- a/hyperkitty/templates/register.html
+++ b/hyperkitty/templates/register.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load crispy_forms_tags %}
 
 
 {% block title %}
@@ -8,17 +9,22 @@
 
 {% block content %}
 
-<form action="" method="post" class="login mm_clear">
+<div id="register">
+
+<h2>Register</h2>
+
+<form action="{{ request.path }}?next={{ next|urlencode }}" method="post" class="form-horizontal">
 	{% csrf_token %}
-	{{ form.as_p }}
-	<input type="hidden" name="next" value="{{ next }}">
-	<div class="field">
-		<button class="btn btn-primary" type="submit">
-			{% trans "Register" %}
-		</button>
+	{{ form|crispy }}
+	<div class="control-group">
+		<div class="controls">
+			<button type="submit" class="btn btn-primary">{% trans "Register" %}</button>
+		</div>
 	</div>
 </form>
 
+</div>
+
 {% endblock %}
 
 {# vim: set noet: #}