Merge lp:~matiasb/canonical-identity-provider/refactored-branding into lp:canonical-identity-provider/release

[Matias Bordese]

Removed global branding object and updated settings/views/templates accordingly.

- Split branded custom templates (registration, 404, 500, server_info); that should isolate launchpad templates during consolidation?
- Removed intermediate global branding object and new settings defined (brand name, template dir).
- Removed branding context processor and updated templates where needed.

[Ricardo Kirkner (ricardokirkner)]

MP looks good. All unit and acceptance tests passed. Manual verification looks good too. Approving.

Thanks!

review: Approve

=== modified file 'django_project/config_dev/config/main.cfg'
--- django_project/config_dev/config/main.cfg	2012-10-29 12:55:00 +0000
+++ django_project/config_dev/config/main.cfg	2012-12-03 20:22:21 +0000
@@ -1,5 +1,7 @@
 [__noschema__]
 basedir = /srv/%(hostname)s/%(environment)s/canonical-identity-provider
+branded_template_dir = ubuntu
+# branded_template_dir = launchpad
 db_engine = identityprovider.backend
 db_host = localhost
 db_name = identityprovider
@@ -91,7 +93,6 @@
     django.core.context_processors.static
     identityprovider.context_processors.readonly
     identityprovider.context_processors.i18n
-    identityprovider.context_processors.branding
     django.core.context_processors.request
     identityprovider.context_processors.detect_embedded
     identityprovider.context_processors.google_analytics_id
@@ -106,7 +107,6 @@
 #
 
 [__main__]
-branded_template_dir = ubuntu
 db_statement_timeout_millis = 10000
 extra_pythonpath = %(basedir)s
 includes =
@@ -121,7 +121,14 @@
 oauth_data_store = identityprovider.store.SSODataStore
 
 [branding]
-brand = Ubuntu
+brand = ubuntu
+brand_description = Ubuntu Single Sign On
+brand_template_dir = %(branded_template_dir)s
+
+# launchpad
+# brand = launchpad
+# brand_description = Launchpad Login Service
+# brand_template_dir = %(branded_template_dir)s
 
 [captcha]
 captcha_api_url = http://api.recaptcha.net

=== removed file 'identityprovider/branding.py'
--- identityprovider/branding.py	2012-10-19 15:40:37 +0000
+++ identityprovider/branding.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
-
-
-class Launchpad(object):
-    template_dir = 'launchpad'
-    name = _('Launchpad Login Service')
-    provides_access = _('A Launchpad Login Service account is free and gives '
-                        'you access to Ubuntu One, the Ubuntu Shop '
-                        'and many more useful services.')
-    create_account = _('Create a Launchpad Login Service account')
-    server_info = _('This is the Launchpad login service, built on OpenID. '
-                    'The service enables you to use your Launchpad account '
-                    'to log into OpenID-enabled sites around the Internet.')
-    complete_reg = _('Complete your Launchpad Login Service registration')
-    reset_password = _('Reset your Launchpad Login Service password')
-    not_found_error = _('There\'s no page with this address in the Launchpad '
-                        'Login Service. Check that you entered the address '
-                        'correctly and try again.')
-    oops_error = _('Sorry, something just went wrong in Launchpad Login '
-                   'Service.')
-    logout = _('You are now logged out of the Launchpad Login Service '
-               'website. However, you have not been automatically logged '
-               'out of every website that uses this website.')
-
-
-class Ubuntu(object):
-    template_dir = 'ubuntu'
-    name = _('Ubuntu Single Sign On')
-    provides_access = _('An Ubuntu Single Sign On account is free and gives '
-                        'you access to Ubuntu One, the Ubuntu Shop '
-                        'and many more useful services.')
-    create_account = _('Create an Ubuntu Single Sign On account')
-    server_info = _('This is the Ubuntu SSO service, built on OpenID. The '
-                    'service enables you to use your Ubuntu SSO account to '
-                    'log into various sites run by Canonical and Ubuntu.')
-    complete_reg = _('Complete your Ubuntu Single Sign On registration')
-    reset_password = _('Reset your Ubuntu Single Sign On password')
-    not_found_error = _('There\'s no page with this address in the Ubuntu '
-                        'Single Sign On service. Check that you entered the '
-                        'address correctly and try again.')
-    oops_error = _('Sorry, something just went wrong in Ubuntu Single Sign '
-                   'On.')
-    logout = _('You are now logged out of the Ubuntu Single Sign On (SSO) '
-               'website. However, you have not been automatically logged '
-               'out of every website that uses this SSO website.')
-
-current_brand = globals()[settings.BRAND]()

=== modified file 'identityprovider/context_processors.py'
--- identityprovider/context_processors.py	2012-10-12 21:23:31 +0000
+++ identityprovider/context_processors.py	2012-12-03 20:22:21 +0000
@@ -15,20 +15,11 @@
 
 import identityprovider.signed as signed
 
-from identityprovider.branding import current_brand
-
 
 def readonly(request):
     return {'readonly': settings.READ_ONLY_MODE}
 
 
-def branding(request):
-    return {
-        'template_dir': current_brand.template_dir,
-        'brand': current_brand,
-    }
-
-
 supported = [(x, settings.LANGUAGE_NAMES[x])
              for x in settings.SUPPORTED_LANGUAGES]
 

=== modified file 'identityprovider/models/authtoken.py'
--- identityprovider/models/authtoken.py	2012-10-24 18:19:07 +0000
+++ identityprovider/models/authtoken.py	2012-12-03 20:22:21 +0000
@@ -14,7 +14,6 @@
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 
-from identityprovider.branding import current_brand
 from identityprovider.models.const import LoginTokenType
 from identityprovider.models import Account, DisplaynameField, PasswordField
 from identityprovider.utils import format_address
@@ -104,33 +103,34 @@
             'support_form_url': settings.SUPPORT_FORM_URL,
         }
         message = render_to_string('%s/email/validate-email.txt' %
-                                   current_brand.template_dir, replacements)
-        subject = u'%s: %s' % (current_brand.name,
+                                   settings.BRAND_TEMPLATE_DIR, replacements)
+        subject = u'%s: %s' % (_(settings.BRAND_DESCRIPTION),
                                _(": Validate your email address"))
-        self._send_email(u"%s Email Validator" % current_brand.name, subject,
-                         message)
+        self._send_email(u"%s Email Validator" % settings.BRAND_DESCRIPTION,
+                         subject, message)
 
     def sendEmailValidationToken(self, template='email-validation-token.txt'):
         replacements = {
             'token': self.token,
             'toaddress': self.email,
         }
-        template_path = '%s/email/%s' % (current_brand.template_dir, template)
+        template_path = '%s/email/%s' % (settings.BRAND_TEMPLATE_DIR, template)
         message = render_to_string(template_path, replacements)
-        subject = u"%s: %s" % (current_brand.name,
+        subject = u"%s: %s" % (_(settings.BRAND_DESCRIPTION),
                                _("Validate your email address"))
-        self._send_email(u"%s Email Validator" % current_brand.name, subject,
-                         message)
+        self._send_email(u"%s Email Validator" % _(settings.BRAND_DESCRIPTION),
+                         subject, message)
 
     def sendPasswordResetEmail(self):
         replacements = {
             'token': self.token,
             'token_url': self.get_absolute_url(),
         }
-        from_name = unicode(current_brand.name)
+        from_name = unicode(_(settings.BRAND_DESCRIPTION))
         message = render_to_string('%s/email/forgottenpassword.txt' %
-                                   current_brand.template_dir, replacements)
-        subject = u"%s: %s" % (current_brand.name, _("Forgotten Password"))
+                                   settings.BRAND_TEMPLATE_DIR, replacements)
+        subject = u"%s: %s" % (_(settings.BRAND_DESCRIPTION),
+                               _("Forgotten Password"))
         self._send_email(from_name, subject, message)
 
     # {{workflow}} remove the `old` parameter
@@ -142,10 +142,10 @@
             'token_url': url,
             'toaddress': self.email,
         }
-        from_name = unicode(current_brand.name)
-        template_path = '%s/email/%s' % (current_brand.template_dir, template)
+        from_name = unicode(_(settings.BRAND_DESCRIPTION))
+        template_path = '%s/email/%s' % (settings.BRAND_TEMPLATE_DIR, template)
         message = render_to_string(template_path, replacements)
