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

Proposed by Danny Tamez
Status: Merged
Approved by: David Owen
Approved revision: no longer in the source branch.
Merged at revision: 176
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/submit_form_603195
Merge into: lp:canonical-identity-provider/release
Diff against target: 12 lines (+1/-1)
1 file modified
identityprovider/templates/registration/email_sent.html (+1/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/submit_form_603195
Reviewer Review Type Date Requested Status
David Owen (community) Approve
Review via email: mp+67260@code.launchpad.net

Commit message

Added link to Login Support on email sent page

Description of the change

The bug called for making the email_sent page more friendly by changing the submit form again button to a link and pre-populating whatever we could on the page for the section below. The submit form portion is no longer part of the page. The only thing I could find to enhance in the spirit of this bug was to add a link for Login Support to the "If neither of these work, our service may be having a problem." text.

To post a comment you must log in.
Revision history for this message
David Owen (dsowen) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/templates/registration/email_sent.html'
2--- identityprovider/templates/registration/email_sent.html 2011-05-12 08:08:35 +0000
3+++ identityprovider/templates/registration/email_sent.html 2011-07-07 21:31:24 +0000
4@@ -50,7 +50,7 @@
5 {% if email_notreceived_extra %}
6 <p>{{ email_notreceived_extra|safe }}</p>
7 {% endif %}
8- <p>{% blocktrans %}If neither of those work, our service might be having a problem.{% endblocktrans %}
9+ <p>{% blocktrans %}If neither of those work, <a href='https://forms.canonical.com/sso-support/' title='Contact Login Support' >our service might be having a problem.</a>{% endblocktrans %}
10 </p>
11 </div>
12 <div style="clear: both"></div>