From 5cb4e8512157e1153821a5c6085361234ca7ef41 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Wed, 12 Dec 2012 11:21:36 +0100
Subject: Prepare a fix for #25

---
 hyperkitty/templates/base.html  | 4 ++--
 hyperkitty/templates/login.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'hyperkitty')

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index cd00a0f..ed06341 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -24,8 +24,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 %}">Login</a></li>
-							 <li><a href="{% url user_registration %}"> Sign Up </a></li>
+							 <li><a class="mm_user" href="{% url user_login %}?next={{request.path}}">Login</a></li>
+							 <li><a href="{% url user_registration %}?next={{request.path}}"> Sign Up </a></li>
 						{% endif %}
 						</ul>
 
diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html
index 5db40bb..f502aed 100644
--- a/hyperkitty/templates/login.html
+++ b/hyperkitty/templates/login.html
@@ -8,7 +8,7 @@
 <form action="" method="post" class="login mm_clear">
 	{% csrf_token %}
 	{{ form.as_p }}
-	<input type=hidden name=next value={{ next }}>
+	<input type="hidden" name="next" value="{{ next }}" />
 	<div class="field">
 		<button class="btn btn-primary" type="submit">
 			{% trans "Login" %}
@@ -23,7 +23,7 @@
 	<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>
 
 	<li>
-		<form method="post" action="{% url socialauth_complete "browserid" %}?{{next}}">
+		<form method="post" action="{% url socialauth_complete "browserid" %}?{{redirect_querystring}}">
 			{% 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>
@@ -52,7 +52,7 @@
 				}
 			});
 		});
-	}); 
+	});
 </script>
 <!-- end browserid stuff -->
 {% endblock additionaljs %}
-- 
cgit