-        subject = u"%s: %s" % (current_brand.name,
+        subject = u"%s: %s" % (_(settings.BRAND_DESCRIPTION),
                                _("Finish your registration"))
         self._send_email(from_name, subject, message)
 

=== modified file 'identityprovider/models/emailaddress.py'
--- identityprovider/models/emailaddress.py	2012-10-12 21:23:31 +0000
+++ identityprovider/models/emailaddress.py	2012-12-03 20:22:21 +0000
@@ -12,7 +12,6 @@
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 
-from identityprovider.branding import current_brand
 from identityprovider.models import Account, Person
 from identityprovider.models.const import EmailStatus
 from identityprovider.utils import format_address
@@ -57,13 +56,13 @@
     def send_message(self, subject, message):
         """Send an email to this token's email address."""
         from_address = format_address(settings.NOREPLY_FROM_ADDRESS,
-                                      unicode(current_brand.name))
+                                      unicode(_(settings.BRAND_DESCRIPTION)))
         to_address = format_address(self.email)
         send_mail(subject, message, from_address, [to_address])
 
     def send_preferred_changed_notification(self, new_preferred):
         replacements = {'new_preferred': new_preferred}
         template_path = ('%s/email/preferred-changed.txt'
-                         % current_brand.template_dir)
+                         % settings.BRAND_TEMPLATE_DIR)
         message = render_to_string(template_path, replacements)
         self.send_message(_('E-mail change notification'), message)

=== modified file 'identityprovider/schema.py'
--- identityprovider/schema.py	2012-10-30 11:57:54 +0000
+++ identityprovider/schema.py	2012-12-03 20:22:21 +0000
@@ -54,7 +54,6 @@
 
 class SSOSchema(DjangoSchema):
     # default
