Merge lp:~canonical-isd-hackers/canonical-identity-provider/bug_495006 into lp:canonical-identity-provider/release

[David Owen]

[Danny Tamez (zematynnad)]

Great job David

review: Approve

=== added file 'doctests/stories/sso-server/prefilled-email.txt'
--- doctests/stories/sso-server/prefilled-email.txt	1970-01-01 00:00:00 +0000
+++ doctests/stories/sso-server/prefilled-email.txt	2010-05-21 21:14:29 +0000
@@ -0,0 +1,29 @@
+Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file LICENSE).
+
+= Pre-fill e-mail addresses on forms =
+
+If the user has attempted a login (and failed), we would like to use
+the e-mail provided to pre-fill other forms.
+
+== "Forgot Password" form ==
+
+    >>> browser = setupBrowser()
+    >>> browser.open('http://openid.launchpad.dev')
+    >>> browser.getControl(name='email').value = '[e-mail]'
+    >>> browser.getControl(name='continue').click()
+    >>> browser.getLink('Forgot your password?').click()
+    >>> print browser.getControl(name='email').value
+    [e-mail]
+
+
+== "New Account" form ==
+
+    >>> browser = setupBrowser()
+    >>> browser.open('http://openid.launchpad.dev')
+    >>> browser.getControl(name='email').value = '[e-mail]'
+    >>> browser.getControl(name='continue').click()
+    >>> browser.getLink('New account').click()
+    >>> print browser.getControl(name='email').value
+    [e-mail]
+
 
=== modified file 'identityprovider/templates/launchpad/registration/login.html'
--- identityprovider/templates/launchpad/registration/login.html	2010-05-13 16:01:26 +0000
+++ identityprovider/templates/launchpad/registration/login.html	2010-05-21 21:14:29 +0000
@@ -39,12 +39,12 @@
         {% if form.non_field_errors %}<span class="error">{{ form.non_field_errors|join:"" }}</span>{% endif %}
             <br />
 {% if not readonly %}
-            <a href="+forgot_password" id="forgotpw-link">{% trans "Forgot your password?" %}</a>
+            <a href="+forgot_password{% if form.email.data %}?email={{ form.email.data|urlencode }}{% endif %}" id="forgotpw-link">{% trans "Forgot your password?" %}</a>
 {% endif %}
         </p>
 {% if not readonly %}
 		<p>
-	        <a href="+new_account" class="btn alt"><span><span>{% trans "Create a new account" %}</span></span></a>
+	        <a href="+new_account{% if form.email.data %}?email={{ form.email.data|urlencode }}{% endif %}" class="btn alt"><span><span>{% trans "Create a new account" %}</span></span></a>
 	    </p>
 {% endif %}
         <div class="actions">
 
=== modified file 'identityprovider/templates/ubuntu/registration/login.html'
--- identityprovider/templates/ubuntu/registration/login.html	2010-05-13 16:01:26 +0000
+++ identityprovider/templates/ubuntu/registration/login.html	2010-05-21 21:14:29 +0000
@@ -44,7 +44,7 @@
         {% if form.non_field_errors %}<span class="error">{{ form.non_field_errors|join:"" }}</span>{% endif %}
             <br />
 {% if not readonly %}
-            <a href="+forgot_password" id="forgotpw-link">{% trans "Forgot your password?" %}</a>
+            <a href="+forgot_password{% if form.email.data %}?email={{ form.email.data|urlencode }}{% endif %}" id="forgotpw-link">{% trans "Forgot your password?" %}</a>
 {% endif %}
         </p>
 
@@ -73,7 +73,7 @@
     </p>
 {% if not readonly %}
     <p>
-        <a href="+new_account" class="btn alt"><span><span>{% trans "New account" %}</span></span></a>
+        <a href="+new_account{% if form.email.data %}?email={{ form.email.data|urlencode }}{% endif %}" class="btn alt"><span><span>{% trans "New account" %}</span></span></a>
     </p>
 {% endif %}
 {% endblock %}
 
=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2010-05-13 16:01:26 +0000
+++ identityprovider/views/ui.py	2010-05-21 21:14:29 +0000
@@ -123,8 +123,12 @@
 @guest_required
 @check_readonly
 def new_account(request, token=None):
-    form = NewAccountForm()
-    if request.method == 'POST':
+    if request.method == 'GET':
+        if 'email' in request.GET:
+            form = NewAccountForm(initial={'email': request.GET['email']})
+        else:
+            form = NewAccountForm()
+    elif request.method == 'POST':
         form = NewAccountForm(request.POST)
         if form.is_valid():
 
@@ -330,8 +334,12 @@
 @guest_required
 @check_readonly
 def forgot_password(request, token=None):
-    form = ForgotPasswordForm()
-    if request.method == 'POST':
+    if request.method == 'GET':
+        if 'email' in request.GET:
+            form = ForgotPasswordForm(initial={'email': request.GET['email']})
+        else:
+            form = ForgotPasswordForm()
+    elif request.method == 'POST':
         form = ForgotPasswordForm(request.POST)
         if form.is_valid():
             response = _verify_captcha_response(