Merge lp:~canonical-isd-hackers/canonical-identity-provider/email_screen into lp:~canonical-isd-hackers/canonical-identity-provider/stable

[David Owen]

Changes navigation to and from the email addresses screen, according to Stuart's suggestion in the bug report.

[Ricardo Kirkner (ricardokirkner)]

review: Approve

=== modified file 'doctests/stories/sso-server/standalone-login.txt'
--- doctests/stories/sso-server/standalone-login.txt	2010-07-12 22:49:50 +0000
+++ doctests/stories/sso-server/standalone-login.txt	2010-07-16 18:57:40 +0000
@@ -212,7 +212,7 @@
 
     >>> def add_email(browser, email):
     ...     browser.open('http://openid.launchpad.dev/+edit')
-    ...     browser.getLink('Email addresses').click()
+    ...     browser.getLink('Manage email addresses').click()
     ...     browser.getControl(name='newemail').value = email
     ...     browser.getControl(name='continue').click()
 
 
=== modified file 'identityprovider/templates/account/emails.html'
--- identityprovider/templates/account/emails.html	2010-07-13 15:48:43 +0000
+++ identityprovider/templates/account/emails.html	2010-07-16 18:57:40 +0000
@@ -1,9 +1,11 @@
-<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
-GNU Affero General Public License version 3 (see the file  LICENSE). -->
-
 {% extends "base.html" %}
 {% load i18n %}
 
+{% comment %}
+Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE).
+{% endcomment %}
+
 {% block title %}
   {% blocktrans %}{{ account_displayname }}'s email addresses{% endblocktrans %}
 {% endblock %}
@@ -95,6 +97,7 @@
       <button type="submit" class="btn" name="continue">
         <span><span>{% trans "Add address" %}</span></span>
       </button>
+      {% blocktrans %}or <a href="/">cancel</a>{% endblocktrans %}
     </p>
   </form>
 
 
=== modified file 'identityprovider/templates/widgets/ubuntu/logout-button.html'
--- identityprovider/templates/widgets/ubuntu/logout-button.html	2010-07-13 16:15:10 +0000
+++ identityprovider/templates/widgets/ubuntu/logout-button.html	2010-07-16 18:57:40 +0000
@@ -9,7 +9,6 @@
 <ul>
 
 {% menu_item "account" user.displayname "/" %}
-{% menu_item "emails" _("Email addresses") "/+emails" %}
 
 {% if token and not readonly %}
   {% menu_item "edit" _("Edit") "./+edit" %}