-    branded_template_dir = StringOption()
     db_connections = ListOption(item=UpperCaseDictOption(
         spec={'database_id': StringOption(),
               'database_host': StringOption(),
@@ -92,6 +91,8 @@
     # branding
     class branding(Section):
         brand = StringOption()
+        brand_description = StringOption()
+        brand_template_dir = StringOption()
 
     # captcha
     class captcha(Section):

=== removed file 'identityprovider/templates/404.html'
--- identityprovider/templates/404.html	2010-07-12 19:11:15 +0000
+++ identityprovider/templates/404.html	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-{% 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 %}
-    {% trans "Not found" %}
-{% endblock %}
-
-{% block text_title %}
-    <h1 class="main">Lost something?</h1>
-{% endblock %}
-
-{% block content %}
-        <div>
-          <p>{{ brand.not_found_error }}</p>
-          <p>
-            {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}
-          </p>
-        </div>
-{% endblock %}

=== removed file 'identityprovider/templates/500.html'
--- identityprovider/templates/500.html	2012-08-17 15:30:19 +0000
+++ identityprovider/templates/500.html	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-{% 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 %}
-    {% trans "Oops!" %}
-{% endblock %}
-
-{% block text_title %}
-    <h1 class="main">Oops!</h1>
-{% endblock %}
-
-{% block content %}
-        <div>
-          <h3>
-            {{ brand.oops_error }}
-          </h3>
-          {% if errormsg %}<p>{{errormsg}}</p>{% endif %}
-          <p>
-            {% blocktrans %}We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience.{% endblocktrans %}
-          </p>
-          <p>
-            OOPS <abbr>ID</abbr>: {{ oopsid }}
-          </p>
-          {% if request.sentry.id %}
-          <p>
-            Sentry <abbr>ID</abbr>: {{ request.sentry.id }}
-          </p>
-          {% endif %}
-          <pre style="overflow:auto">
-{{traceback}}
-          </pre>
-        </div>
-{% endblock %}

=== added file 'identityprovider/templates/launchpad/404.html'
--- identityprovider/templates/launchpad/404.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/404.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,24 @@
+{% 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 %}
+    {% trans "Not found" %}
+{% endblock %}
+
+{% block text_title %}
+    <h1 class="main">Lost something?</h1>
+{% endblock %}
+
+{% block content %}
+        <div>
+          <p>{% blocktrans %}There's no page with this address in the Launchpad Login Service service. Check that you entered the address correctly and try again.{% endblocktrans %}</p>
+          <p>
+            {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}
+          </p>
+        </div>
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/500.html'
--- identityprovider/templates/launchpad/500.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/500.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,38 @@
+{% 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 %}
+    {% trans "Oops!" %}
+{% endblock %}
+
+{% block text_title %}
+    <h1 class="main">Oops!</h1>
+{% endblock %}
+
+{% block content %}
+        <div>
+          <h3>
+            {% blocktrans %}Sorry, something just went wrong in Launchpad Login Service.{% endblocktrans %}
+          </h3>
+          {% if errormsg %}<p>{{ errormsg }}</p>{% endif %}
+          <p>
+            {% blocktrans %}We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience.{% endblocktrans %}
+          </p>
+          <p>
+            OOPS <abbr>ID</abbr>: {{ oopsid }}
+          </p>
+          {% if request.sentry.id %}
+          <p>
+            Sentry <abbr>ID</abbr>: {{ request.sentry.id }}
+          </p>
+          {% endif %}
+          <pre style="overflow:auto">
+{{traceback}}
+          </pre>
+        </div>
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/registration/bad_token.html'
--- identityprovider/templates/launchpad/registration/bad_token.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/bad_token.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,18 @@
+{% 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 %}{% trans "Unauthorized confirmation code" %}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% trans "Unauthorized confirmation code" %}</h1>
+{% endblock %}
+
+{% block content %}
+<p>{% blocktrans %}You are not authorized to use this confirmation code. If this URL was sent to you by email, please make sure you open it in the same browser where you requested it.{% endblocktrans %}</p>
+{% endblock %}
+

=== added file 'identityprovider/templates/launchpad/registration/confirm_new_account.html'
--- identityprovider/templates/launchpad/registration/confirm_new_account.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/confirm_new_account.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,35 @@
+{% 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 %}{% trans "Complete your registration" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Complete your Launchpad Login Service registration{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+<p>{% blocktrans %}The account for {{ email }} is ready to be created.{% endblocktrans %}</p>
+
+<form id="login-form" class="longfields" method="post" name="loginform">
+  {% csrf_token %}
+  <p class="actions">
+    <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
+    {% trans "or" %}
+    <a href="/">{% trans "cancel" %}</a>
+  </p>
+  <div style="clear: both">&nbsp;</div>
+</form>
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/registration/email_sent.html'
--- identityprovider/templates/launchpad/registration/email_sent.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/email_sent.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,75 @@
+{% 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 %}{{ email_heading }}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{{ email_heading }}</h1>
+{% endblock %}
+
+{% block content %}
+{% if user.is_authenticated %}<div class="email-sent-auth">{% endif %}
+
+<div id="col1">
+    <div>
+        <p class="larger">{{ email_reason|safe }}</p>
+{% if not readonly %}
+        <p class="larger last">
+            {% trans "We've sent you a 6 digit confirmation code.  To continue, enter that code below." %}
+        </p>
+{% endif %}
+    </div>
+
+{% if not readonly %}
+    <form action="{% if token %}/{{ token }}{% endif %}/+enter_token" method="post" id="email_confirm">
+      {% csrf_token %}
+      <p>
+        <label>{% trans "Confirmation code" %}</label><br />
+        <input id="confirmation_code" name="confirmation_code" type="text" class="textType" />
+        <input type="hidden" name="email" value="{{ email }}" />
+      </p>
+      <p><button id="submit" type="submit" class="btn" disabled="true">
+          <span><span>{% trans "Continue" %}</span></span>
+        </button>
+        {% if user.is_authenticated %}{% blocktrans %} or, <a href="/+emails">return to email addresses</a>{% endblocktrans %}{% endif %}
+      </p>
+    </form>
+{% endif %}
+</div>
+
+<div id="col2">
+    <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
+    <p>{% blocktrans %}If you don&rsquo;t receive the message within a few minutes, it might be because:{% endblocktrans %}</p>
+    <ul>
+        <li>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to reduce spam. If so, you&rsquo;ll need to wait an hour or two for the message to arrive.{% endblocktrans %}</li>
+        <li>{% blocktrans %}Your mail provider mistakenly blocks messages from this site. Try signing up using a service like <a href="http://gmail.com/">Gmail</a> or <a href="http://mail.yahoo.com/">Yahoo Mail</a>.{% endblocktrans %} </li>
+    {% if email_notreceived_extra %}
+    <li>{{ email_notreceived_extra|safe }}</li>
+    {% endif %}
+    </ul>
+    <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 %}
+    </p>
+</div>
+<div style="clear: both"></div>
+{% if user.is_authenticated %}</div>{% endif %}
+<script type="text/javascript">
+    YUI().use('node', function (Y) {
+        Y.on('domready', function() {
+            Y.one('#confirmation_code').on('keyup', function() {
+                var code = Y.one('#confirmation_code').get('value');
+                if (code.length === 0) {
+                    Y.one('#submit').setAttribute('disabled', 'true');
+                } else {
+                    Y.one('#submit').removeAttribute('disabled');
+                }
+            });
+        });
+    });
+</script>
+
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/registration/forgot_password.html'
--- identityprovider/templates/launchpad/registration/forgot_password.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/forgot_password.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,41 @@
+{% 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 %}{% trans "Reset password" %}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Reset your Launchpad Login Service password{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to reset your password.{% endblocktrans %}</p>
+
+    <form action="+forgot_password" method="post">
+		{% csrf_token %}
+        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
+            <label for="id_email">{% trans "Email address" %}</label>
+            <br />
+            {{ form.email }}
+            {% if form.email.errors %}
+                <span class="error">{{ form.email.errors|first }}</span>
+            {% endif %}
+        </p>
+        <p>
+            <span id="captcha">
+                 {% include "widgets/recaptcha.html" %}
+            </span>
+        </p>
+        <p class="actions">
+            <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
+            {% trans "or" %}
+            <a href=".">{% trans "cancel" %}</a>
+        </p>
+    </form>
+{% endblock %}

=== modified file 'identityprovider/templates/launchpad/registration/logout.html'
--- identityprovider/templates/launchpad/registration/logout.html	2010-11-16 11:00:25 +0000
+++ identityprovider/templates/launchpad/registration/logout.html	2012-12-03 20:22:21 +0000
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-  <p>{{ brand.logout }}</p>
+  <p>{% blocktrans %}You are now logged out of the Launchpad Login Service website. However, you have not been automatically logged out of every website that uses this website.{% endblocktrans %}</p>
 
   <p class="returnto">
     {% if return_to_url %}

=== added file 'identityprovider/templates/launchpad/registration/logout_to_confirm.html'
--- identityprovider/templates/launchpad/registration/logout_to_confirm.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/logout_to_confirm.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,18 @@
+{% 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 %}{% trans "Can not use confirmation code while logged in" %}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% trans "Can not use confirmation code while logged in" %}</h1>
+{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}You have attempted to confirm an account while logged in as someone else.  We've cancelled your request. Please log out and create your new account again.{% endblocktrans %}</p>
+{% endblock %}
+

=== added file 'identityprovider/templates/launchpad/registration/new_account.html'
--- identityprovider/templates/launchpad/registration/new_account.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/new_account.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,74 @@
+{% 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 %}{% trans "Create account" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block extra_header %}
+{% include "widgets/passwords_head_content.html" %}
+{% endblock %}
+
+{% block text_title %}
+    {% if rpconfig and rpconfig.logo_url %}
+        <div id='rpconfig_logo'>
+            <img src='{{ rpconfig.logo_url }}'/>
+        </div>
+    {% endif %}
+  <h1 class="main">{% blocktrans %}Create an Launchpad Login Service account{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}Enter the following information, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p>
+
+    <form action="+new_account" method="post" name="newaccountform">
+        {% csrf_token %}
+        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
+            <label for="id_displayname">{% trans "Full name" %}</label>
+            <br />
+            {{ form.displayname }}
+            {% if form.displayname.errors %}
+                <span class="error">
+                    {{ form.displayname.errors|first }}
+                </span>
+            {% endif %}
+        </p>
+        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
+            <label for="id_email">{% trans "Email address" %}</label>
+            <br />
+            {{ form.email }}
+            {% if form.email.errors %}
+                <span class="error">{{ form.email.errors|first }}</span>
+            {% endif %}
+        </p>
+        {% include "widgets/passwords.html" %}
+        <p>
+            <span id="captcha">
+                {% include "widgets/recaptcha.html" %}
+            </span>
+        </p>
+        <p class="actions">
+            {# {{workflow}} #}
+            {% if old %}
+                <input type="hidden" name="old" value="old">
+            {% endif %}
+            <button type="submit" class="btn" name="continue"><span><span>{% trans "Continue" %}</span></span></button>
+            {% trans "or" %}
+            <a href=".">{% trans "cancel" %}</a>
+        </p>
+    </form>
+    <script type="text/javascript">
+        document.newaccountform.displayname.focus();
+    </script>
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/registration/old_confirm_new_account.html'
--- identityprovider/templates/launchpad/registration/old_confirm_new_account.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/old_confirm_new_account.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,84 @@
+{% 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 %}{% trans "Complete your registration" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block extra_header %}
+<script type="text/javascript" src="{{ STATIC_URL }}lazr-js/lazr/lazr-meta.js"></script>
+<script type="text/javascript">
+    var LAZR_YUI_CONFIG = {
+        filter: "min",
+        base: "{{ STATIC_URL }}lazr-js/",
+        modules: LAZR_MODULES,
+        insertBefore: "style-overrides"
+    };
+    var LP = YUI(LAZR_YUI_CONFIG);
+    LP.use('node', 'event', 'lazr.passwordmeter', function(Y){
+        var passwordMeter = new Y.PasswordMeter({
+            input: '#id_password',
+            contentBox: '#password_strength',
+            tabIndex: null,
+            messages: ['{% trans "Strength: too short" %}',
+                       '{% trans "Strength: weak" %}',
+                       '{% trans "Strength: fair" %}',
+                       '{% trans "Strength: good" %}',
+                       '{% trans "Strength: strong" %}']
+        });
+        passwordMeter.render();
+    });
+</script>
+<style id="style-overrides" type="text/css">
+div.yui-passwordmeter {
+    clear: left;
+}
+#password_strength {
+    font-weight: bold;
+}
+</style>
+{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Complete your Launchpad Login Service registration{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+    <form id="login-form" class="longfields" method="post" name="loginform">
+		{% csrf_token %}
+        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
+            <label for="id_displayname">{% trans "Full name" %}</label>
+            <br />
+            {{ form.displayname }}
+            {% if form.displayname.errors %}
+                <span class="error">
+                    {{ form.displayname.errors|first }}
+                </span>
+            {% endif %}
+        </p>
+        {% include "widgets/passwords.html" %}
+        <p class="actions">
+            <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
+            {% trans "or" %}
+            <a href="{% if token %}/{{ token }}{% endif %}/">
+              {% trans "cancel" %}
+            </a>
+        </p>
+        <div style="clear: both">&nbsp;</div>
+    </form>
+
+<script type="text/javascript">
+document.loginform.displayname.focus();
+</script>
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/registration/reset_password.html'
--- identityprovider/templates/launchpad/registration/reset_password.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/reset_password.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,74 @@
+{% 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 %}{% trans "Reset password" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block extra_header %}
+<script type="text/javascript" src="{{ STATIC_URL }}lazr-js/lazr/lazr-meta.js"></script>
+<script type="text/javascript">
+    var LAZR_YUI_CONFIG = {
+                    filter: "min",
+                    base: "{{ STATIC_URL }}lazr-js/",
+                    modules: LAZR_MODULES,
+                    insertBefore: "style-overrides"
+                };
+    var LP = YUI(LAZR_YUI_CONFIG);
+    LP.use('node', 'event', 'lazr.passwordmeter', function(Y){
+
+        var passwordMeter = new Y.PasswordMeter({
+            input: '#id_password',
+            contentBox: '#password_strength',
+            tabIndex: null,
+            messages: ['{% trans "Strength: too short" %}',
+                       '{% trans "Strength: weak" %}',
+                       '{% trans "Strength: fair" %}',
+                       '{% trans "Strength: good" %}',
+                       '{% trans "Strength: strong" %}']
+        });
+
+        passwordMeter.render();
+    });
+</script>
+<style id="style-overrides" type="text/css">
+    div.yui-passwordmeter {
+        clear: left;
+    }
+    #password_strength {
+        font-weight: bold;
+    }
+</style>
+{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Reset your Launchpad Login Service password{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+            <form id="login-form" class="longfields" method="post">
+				{% csrf_token %}
+                {% include "widgets/passwords.html" %}
+                <p class="actions">
+                    <button type="submit" name="continue" class="btn">
+                        <span><span>{% trans "Continue" %}</span></span>
+                    </button>
+                    {% trans "or" %}
+                    <a href="{% if token %}/{{ token }}{% endif %}/">
+                      {% trans "cancel" %}
+                    </a>
+                </p>
+                <div style="clear: both">&nbsp;</div>
+            </form>
+{% endblock %}

=== added file 'identityprovider/templates/launchpad/registration/token.html'
--- identityprovider/templates/launchpad/registration/token.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/registration/token.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+{% comment %}
+Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE).
+{% endcomment %}
+
+<html>
+    <body>
+        <form>
+            <input type="hidden" name="token" value="{{token}}">
+        </form>
+    </body>
+</html>

=== added file 'identityprovider/templates/launchpad/server_info.html'
--- identityprovider/templates/launchpad/server_info.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/server_info.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,16 @@
+{% 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 %}{% trans "This is an OpenID server" %}{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}This is the Launchpad login service, built on OpenID. The service enables you to use your Launchpad account to log into OpenID-enabled sites around the Internet.{% endblocktrans %}
+    </p>
+    <p>{% blocktrans %}This page is meant to be called from an OpenID-enabled site and therefore has no user-facing functions.{% endblocktrans %}</p>
+{% endblock %}
+

=== removed directory 'identityprovider/templates/registration'
=== removed file 'identityprovider/templates/registration/bad_token.html'
--- identityprovider/templates/registration/bad_token.html	2010-07-15 22:20:43 +0000
+++ identityprovider/templates/registration/bad_token.html	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-{% 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 %}{% trans "Unauthorized confirmation code" %}{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{% trans "Unauthorized confirmation code" %}</h1>
-{% endblock %}
-
-{% block content %}
-<p>{% blocktrans %}You are not authorized to use this confirmation code. If this URL was sent to you by email, please make sure you open it in the same browser where you requested it.{% endblocktrans %}</p>
-{% endblock %}
-

=== removed file 'identityprovider/templates/registration/confirm_new_account.html'
--- identityprovider/templates/registration/confirm_new_account.html	2011-09-15 21:02:31 +0000
+++ identityprovider/templates/registration/confirm_new_account.html	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-{% 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 %}{% trans "Complete your registration" %}{% endblock %}
-
-{% block extra_header_top %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
-{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{{ brand.complete_reg }}</h1>
-{% endblock %}
-
-{% block content_id %}auth{% endblock %}
-
-{% block content %}
-<p>{% blocktrans %}The account for {{ email }} is ready to be created.{% endblocktrans %}</p>
-
-<form id="login-form" class="longfields" method="post" name="loginform">
-  {% csrf_token %}
-  <p class="actions">
-    <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
-    {% trans "or" %}
-    <a href="/">{% trans "cancel" %}</a>
-  </p>
-  <div style="clear: both">&nbsp;</div>
-</form>
-{% endblock %}

=== removed file 'identityprovider/templates/registration/email_sent.html'
--- identityprovider/templates/registration/email_sent.html	2012-11-06 17:28:50 +0000
+++ identityprovider/templates/registration/email_sent.html	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-{% 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 %}{{ email_heading }}{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{{ email_heading }}</h1>
-{% endblock %}
-
-{% block content %}
-{% if user.is_authenticated %}<div class="email-sent-auth">{% endif %}
-
-<div id="col1">
-    <div>
-        <p class="larger">{{ email_reason|safe }}</p>
-{% if not readonly %}
-        <p class="larger last">
-            {% trans "We've sent you a 6 digit confirmation code.  To continue, enter that code below." %}
-        </p>
-{% endif %}
-    </div>
-
-{% if not readonly %}
-    <form action="{% if token %}/{{ token }}{% endif %}/+enter_token" method="post" id="email_confirm">
-      {% csrf_token %}
-      <p>
-        <label>{% trans "Confirmation code" %}</label><br />
-        <input id="confirmation_code" name="confirmation_code" type="text" class="textType" />
-        <input type="hidden" name="email" value="{{ email }}" />
-      </p>
-      <p><button id="submit" type="submit" class="btn" disabled="true">
-          <span><span>{% trans "Continue" %}</span></span>
-        </button>
-        {% if user.is_authenticated %}{% blocktrans %} or, <a href="/+emails">return to email addresses</a>{% endblocktrans %}{% endif %}
-      </p>
-    </form>
-{% endif %}
-</div>
-
-<div id="col2">
-    <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
-    <p>{% blocktrans %}If you don&rsquo;t receive the message within a few minutes, it might be because:{% endblocktrans %}</p>
-    <ul>
-        <li>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to reduce spam. If so, you&rsquo;ll need to wait an hour or two for the message to arrive.{% endblocktrans %}</li>
-        <li>{% blocktrans %}Your mail provider mistakenly blocks messages from this site. Try signing up using a service like <a href="http://gmail.com/">Gmail</a> or <a href="http://mail.yahoo.com/">Yahoo Mail</a>.{% endblocktrans %} </li>
-    {% if email_notreceived_extra %}
-    <li>{{ email_notreceived_extra|safe }}</li>
-    {% endif %}
-    </ul>
-    <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 %}
-    </p>
-</div>
-<div style="clear: both"></div>
-{% if user.is_authenticated %}</div>{% endif %}
-<script type="text/javascript">
-    YUI().use('node', function (Y) {
-        Y.on('domready', function() {
-            Y.one('#confirmation_code').on('keyup', function() {
-                var code = Y.one('#confirmation_code').get('value');
-                if (code.length === 0) {
-                    Y.one('#submit').setAttribute('disabled', 'true');
-                } else {
-                    Y.one('#submit').removeAttribute('disabled');
-                }
-            });
-        });
-    });
-</script>
-
-{% endblock %}

=== removed file 'identityprovider/templates/registration/forgot_password.html'
--- identityprovider/templates/registration/forgot_password.html	2012-05-24 13:32:45 +0000
+++ identityprovider/templates/registration/forgot_password.html	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-{% 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 %}{% trans "Reset password" %}{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{{ brand.reset_password }}</h1>
-{% endblock %}
-
-{% block content_id %}auth{% endblock %}
-
-{% block content %}
-    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to reset your password.{% endblocktrans %}</p>
-
-    <form action="+forgot_password" method="post">
-		{% csrf_token %}
-        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
-            <label for="id_email">{% trans "Email address" %}</label>
-            <br />
-            {{ form.email }}
-            {% if form.email.errors %}
-                <span class="error">{{ form.email.errors|first }}</span>
-            {% endif %}
-        </p>
-        <p>
-            <span id="captcha">
-                 {% include "widgets/recaptcha.html" %}
-            </span>
-        </p>
-        <p class="actions">
-            <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
-            {% trans "or" %}
-            <a href=".">{% trans "cancel" %}</a>
-        </p>
-    </form>
-{% endblock %}

=== removed file 'identityprovider/templates/registration/logout_to_confirm.html'
--- identityprovider/templates/registration/logout_to_confirm.html	2010-07-15 22:20:43 +0000
+++ identityprovider/templates/registration/logout_to_confirm.html	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-{% 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 %}{% trans "Can not use confirmation code while logged in" %}{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{% trans "Can not use confirmation code while logged in" %}</h1>
-{% endblock %}
-
-{% block content %}
-    <p>{% blocktrans %}You have attempted to confirm an account while logged in as someone else.  We've cancelled your request. Please log out and create your new account again.{% endblocktrans %}</p>
-{% endblock %}
-

=== removed file 'identityprovider/templates/registration/new_account.html'
--- identityprovider/templates/registration/new_account.html	2012-11-16 10:38:25 +0000
+++ identityprovider/templates/registration/new_account.html	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-{% 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 %}{% trans "Create account" %}{% endblock %}
-
-{% block extra_header_top %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
-{% endblock %}
-
-{% block extra_header %}
-{% include "widgets/passwords_head_content.html" %}
-{% endblock %}
-
-{% block text_title %}
-    {% if rpconfig and rpconfig.logo_url %}
-        <div id='rpconfig_logo'>
-            <img src='{{ rpconfig.logo_url }}'/>
-        </div>
-    {% endif %}
-  <h1 class="main">{{ brand.create_account }}</h1>
-{% endblock %}
-
-{% block content_id %}auth{% endblock %}
-
-{% block content %}
-    <p>{% blocktrans %}Enter the following information, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p>
-
-    <form action="+new_account" method="post" name="newaccountform">
-        {% csrf_token %}
-        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
-            <label for="id_displayname">{% trans "Full name" %}</label>
-            <br />
-            {{ form.displayname }}
-            {% if form.displayname.errors %}
-                <span class="error">
-                    {{ form.displayname.errors|first }}
-                </span>
-            {% endif %}
-        </p>
-        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
-            <label for="id_email">{% trans "Email address" %}</label>
-            <br />
-            {{ form.email }}
-            {% if form.email.errors %}
-                <span class="error">{{ form.email.errors|first }}</span>
-            {% endif %}
-        </p>
-        {% include "widgets/passwords.html" %}
-        <p>
-            <span id="captcha">
-                {% include "widgets/recaptcha.html" %}
-            </span>
-        </p>
-        <p class="actions">
-            {# {{workflow}} #}
-            {% if old %}
-                <input type="hidden" name="old" value="old">
-            {% endif %}
-            <button type="submit" class="btn" name="continue"><span><span>{% trans "Continue" %}</span></span></button>
-            {% trans "or" %}
-            <a href=".">{% trans "cancel" %}</a>
-        </p>
-    </form>
-    <script type="text/javascript">
-        document.newaccountform.displayname.focus();
-    </script>
-{% endblock %}

=== removed file 'identityprovider/templates/registration/old_confirm_new_account.html'
--- identityprovider/templates/registration/old_confirm_new_account.html	2012-02-17 21:32:33 +0000
+++ identityprovider/templates/registration/old_confirm_new_account.html	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-{% 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 %}{% trans "Complete your registration" %}{% endblock %}
-
-{% block extra_header_top %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
-{% endblock %}
-
-{% block extra_header %}
-<script type="text/javascript" src="{{ STATIC_URL }}lazr-js/lazr/lazr-meta.js"></script>
-<script type="text/javascript">
-    var LAZR_YUI_CONFIG = {
-        filter: "min",
-        base: "{{ STATIC_URL }}lazr-js/",
-        modules: LAZR_MODULES,
-        insertBefore: "style-overrides"
-    };
-    var LP = YUI(LAZR_YUI_CONFIG);
-    LP.use('node', 'event', 'lazr.passwordmeter', function(Y){
-        var passwordMeter = new Y.PasswordMeter({
-            input: '#id_password',
-            contentBox: '#password_strength',
-            tabIndex: null,
-            messages: ['{% trans "Strength: too short" %}',
-                       '{% trans "Strength: weak" %}',
-                       '{% trans "Strength: fair" %}',
-                       '{% trans "Strength: good" %}',
-                       '{% trans "Strength: strong" %}']
-        });
-        passwordMeter.render();
-    });
-</script>
-<style id="style-overrides" type="text/css">
-div.yui-passwordmeter {
-    clear: left;
-}
-#password_strength {
-    font-weight: bold;
-}
-</style>
-{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{{ brand.complete_reg }}</h1>
-{% endblock %}
-
-{% block content_id %}auth{% endblock %}
-
-{% block content %}
-    <form id="login-form" class="longfields" method="post" name="loginform">
-		{% csrf_token %}
-        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
-            <label for="id_displayname">{% trans "Full name" %}</label>
-            <br />
-            {{ form.displayname }}
-            {% if form.displayname.errors %}
-                <span class="error">
-                    {{ form.displayname.errors|first }}
-                </span>
-            {% endif %}
-        </p>
-        {% include "widgets/passwords.html" %}
-        <p class="actions">
-            <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
-            {% trans "or" %}
-            <a href="{% if token %}/{{ token }}{% endif %}/">
-              {% trans "cancel" %}
-            </a>
-        </p>
-        <div style="clear: both">&nbsp;</div>
-    </form>
-
-<script type="text/javascript">
-document.loginform.displayname.focus();
-</script>
-{% endblock %}

=== removed file 'identityprovider/templates/registration/reset_password.html'
--- identityprovider/templates/registration/reset_password.html	2012-02-17 21:32:33 +0000
+++ identityprovider/templates/registration/reset_password.html	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-{% 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 %}{% trans "Reset password" %}{% endblock %}
-
-{% block extra_header_top %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
-{% endblock %}
-
-{% block extra_header %}
-<script type="text/javascript" src="{{ STATIC_URL }}lazr-js/lazr/lazr-meta.js"></script>
-<script type="text/javascript">
-    var LAZR_YUI_CONFIG = {
-                    filter: "min",
-                    base: "{{ STATIC_URL }}lazr-js/",
-                    modules: LAZR_MODULES,
-                    insertBefore: "style-overrides"
-                };
-    var LP = YUI(LAZR_YUI_CONFIG);
-    LP.use('node', 'event', 'lazr.passwordmeter', function(Y){
-
-        var passwordMeter = new Y.PasswordMeter({
-            input: '#id_password',
-            contentBox: '#password_strength',
-            tabIndex: null,
-            messages: ['{% trans "Strength: too short" %}',
-                       '{% trans "Strength: weak" %}',
-                       '{% trans "Strength: fair" %}',
-                       '{% trans "Strength: good" %}',
-                       '{% trans "Strength: strong" %}']
-        });
-
-        passwordMeter.render();
-    });
-</script>
-<style id="style-overrides" type="text/css">
-    div.yui-passwordmeter {
-        clear: left;
-    }
-    #password_strength {
-        font-weight: bold;
-    }
-</style>
-{% endblock %}
-
-{% block text_title %}
-  <h1 class="main">{{ brand.reset_password }}</h1>
-{% endblock %}
-
-{% block content_id %}auth{% endblock %}
-
-{% block content %}
-            <form id="login-form" class="longfields" method="post">
-				{% csrf_token %}
-                {% include "widgets/passwords.html" %}
-                <p class="actions">
-                    <button type="submit" name="continue" class="btn">
-                        <span><span>{% trans "Continue" %}</span></span>
-                    </button>
-                    {% trans "or" %}
-                    <a href="{% if token %}/{{ token }}{% endif %}/">
-                      {% trans "cancel" %}
-                    </a>
-                </p>
-                <div style="clear: both">&nbsp;</div>
-            </form>
-{% endblock %}

=== removed file 'identityprovider/templates/registration/token.html'
--- identityprovider/templates/registration/token.html	2010-07-12 19:11:15 +0000
+++ identityprovider/templates/registration/token.html	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-{% comment %}
-Copyright 2010 Canonical Ltd.  This software is licensed under the
-GNU Affero General Public License version 3 (see the file  LICENSE).
-{% endcomment %}
-
-<html>
-    <body>
-        <form>
-            <input type="hidden" name="token" value="{{token}}">
-        </form>
-    </body>
-</html>

=== removed file 'identityprovider/templates/server_info.html'
--- identityprovider/templates/server_info.html	2010-07-12 19:11:15 +0000
+++ identityprovider/templates/server_info.html	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-{% 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 %}{% trans "This is an OpenID server" %}{% endblock %}
-
-{% block content %}
-    <p>{{ brand.server_info }}</p>
-    <p>{% blocktrans %}This page is meant to be called from an OpenID-enabled site and therefore has no user-facing functions.{% endblocktrans %}</p>
-{% endblock %}
-

=== added file 'identityprovider/templates/ubuntu/404.html'
--- identityprovider/templates/ubuntu/404.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/404.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,24 @@
+{% 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 %}
+    {% trans "Not found" %}
+{% endblock %}
+
+{% block text_title %}
+    <h1 class="main">Lost something?</h1>
+{% endblock %}
+
+{% block content %}
+        <div>
+          <p>{% blocktrans %}There's no page with this address in the Ubuntu Single Sign On service. Check that you entered the address correctly and try again.{% endblocktrans %}</p>
+          <p>
+            {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}
+          </p>
+        </div>
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/500.html'
--- identityprovider/templates/ubuntu/500.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/500.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,38 @@
+{% 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 %}
+    {% trans "Oops!" %}
+{% endblock %}
+
+{% block text_title %}
+    <h1 class="main">Oops!</h1>
+{% endblock %}
+
+{% block content %}
+        <div>
+          <h3>
+            {% blocktrans %}Sorry, something just went wrong in Ubuntu Single Sign On.{% endblocktrans %}
+          </h3>
+          {% if errormsg %}<p>{{ errormsg }}</p>{% endif %}
+          <p>
+            {% blocktrans %}We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience.{% endblocktrans %}
+          </p>
+          <p>
+            OOPS <abbr>ID</abbr>: {{ oopsid }}
+          </p>
+          {% if request.sentry.id %}
+          <p>
+            Sentry <abbr>ID</abbr>: {{ request.sentry.id }}
+          </p>
+          {% endif %}
+          <pre style="overflow:auto">
+{{traceback}}
+          </pre>
+        </div>
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/registration/bad_token.html'
--- identityprovider/templates/ubuntu/registration/bad_token.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/bad_token.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,18 @@
+{% 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 %}{% trans "Unauthorized confirmation code" %}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% trans "Unauthorized confirmation code" %}</h1>
+{% endblock %}
+
+{% block content %}
+<p>{% blocktrans %}You are not authorized to use this confirmation code. If this URL was sent to you by email, please make sure you open it in the same browser where you requested it.{% endblocktrans %}</p>
+{% endblock %}
+

=== added file 'identityprovider/templates/ubuntu/registration/confirm_new_account.html'
--- identityprovider/templates/ubuntu/registration/confirm_new_account.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/confirm_new_account.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,35 @@
+{% 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 %}{% trans "Complete your registration" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Complete your Ubuntu Single Sign On registration{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+<p>{% blocktrans %}The account for {{ email }} is ready to be created.{% endblocktrans %}</p>
+
+<form id="login-form" class="longfields" method="post" name="loginform">
+  {% csrf_token %}
+  <p class="actions">
+    <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
+    {% trans "or" %}
+    <a href="/">{% trans "cancel" %}</a>
+  </p>
+  <div style="clear: both">&nbsp;</div>
+</form>
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/registration/email_sent.html'
--- identityprovider/templates/ubuntu/registration/email_sent.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/email_sent.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,75 @@
+{% 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 %}{{ email_heading }}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{{ email_heading }}</h1>
+{% endblock %}
+
+{% block content %}
+{% if user.is_authenticated %}<div class="email-sent-auth">{% endif %}
+
+<div id="col1">
+    <div>
+        <p class="larger">{{ email_reason|safe }}</p>
+{% if not readonly %}
+        <p class="larger last">
+            {% trans "We've sent you a 6 digit confirmation code.  To continue, enter that code below." %}
+        </p>
+{% endif %}
+    </div>
+
+{% if not readonly %}
+    <form action="{% if token %}/{{ token }}{% endif %}/+enter_token" method="post" id="email_confirm">
+      {% csrf_token %}
+      <p>
+        <label>{% trans "Confirmation code" %}</label><br />
+        <input id="confirmation_code" name="confirmation_code" type="text" class="textType" />
+        <input type="hidden" name="email" value="{{ email }}" />
+      </p>
+      <p><button id="submit" type="submit" class="btn" disabled="true">
+          <span><span>{% trans "Continue" %}</span></span>
+        </button>
+        {% if user.is_authenticated %}{% blocktrans %} or, <a href="/+emails">return to email addresses</a>{% endblocktrans %}{% endif %}
+      </p>
+    </form>
+{% endif %}
+</div>
+
+<div id="col2">
+    <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
+    <p>{% blocktrans %}If you don&rsquo;t receive the message within a few minutes, it might be because:{% endblocktrans %}</p>
+    <ul>
+        <li>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to reduce spam. If so, you&rsquo;ll need to wait an hour or two for the message to arrive.{% endblocktrans %}</li>
+        <li>{% blocktrans %}Your mail provider mistakenly blocks messages from this site. Try signing up using a service like <a href="http://gmail.com/">Gmail</a> or <a href="http://mail.yahoo.com/">Yahoo Mail</a>.{% endblocktrans %} </li>
+    {% if email_notreceived_extra %}
+    <li>{{ email_notreceived_extra|safe }}</li>
+    {% endif %}
+    </ul>
+    <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 %}
+    </p>
+</div>
+<div style="clear: both"></div>
+{% if user.is_authenticated %}</div>{% endif %}
+<script type="text/javascript">
+    YUI().use('node', function (Y) {
+        Y.on('domready', function() {
+            Y.one('#confirmation_code').on('keyup', function() {
+                var code = Y.one('#confirmation_code').get('value');
+                if (code.length === 0) {
+                    Y.one('#submit').setAttribute('disabled', 'true');
+                } else {
+                    Y.one('#submit').removeAttribute('disabled');
+                }
+            });
+        });
+    });
+</script>
+
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/registration/forgot_password.html'
--- identityprovider/templates/ubuntu/registration/forgot_password.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/forgot_password.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,41 @@
+{% 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 %}{% trans "Reset password" %}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Reset your Ubuntu Single Sign On password{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to reset your password.{% endblocktrans %}</p>
+
+    <form action="+forgot_password" method="post">
+		{% csrf_token %}
+        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
+            <label for="id_email">{% trans "Email address" %}</label>
+            <br />
+            {{ form.email }}
+            {% if form.email.errors %}
+                <span class="error">{{ form.email.errors|first }}</span>
+            {% endif %}
+        </p>
+        <p>
+            <span id="captcha">
+                 {% include "widgets/recaptcha.html" %}
+            </span>
+        </p>
+        <p class="actions">
+            <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
+            {% trans "or" %}
+            <a href=".">{% trans "cancel" %}</a>
+        </p>
+    </form>
+{% endblock %}

=== modified file 'identityprovider/templates/ubuntu/registration/login.html'
--- identityprovider/templates/ubuntu/registration/login.html	2012-10-09 20:38:27 +0000
+++ identityprovider/templates/ubuntu/registration/login.html	2012-12-03 20:22:21 +0000
@@ -111,7 +111,7 @@
     </p>
 {% endif %}
     <p class="last">
-    {{ brand.provides_access }}
+    {% blocktrans %}An Ubuntu Single Sign On account is free and gives you access to Ubuntu One, the Ubuntu Shop and many more useful services.{% endblocktrans %}
     </p>
 {% if not readonly %}
     <p>

=== modified file 'identityprovider/templates/ubuntu/registration/logout.html'
--- identityprovider/templates/ubuntu/registration/logout.html	2010-11-16 11:00:25 +0000
+++ identityprovider/templates/ubuntu/registration/logout.html	2012-12-03 20:22:21 +0000
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-    <p>{{ brand.logout }}</p>
+    <p>{% blocktrans %}You are now logged out of the Ubuntu Single Sign On (SSO) website. However, you have not been automatically logged out of every website that uses this SSO website.{% endblocktrans %}</p>
 
     {% if return_to_url %}
     {% blocktrans with return_to_url as url and return_to_site_name as site_name %}

=== added file 'identityprovider/templates/ubuntu/registration/logout_to_confirm.html'
--- identityprovider/templates/ubuntu/registration/logout_to_confirm.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/logout_to_confirm.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,18 @@
+{% 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 %}{% trans "Can not use confirmation code while logged in" %}{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% trans "Can not use confirmation code while logged in" %}</h1>
+{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}You have attempted to confirm an account while logged in as someone else.  We've cancelled your request. Please log out and create your new account again.{% endblocktrans %}</p>
+{% endblock %}
+

=== added file 'identityprovider/templates/ubuntu/registration/new_account.html'
--- identityprovider/templates/ubuntu/registration/new_account.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/new_account.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,74 @@
+{% 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 %}{% trans "Create account" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block extra_header %}
+{% include "widgets/passwords_head_content.html" %}
+{% endblock %}
+
+{% block text_title %}
+    {% if rpconfig and rpconfig.logo_url %}
+        <div id='rpconfig_logo'>
+            <img src='{{ rpconfig.logo_url }}'/>
+        </div>
+    {% endif %}
+  <h1 class="main">{% blocktrans %}Create an Ubuntu Single Sign On account{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}Enter the following information, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p>
+
+    <form action="+new_account" method="post" name="newaccountform">
+        {% csrf_token %}
+        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
+            <label for="id_displayname">{% trans "Full name" %}</label>
+            <br />
+            {{ form.displayname }}
+            {% if form.displayname.errors %}
+                <span class="error">
+                    {{ form.displayname.errors|first }}
+                </span>
+            {% endif %}
+        </p>
+        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
+            <label for="id_email">{% trans "Email address" %}</label>
+            <br />
+            {{ form.email }}
+            {% if form.email.errors %}
+                <span class="error">{{ form.email.errors|first }}</span>
+            {% endif %}
+        </p>
+        {% include "widgets/passwords.html" %}
+        <p>
+            <span id="captcha">
+                {% include "widgets/recaptcha.html" %}
+            </span>
+        </p>
+        <p class="actions">
+            {# {{workflow}} #}
+            {% if old %}
+                <input type="hidden" name="old" value="old">
+            {% endif %}
+            <button type="submit" class="btn" name="continue"><span><span>{% trans "Continue" %}</span></span></button>
+            {% trans "or" %}
+            <a href=".">{% trans "cancel" %}</a>
+        </p>
+    </form>
+    <script type="text/javascript">
+        document.newaccountform.displayname.focus();
+    </script>
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/registration/old_confirm_new_account.html'
--- identityprovider/templates/ubuntu/registration/old_confirm_new_account.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/old_confirm_new_account.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,84 @@
+{% 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 %}{% trans "Complete your registration" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block extra_header %}
+<script type="text/javascript" src="{{ STATIC_URL }}lazr-js/lazr/lazr-meta.js"></script>
+<script type="text/javascript">
+    var LAZR_YUI_CONFIG = {
+        filter: "min",
+        base: "{{ STATIC_URL }}lazr-js/",
+        modules: LAZR_MODULES,
+        insertBefore: "style-overrides"
+    };
+    var LP = YUI(LAZR_YUI_CONFIG);
+    LP.use('node', 'event', 'lazr.passwordmeter', function(Y){
+        var passwordMeter = new Y.PasswordMeter({
+            input: '#id_password',
+            contentBox: '#password_strength',
+            tabIndex: null,
+            messages: ['{% trans "Strength: too short" %}',
+                       '{% trans "Strength: weak" %}',
+                       '{% trans "Strength: fair" %}',
+                       '{% trans "Strength: good" %}',
+                       '{% trans "Strength: strong" %}']
+        });
+        passwordMeter.render();
+    });
+</script>
+<style id="style-overrides" type="text/css">
+div.yui-passwordmeter {
+    clear: left;
+}
+#password_strength {
+    font-weight: bold;
+}
+</style>
+{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Complete your Ubuntu Single Sign On registration{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+    <form id="login-form" class="longfields" method="post" name="loginform">
+		{% csrf_token %}
+        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
+            <label for="id_displayname">{% trans "Full name" %}</label>
+            <br />
+            {{ form.displayname }}
+            {% if form.displayname.errors %}
+                <span class="error">
+                    {{ form.displayname.errors|first }}
+                </span>
+            {% endif %}
+        </p>
+        {% include "widgets/passwords.html" %}
+        <p class="actions">
+            <button type="submit" name="continue" class="btn"><span><span>{% trans "Continue" %}</span></span></button>
+            {% trans "or" %}
+            <a href="{% if token %}/{{ token }}{% endif %}/">
+              {% trans "cancel" %}
+            </a>
+        </p>
+        <div style="clear: both">&nbsp;</div>
+    </form>
+
+<script type="text/javascript">
+document.loginform.displayname.focus();
+</script>
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/registration/reset_password.html'
--- identityprovider/templates/ubuntu/registration/reset_password.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/reset_password.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,74 @@
+{% 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 %}{% trans "Reset password" %}{% endblock %}
+
+{% block extra_header_top %}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssreset/reset-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssfonts/fonts-min.css"></link>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lazr-js/cssbase/base-min.css"></link>
+{% endblock %}
+
+{% block extra_header %}
+<script type="text/javascript" src="{{ STATIC_URL }}lazr-js/lazr/lazr-meta.js"></script>
+<script type="text/javascript">
+    var LAZR_YUI_CONFIG = {
+                    filter: "min",
+                    base: "{{ STATIC_URL }}lazr-js/",
+                    modules: LAZR_MODULES,
+                    insertBefore: "style-overrides"
+                };
+    var LP = YUI(LAZR_YUI_CONFIG);
+    LP.use('node', 'event', 'lazr.passwordmeter', function(Y){
+
+        var passwordMeter = new Y.PasswordMeter({
+            input: '#id_password',
+            contentBox: '#password_strength',
+            tabIndex: null,
+            messages: ['{% trans "Strength: too short" %}',
+                       '{% trans "Strength: weak" %}',
+                       '{% trans "Strength: fair" %}',
+                       '{% trans "Strength: good" %}',
+                       '{% trans "Strength: strong" %}']
+        });
+
+        passwordMeter.render();
+    });
+</script>
+<style id="style-overrides" type="text/css">
+    div.yui-passwordmeter {
+        clear: left;
+    }
+    #password_strength {
+        font-weight: bold;
+    }
+</style>
+{% endblock %}
+
+{% block text_title %}
+  <h1 class="main">{% blocktrans %}Reset your Ubuntu Single Sign On password{% endblocktrans %}</h1>
+{% endblock %}
+
+{% block content_id %}auth{% endblock %}
+
+{% block content %}
+            <form id="login-form" class="longfields" method="post">
+				{% csrf_token %}
+                {% include "widgets/passwords.html" %}
+                <p class="actions">
+                    <button type="submit" name="continue" class="btn">
+                        <span><span>{% trans "Continue" %}</span></span>
+                    </button>
+                    {% trans "or" %}
+                    <a href="{% if token %}/{{ token }}{% endif %}/">
+                      {% trans "cancel" %}
+                    </a>
+                </p>
+                <div style="clear: both">&nbsp;</div>
+            </form>
+{% endblock %}

=== added file 'identityprovider/templates/ubuntu/registration/token.html'
--- identityprovider/templates/ubuntu/registration/token.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/registration/token.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+{% comment %}
+Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE).
+{% endcomment %}
+
+<html>
+    <body>
+        <form>
+            <input type="hidden" name="token" value="{{token}}">
+        </form>
+    </body>
+</html>

=== added file 'identityprovider/templates/ubuntu/server_info.html'
--- identityprovider/templates/ubuntu/server_info.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/server_info.html	2012-12-03 20:22:21 +0000
@@ -0,0 +1,16 @@
+{% 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 %}{% trans "This is an OpenID server" %}{% endblock %}
+
+{% block content %}
+    <p>{% blocktrans %}This is the Ubuntu SSO service, built on OpenID. The service enables you to use your Ubuntu SSO account to log into various sites run by Canonical and Ubuntu.{% endblocktrans %}
+    </p>
+    <p>{% blocktrans %}This page is meant to be called from an OpenID-enabled site and therefore has no user-facing functions.{% endblocktrans %}</p>
+{% endblock %}
+

=== removed file 'identityprovider/tests/unit/test_branding.py'
--- identityprovider/tests/unit/test_branding.py	2012-01-10 21:17:33 +0000
+++ identityprovider/tests/unit/test_branding.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-from django.test import TestCase
-
-from identityprovider.branding import Ubuntu, Launchpad
-
-
-class BrandingTestCase(TestCase):
-
-    def test_branding_class_has_logout_attribute(self):
-        self.assertTrue(hasattr(Ubuntu, 'logout'))
-        self.assertTrue(hasattr(Launchpad, 'logout'))

=== modified file 'identityprovider/tests/unit/test_dbfailover.py'
--- identityprovider/tests/unit/test_dbfailover.py	2012-10-29 16:06:36 +0000
+++ identityprovider/tests/unit/test_dbfailover.py	2012-12-03 20:22:21 +0000
@@ -10,7 +10,6 @@
 from django.db import connection
 from mock import patch
 
-from identityprovider.branding import current_brand
 from identityprovider.tests import mockdb
 from identityprovider.readonly import ReadOnlyManager
 
@@ -92,7 +91,7 @@
             mockdb.fail_next_N_connections(6)
             response = self.client.get('/')
             apology = (u"Sorry, something just went wrong in %s." %
-                       current_brand.name)
+                       settings.BRAND_DESCRIPTION)
             self.assertContains(response, apology, status_code=500)
 
     def test_files_are_in_the_right_place(self):

=== modified file 'identityprovider/tests/unit/test_loginservice.py'
--- identityprovider/tests/unit/test_loginservice.py	2012-10-29 16:06:36 +0000
+++ identityprovider/tests/unit/test_loginservice.py	2012-12-03 20:22:21 +0000
@@ -1,9 +1,9 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from django.conf import settings
 from django.core import mail
 
-from identityprovider.branding import current_brand
 from identityprovider.models.authtoken import AuthToken
 
 from identityprovider.tests.utils import SSOBaseTestCase
@@ -37,8 +37,9 @@
         self.assertIn("Forgotten your password?", response.content)
         self.assertIn("[e-mail]", response.content)
         self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].subject,
-                         u"%s: Password reset request" % current_brand.name)
+        self.assertEqual(
+            mail.outbox[0].subject,
+            u"%s: Password reset request" % settings.BRAND_DESCRIPTION)
         self.assertTrue('[e-mail]' in mail.outbox[0].body)
         self.assertTrue('+new_account' in mail.outbox[0].body)
 
@@ -60,7 +61,7 @@
         self.assertIn("[e-mail]", response.content)
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].subject,
-                         u"%s: Warning" % current_brand.name)
+                         u"%s: Warning" % settings.BRAND_DESCRIPTION)
         mail.outbox = []
 
     def test_forgottenform_success(self):
@@ -72,8 +73,9 @@
         self.assertIn("Forgotten your password?", response.content)
         self.assertIn("[e-mail]", response.content)
         self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].subject,
-                         u"%s: Forgotten Password" % current_brand.name)
+        self.assertEqual(
+            mail.outbox[0].subject,
+            u"%s: Forgotten Password" % settings.BRAND_DESCRIPTION)
         mail.outbox = []
 
         AuthToken.objects.all().delete()

=== modified file 'identityprovider/tests/unit/test_models_authtoken.py'
--- identityprovider/tests/unit/test_models_authtoken.py	2012-10-29 16:06:36 +0000
+++ identityprovider/tests/unit/test_models_authtoken.py	2012-12-03 20:22:21 +0000
@@ -10,7 +10,6 @@
     patch,
 )
 
-from identityprovider.branding import Launchpad
 from identityprovider.models.account import Account
 from identityprovider.models.authtoken import (
     AuthToken,
@@ -109,7 +108,7 @@
 
         self.assertTrue(mock_rts.template.endswith('web-newuser.txt'))
 
-    @patch('identityprovider.models.authtoken.current_brand', Launchpad())
+    @patch('settings.BRAND_DESCRIPTION', 'Launchpad Login Service')
     def test_sendNewUserEmail_default_template_launchpad_theme(self):
         token = self.factory.make_account_token(self.account,
                                                 email='[e-mail]')

=== modified file 'identityprovider/tests/unit/test_static.py'
--- identityprovider/tests/unit/test_static.py	2012-10-19 17:52:14 +0000
+++ identityprovider/tests/unit/test_static.py	2012-12-03 20:22:21 +0000
@@ -3,53 +3,16 @@
 
 from django.conf import settings
 
-import identityprovider.branding
-import identityprovider.context_processors
-from identityprovider.tests.utils import SSOBaseTestCase
+from identityprovider.tests.utils import SSOBaseTestCase, patch_settings
 
 
 class DummyRequest(object):
     META = {}
 
 
-class BrandingTestCase(SSOBaseTestCase):
-
-    def setUp(self):
-        self.BRAND = settings.BRAND
-
-    def tearDown(self):
-        self.set_branding(self.BRAND)
-
-    def set_branding(self, branding):
-        # reload settings
-        settings.BRAND = branding
-
-        reload(identityprovider.branding)
-        reload(identityprovider.context_processors)
-
-    def test_openid(self):
-        self.set_branding('Ubuntu')
-        r = self.client.get('/+openid')
-        self.assertContains(r, "This is the Ubuntu SSO service")
-        self.set_branding('Launchpad')
-        r = self.client.get('/+openid')
-        self.assertContains(r, "This is the Launchpad login service")
-
-
-class StaticPageTestCase(SSOBaseTestCase):
-
+class UbuntuBrandingTestCase(SSOBaseTestCase):
     fixtures = ["test"]
-
-    def setUp(self):
-        self.brand = settings.BRAND
-
-    def tearDown(self):
-        self.set_brand(self.brand)
-
-    def set_brand(self, brand):
-        settings.BRAND = brand
-        import identityprovider.urls
-        reload(identityprovider.urls)
+    login_message = "This is the Ubuntu SSO service"
 
     def assertAvailable(self, url, text):
         r = self.client.get(url)
@@ -59,17 +22,55 @@
         r = self.client.get(url)
         self.assertEqual(r.status_code, 404)
 
-    def assertUbuntuOnly(self, url, text):
-        self.assertAvailable(url, text)
-        self.set_brand('Launchpad')
-        self.assertNotAvailable(url)
-
-    def test_faq_page_ubuntu_only(self):
-        self.assertUbuntuOnly('/+faq', "Frequently asked questions")
-
-    def test_description_page_ubuntu_only(self):
-        self.assertUbuntuOnly('/+description', "What's this?")
-
-    def test_applications_page_ubuntu_only(self):
-        self.client.login(username='[e-mail]', password='test')
-        self.assertUbuntuOnly('/+applications', 'Applications you use')
+    def test_openid(self):
+        r = self.client.get('/+openid')
+        self.assertContains(r, self.login_message)
+
+    def test_faq_page(self):
+        self.assertAvailable('/+faq', "Frequently asked questions")
+
+    def test_description_page(self):
+        self.assertAvailable('/+description', "What's this?")
+
+    def test_applications_page(self):
+        self.client.login(username='[e-mail]', password='test')
+        self.assertAvailable('/+applications', 'Applications you use')
+
+
+class LaunchpadBrandingTestCase(UbuntuBrandingTestCase):
+    login_message = "This is the Launchpad login service"
+
+    def setUp(self):
+        super(LaunchpadBrandingTestCase, self).setUp()
+
+        def replaceLast(s, old, new):
+            head, sep, tail = s.rpartition(old)
+            return head + new + tail if sep else s
+        template_dirs = [replaceLast(d, 'ubuntu', 'launchpad')
+                         for d in settings.TEMPLATE_DIRS]
+
+        self.brand_patch = patch_settings(
+            BRAND='launchpad',
+            BRAND_DESCRIPTION='Launchpad Login Service',
+            TEMPLATE_DIRS=template_dirs,
+        )
+        self.brand_patch.start()
+        self._reload_urls()
+        # order here is important to restore original urls,
+        # that depends on the branding cleanup
+        self.addCleanup(self._reload_urls)
+        self.addCleanup(self.brand_patch.stop)
+
+    def _reload_urls(self):
+        import identityprovider.urls
+        reload(identityprovider.urls)
+
+    def test_faq_page(self):
+        self.assertNotAvailable('/+faq')
+
+    def test_description_page(self):
+        self.assertNotAvailable('/+description')
+
+    def test_applications_page(self):
+        self.client.login(username='[e-mail]', password='test')
+        self.assertNotAvailable('/+applications')

=== modified file 'identityprovider/urls.py'
--- identityprovider/urls.py	2012-10-29 16:06:36 +0000
+++ identityprovider/urls.py	2012-12-03 20:22:21 +0000
@@ -5,7 +5,6 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 
-from identityprovider.branding import current_brand
 from identityprovider.models import AUTHTOKEN_PATTERN
 from identityprovider.views import device_urldata
 from identityprovider.views.ui import LoginView, TwoFactorView
@@ -106,7 +105,7 @@
         name='device-generate'),
 )
 
-if settings.BRAND.lower() == 'ubuntu':
+if settings.BRAND == 'ubuntu':
     urlpatterns += patterns(
         'identityprovider.views.account',
         (r'^\+applications$', 'applications'),
@@ -146,7 +145,7 @@
         '',
         (r'(favicon.ico)', 'django.views.static.serve',
             {'document_root': settings.SSO_MEDIA_ROOT +
-             current_brand.template_dir}),
+             settings.BRAND_TEMPLATE_DIR}),
         (r'^i18n/', include('django.conf.urls.i18n')),
     )
 
@@ -167,7 +166,7 @@
     )
 
 # Keep this at the end, so no important URL will be overridden
-if settings.BRAND.lower() == 'ubuntu':
+if settings.BRAND == 'ubuntu':
     urlpatterns += patterns(
         'identityprovider.views.ui',
         (r'^\+(?P<page_name>description|faq)$', 'static_page'),

=== modified file 'identityprovider/views/errors.py'
--- identityprovider/views/errors.py	2012-10-19 17:50:44 +0000
+++ identityprovider/views/errors.py	2012-12-03 20:22:21 +0000
@@ -3,7 +3,6 @@
 
 from django import http
 from django.template import RequestContext, loader
-from identityprovider.branding import current_brand
 
 
 class ErrorPage(object):
@@ -17,7 +16,6 @@
         oopsid = request.META.get('OOPSID')
         atts = {
             'request': request,
-            'brand': current_brand,
             'oopsid': oopsid,
             'errormsg': self.errormsg,
         }

=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2012-11-06 17:28:50 +0000
+++ identityprovider/views/ui.py	2012-12-03 20:22:21 +0000
@@ -28,7 +28,6 @@
 from gargoyle.decorators import switch_is_active
 
 from identityprovider import signed
-from identityprovider.branding import current_brand
 from identityprovider.decorators import (
     check_readonly,
     dont_cache,
@@ -419,7 +418,7 @@
         self.set_orequest(request.session, token, raw_orequest)
 
         template_file = ('%s/registration/logout.html' %
-                         current_brand.template_dir)
+                         settings.BRAND_TEMPLATE_DIR)
         response = render_to_response(template_file,
                                       RequestContext(request, context))
 
@@ -551,10 +550,10 @@
         }
         message = render_to_string(
             '%s/email/impersonate-warning.txt' %
-            current_brand.template_dir, replacements)
-        subject = current_brand.name + ": " + _("Warning")
+            settings.BRAND_TEMPLATE_DIR, replacements)
+        subject = _(settings.BRAND_DESCRIPTION) + ": " + _("Warning")
         from_address = format_address(
-            settings.NOREPLY_FROM_ADDRESS, current_brand.name)
+            settings.NOREPLY_FROM_ADDRESS, _(settings.BRAND_DESCRIPTION))
         send_mail(subject, message, from_address, [email])
 
 
@@ -911,11 +910,11 @@
     elif send_email == CREATE:
         # they've tried to reset with an invalid email, so send them an email
         # on how to create an account
-        brand = unicode(current_brand.name)
-        subject = u"%s: %s" % (brand, u"Password reset request")
+        brand = unicode(_(settings.BRAND_DESCRIPTION))
+        subject = u"%s: %s" % (brand, _(u"Password reset request"))
         url = urljoin(settings.SSO_ROOT_URL, reverse(new_account))
         context = {'email': email, 'signup': url}
-        tmpl = '%s/email/invitation.txt' % current_brand.template_dir
+        tmpl = '%s/email/invitation.txt' % settings.BRAND_TEMPLATE_DIR
         body = render_to_string(tmpl, context)
         send_mail(subject, body, settings.NOREPLY_FROM_ADDRESS, [email])