Merge lp:~stuartmetcalfe/canonical-identity-provider/lp-brand-update into lp:canonical-identity-provider/release

[Stuart Metcalfe]

Changes the Launchpad branding to match the current site design and tweaks a few other little things along the way.

Changes the Launchpad branding to match the current site design and tweaks a few other little things along the way.

[Ricardo Kirkner (ricardokirkner)]

LGTM. Nice css work

review: Approve

=== added file 'identityprovider/media/launchpad/favicon.png'
Binary files identityprovider/media/launchpad/favicon.png	1970-01-01 00:00:00 +0000 and identityprovider/media/launchpad/favicon.png	2011-05-12 07:49:34 +0000 differ
=== added file 'identityprovider/media/launchpad/icon-sprites.png'
Binary files identityprovider/media/launchpad/icon-sprites.png	1970-01-01 00:00:00 +0000 and identityprovider/media/launchpad/icon-sprites.png	2011-05-12 07:49:34 +0000 differ
=== added file 'identityprovider/media/launchpad/launchpad-logo-and-name.png'
Binary files identityprovider/media/launchpad/launchpad-logo-and-name.png	1970-01-01 00:00:00 +0000 and identityprovider/media/launchpad/launchpad-logo-and-name.png	2011-05-12 07:49:34 +0000 differ
=== modified file 'identityprovider/media/launchpad/styles.css'
--- identityprovider/media/launchpad/styles.css	2010-11-16 11:00:25 +0000
+++ identityprovider/media/launchpad/styles.css	2011-05-12 07:49:34 +0000
@@ -1,65 +1,220 @@
 /* Copyright 2010 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE). */
 
-html {
-    background: #fff;
-    color: #000;
-        font-family: UbuntuBeta, Ubuntu, "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
-} :link {
-    background: none;
-    color: #00c;
-}
-
-img {
-    border: 0;
-}
-
-html, body {
-    height: 100%;
+a:link,
+a:visited {
+    color: #03A;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+body {
+    font-family: "Ubuntu Beta", UbuntuBeta, Ubuntu, "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
+    font-size: 12px;
+    line-height: 16px;
+}
+
+h1 {
+    font-size: 30px;
+    line-height: 34px;
+    font-weight: normal;
+}
+
+h2 {
+    margin-top: 16px;
+    margin-bottom: 8px;
+    font-size: 22px;
+    font-weight: normal;
+    line-height: 26px;
+}
+
+/* Forms */
+
+label {
+    font-weight: bold;
+}
+
+label:after {
+    content: ":";
+}
+
+input[type="text"],
+input[type="password"]
+{
+    width: 15em;
+}
+
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
+input[type="file"]::-webkit-file-upload-button,
+button {
+    -webkit-box-align: center;
+    text-align: center;
+    cursor: default;
+    color: buttontext;
+    padding: 2px 6px 3px;
+    border: 2px outset buttonface;
+    background-color: buttonface;
+    box-sizing: border-box;
+}
+
+label.tooltip span.tooltip {
+    display: none;
+}
+
+form .formHelp {
+    display: block;
+    font-size: 80%;
+    padding-left: 0.5em;
+}
+
+.login-logout {
+    position: absolute;
+    top: 0.5em;
+    right: 1.5em;
+}
+
+/* Login/out controls */
+
+#logincontrol input[type="submit"] {
+    font-size: 10px;
     margin: 0;
     padding: 0;
 }
 
-/* pushes footer down */
-table.listing {
+.sprite {
+    padding: 0 0 0 18px;
+    line-height: 18px;
+}
+
+.person {
+    background-image: url(/assets/identityprovider/launchpad/icon-sprites.png);
+    background-repeat: no-repeat;
+    background-position: 0 -1804px;
+}
+
+#login-form {
+    float: left;
+    width: 50%;
+}
+
+/* Layout */
+
+.top-portlet {
+    border-bottom: 1px dotted #999;
+    padding: 0 0 0.5em 0;
+    margin: 0 0 1em;
+}
+
+.yui-d0 {
+    margin: 10px 20px;
+}
+
+.yui-d0 {
+    margin: auto 10px;
+    width: auto;
+}
+
+.yui-u.first {
+    margin-top: 1.5em;
+}
+
+#maincontent {
+    margin: auto;
+    width: 90%;
+    max-width: 80em;
+}
+
+.yui-main {
+    width: 100%;
+}
+
+#sidebar,
+#lpinfo {
+    margin-left: 50%;
+}
+
+.footer .colophon {
+    margin: 3em 3em 1em 3em;
+    text-align: center;
+}
+
+/* Errors */
+
+span.error {
+    color: red
+}
+
+.message {
+    background: 5px 0.5em no-repeat;
+    font-weight: bold;
+    margin: auto;
+    padding: 0.5em 1em 0.5em 30px;
+}
+
+.error.message {
+    color: #db1f22;
+    background-color: #ffffff;
+    border: 1px solid #db1f22;
+}
+
+/* Specific cases */
+
+#lplogo {
+    margin: 0 9em 1em 0;
+}
+
+#forgotpw-link {
+    line-height: 2em;
+}
+
+p.returnto {
+    font-size: 140%;
+}
+
+/* Tables */
+
+table {
+    border-spacing: 0;
+}
+
+#visited-sites table.listing {
+    border: 1px solid #d2d2d2;
     margin: 0 0 10px 0;
     width: 100%;
-    font-size: 90%;
+    font-size: 100%;
 }
 
-table.listing, table.listing tbody, table.listing td.end-of-section {
+table.listing th {
     border-bottom: 1px solid #d2d2d2;
+    border-left: 1px solid #d2d2d2;
 }
 
-table.listing thead, table.listing thead th, table.listing tfoot tr, table.listing tr.thead th {
-    border: 1px solid #d2d2d2;
-    background-color: #fff;
+table.listing th:first-child {
+    border-left: 0;
 }
 
 table.listing th, table.listing td {
     padding: 0.25em;
 }
 
+#visited-sites table.listing td {
+    background-color: #FF9;
+}
+
 table.listing table tbody, table.listing table thead, table.listing table thead th, table.listing tfoot tr, table.listing table tfoot td, table.listing table td {
     border: none;
 }
 
-thead {
-    vertical-align: bottom;
-}
-
 th, td {
+    text-align: left;
     vertical-align: baseline;
 }
 
-th {
-    text-align: right;
-}
-
-thead th, tr.thead th {
-    text-align: center;
-}
-
 table.hover tbody tr:hover {
     background-color: #e8e8e8;
 }
@@ -71,181 +226,3 @@
 td.actions a {
     margin-left: 1.5em;
 }
-
-#nonfooter {
-    position: relative;
-    min-height: 100%;
-}
-* html #nonfooter {
-    height: 100%;
-}
-
-#footer {
-    clear: both;
-    position: relative;
-    margin: -1em auto 0;
-    height: 3em;
-}
-
-address, #footer {
-    font-size: 14px;
-    font-style: normal;
-    text-align: center;
-}
-
-address {
-    background: #afdb1f;
-    border: solid #9bc11b;
-    border-width: 1px 0;
-    font-weight: bold;
-    margin: 0 0 24px;
-    padding: 4px 10px;
-}
-
-#maincontent {
-    margin: 0 auto;
-    padding: 0 2em;
-    max-width: 60em;
-}
-
-h1, h2 {
-    font-size: 1em;
-    color: #666;
-}
-
-p.returnto {
-    font-size: 16px;
-    text-align: center;
-}
-
-#rp {
-    width: 49%;
-    float: left;
-}
-
-#auth {
-    background: #eee;
-    border: 1px solid #aaa;
-    padding: 1em 2%;
-    width: 100%;
-    float: right;
-}
-
-#auth h2 {
-    margin: 0 0 0.25em;
-    padding: 0;
-}
-
-#auth div {
-    margin: 0 0 1em;
-    width: 100%;
-}
-
-#auth div div {
-    margin: 0;
-}
-
-#auth input[type =
-"text"], #auth input[type = "password"] {
-    display: block;
-    width: 300px;
-}
-
-input[type =
-"radio"] {
-    margin-left: 0;
-    margin-top: 0.5em;
-}
-
-#auth input[type =
-"submit"] {
-    margin-top: 1em;
-}
-
-#auth label {
-    margin-bottom: 0.25em;
-}
-
-form .formHelp {
-    display: block;
-}
-
-button:hover {
-    cursor: pointer;
-}
-
-code {
-    font-weight: bold;
-}
-
-#lpinfo {
-    clear: both;
-    width: 50%;
-    margin-left: 25%;
-    padding-top: 20px;
-}
-
-.message {
-    background: 5px 0.5em no-repeat;
-    font-weight: bold;
-    margin: auto;
-    padding: 0.5em 1em 0.5em 30px; /* 30px because the image has a pixel size */
-}
-
-.error.message {
-    color: #db1f22;
-    background-color: #ffffff;
-    border: 1px solid #db1f22;
-}
-
-span.tooltip {
-    display: none;
-}
-
-div#user-info {
-    max-width: 60em;
-    padding: 0 2em;
-    margin: 20px auto;
-}
-
-div#col1 {
-    float: left;
-    width: 45%;
-    margin-right: 10px;
-}
-
-div#col2 {
-    float: left;
-    width: 45%
-}
-
-span.error {
-    color: red
-}
-
-#mainbar {
-    float: left;
-    margin-right: 50px;
-    width: 50%;
-}
-#sidebar {
-    margin-right: 20px;
-    float: left;
-    width: 35%;
-    display:block;
-}
-
-label {
-    font-weight: bold;
-}
-label:after {
-    content: ":";
-}
-
-#logout {
-    float:right;
-}
-
-#captcha iframe {
-    display: block;
-}

=== modified file 'identityprovider/templates/launchpad/base.html'
--- identityprovider/templates/launchpad/base.html	2010-11-15 23:22:19 +0000
+++ identityprovider/templates/launchpad/base.html	2011-05-12 07:49:34 +0000
@@ -10,49 +10,78 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
     <head>
         <title>{% block title %}{% trans "Log in" %}{% endblock %}</title>
+        <link rel="shortcut icon" href="/assets/identityprovider/launchpad/favicon.png" />
         <link rel="stylesheet" type="text/css" href="/assets/identityprovider/launchpad/styles.css"/>
         {% block extra_header %}{% endblock %}
     </head>
     <body>
-        <div id="nonfooter">
-            <address>
-                {% trans "Launchpad Login Service" %}
-            </address>
-            {% if user.is_authenticated %}
-                {% include "widgets/launchpad/logout-button.html" %}
-            {% endif %}
-
-            {% if message %}
-                <div class="message {{ message_style }}{% if not user.is_authenticated %} notopbar{% endif %}">
-                    <p>{{ message }}</p>
-                </div>
-            {% endif %}
-
-            <div id="maincontent">
-                {% if readonly %}
-                    <div class="message">
-                        {% blocktrans %}We are currently in read-only mode. That means that at the moment you can't create new accounts, update your personal information, or request password reminders.{% endblocktrans %}
-                    </div>
-                {% endif %}
-
-                <div id="{% block content_id %}box{% endblock %}">
-                    {% block text_title %}{% endblock %}
-                    {% block content %}{% endblock %}
-                </div>
-            </div>
-            <div style="clear: both;">
-                &nbsp;
-            </div>
-        </div>
-
-        <div id="footer">
-            {% blocktrans %}Problems logging in? Check our <a href="https://answers.launchpad.net/canonical-identity-provider">FAQs</a> or open a <a href="https://forms.canonical.com/lp-login-support/">new support case</a>.{% endblocktrans %}<br />
-            &copy;&nbsp;2004-2010&nbsp;<a href="http://canonical.com/">Canonical&nbsp;Ltd.</a><br />
-            {% blocktrans %}<a href="https://launchpad.net/canonical-identity-provider">Source code for this Single Sign On service</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html">AGPL</a>.{% endblocktrans %}<br />
-            <small>
-              {% blocktrans %}Launchpad account management is provided by the <a href="https://login.ubuntu.com">Ubuntu Single Sign On service</a>{% endblocktrans %}
-            </small>
-        </div>
-
+        <body id="document">
+            <div class="yui-d0">
+                <div id="locationbar" class="login-logout">
+                    <div id="logincontrol">
+                        {% if user.is_authenticated %}
+                            {% include "widgets/launchpad/logout-button.html" %}
+                        {% else %}
+                            <a href="/+login">{% trans "Log in / Register" %}</a>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+
+            <div id="maincontent" class="yui-main">
+                <div class="yui-b" dir="ltr">
+                    <div>
+                        <div id="homepage" class="homepage">
+                            <div class="top-portlet">
+                                <img src="/assets/identityprovider/launchpad/launchpad-logo-and-name.png" alt="" id="lplogo" />
+                            </div>
+                            <div class="yui-g">
+                                <div class="yui-u first">
+
+                <div id="title">{% block text_title %}{% endblock %}</div>
+
+                <div id="content">
+                    {% if readonly %}
+                        <div class="message warning">
+        {% blocktrans %}We are currently in read-only mode. That means that at the moment you can't create new accounts, update your personal information, or request password reminders.{% endblocktrans %}
+                        </div>
+                    {% endif %}
+
+                    {% if message %}
+                        <div class="message {{ message_style }}{% if not user.is_authenticated %} notopbar{% endif %}">
+                            <p>{{ message }}</p>
+                        </div>
+                    {% endif %}
+
+                    {% if readonly %}
+                        <div class="message">
+                            {% blocktrans %}We are currently in read-only mode. That means that at the moment you can't create new accounts, update your personal information, or request password reminders.{% endblocktrans %}
+                        </div>
+                    {% endif %}
+
+                    <div id="{% block content_id %}box{% endblock %}">
+                        {% block content %}{% endblock %}
+                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div id="footer" class="footer">
+                <div class="colophon">
+                    {% blocktrans %}&copy;&nbsp;2004-2011&nbsp;<a href="http://canonical.com/">Canonical&nbsp;Ltd.</a> &bull;
+                    <a href="https://launchpad.net/canonical-identity-provider">Get the code</a> &bull;
+                    <a href="https://answers.launchpad.net/canonical-identity-provider">FAQs</a>  &bull;
+                    <a href="https://forms.canonical.com/lp-login-support/">Contact SSO Support</a>
+                    {% endblocktrans %}<br />
+                    <small>
+                      {% blocktrans %}Launchpad account management is provided by the <a href="https://login.ubuntu.com">Ubuntu Single Sign On service</a>{% endblocktrans %}
+                    </small>
+                </div>
+            </div>
+        </div>
     </body>
 </html>

=== modified file 'identityprovider/templates/launchpad/registration/login.html'
--- identityprovider/templates/launchpad/registration/login.html	2010-07-12 19:11:15 +0000
+++ identityprovider/templates/launchpad/registration/login.html	2011-05-12 07:49:34 +0000
@@ -30,7 +30,7 @@
     </div>
     <form id="login-form" action="+login" method="post" name="loginform">
         <p class="input-row{% if form.email.errors or form.non_field_errors %} haserrors{% endif %}">
-            <label class="formLabel" for="id_username">{% trans "Email address" %}</label>
+            <label class="formLabel" for="id_email">{% trans "Email address" %}</label>
             <br />
             {{ form.email }}
             {% if form.email.errors %}

=== modified file 'identityprovider/templates/ubuntu/base.html'
--- identityprovider/templates/ubuntu/base.html	2010-11-15 23:26:00 +0000
+++ identityprovider/templates/ubuntu/base.html	2011-05-12 07:49:34 +0000
@@ -87,7 +87,7 @@
             <div id="footer-logo"><a href="{% if not embedded %}http://www.ubuntu.com{% endif %}"></a></div>
 
             <div id="copyright">
-                <p>{% blocktrans %}&copy; 2009-2010 Canonical Ltd.
+                <p>{% blocktrans %}&copy; 2009-2011 Canonical Ltd.
 <a href="https://launchpad.net/canonical-identity-provider">Source code for this service</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html">AGPL</a>.<br />
 Ubuntu and Canonical are registered trademarks of Canonical Group Ltd.<br />
 Please review our <a href="http://ubuntu.com/legal">Terms of Service</a> as well as our <a href="http://ubuntu.com/legal#privacy">Privacy Policy</a>.{% endblocktrans %}</p>

=== modified file 'identityprovider/templates/ubuntu/registration/login.html'
--- identityprovider/templates/ubuntu/registration/login.html	2010-09-18 05:38:59 +0000
+++ identityprovider/templates/ubuntu/registration/login.html	2011-05-12 07:49:34 +0000
@@ -37,7 +37,7 @@
 
     <form id="login-form" action="+login" method="post" name="loginform">
         <p class="input-row{% if form.email.errors or form.non_field_errors %} haserrors{% endif %}">
-            <label class="formLabel">{% trans "Email address" %}</label><br />
+            <label class="formLabel" for="id_email">{% trans "Email address" %}</label><br />
             {{ form.email }}
             {% if form.email.errors %}
               <span class="error">{{ form.email.errors|join:"" }}</span>

=== modified file 'identityprovider/templates/widgets/launchpad/logout-button.html'
--- identityprovider/templates/widgets/launchpad/logout-button.html	2010-07-12 19:11:15 +0000
+++ identityprovider/templates/widgets/launchpad/logout-button.html	2011-05-12 07:49:34 +0000
@@ -5,17 +5,11 @@
 
 {% load i18n %}
 
-<div id="user-info">
-    <div id="user-name">
-        {% blocktrans with user.displayname as displayname %}Logged in as <strong>{{ displayname }}</strong>{% endblocktrans %}
-        {% if token %}
-        {% if not readonly %}
-            <span class="separator">|</span>
-            <a href="./+edit" id="edit-link">{% trans "Edit" %}</a>
-        {% endif %}
-        {% endif %}
-        <span id="logout">
-        <button onclick="javascript:window.location.href='./+logout'">{% trans "Log Out" %}</button>
-        </span>
-    </div>
-</div>
+<form action="/+logout" method="post">
+    <input type="hidden" name="loggingout" value="1" />
+    {% if not readonly %}<a href="/+edit" class="sprite person">{% endif %}
+    {% if user.username %}{{ user.username }}{% else %}{{ user.displayname }}{% endif %}
+    {% if not readonly %}</a>{% endif %}
+    &bull;
+    <input type="submit" name="logout" value="Log Out" />
+</form>

=== modified file 'identityprovider/templates/widgets/recaptcha.html'
--- identityprovider/templates/widgets/recaptcha.html	2010-06-14 13:01:09 +0000
+++ identityprovider/templates/widgets/recaptcha.html	2011-05-12 07:49:34 +0000
@@ -26,10 +26,10 @@
 {% blocktrans %}It appears that our captcha service was unable to load on this page. This may be caused by a plugin on your browser. Please correct this and try again. If the problem persists, please contact <a href="https://forms.canonical.com/sso-support/">Ubuntu SSO support</a>{% endblocktrans %}
 </p>
 {% endifequal %}
-<script type="text/javascript" src="https://api-secure.recaptcha.net/challenge?k={{ CAPTCHA_PUBLIC_KEY }}{{ captcha_error }}">
+<script type="text/javascript" src="{{ CAPTCHA_API_URL_SECURE }}/challenge?k={{ CAPTCHA_PUBLIC_KEY }}{{ captcha_error }}">
 </script>
 <noscript>
-    <iframe src="https://api-secure.recaptcha.net/noscript?k={{ CAPTCHA_PUBLIC_KEY }}" height="300" width="500" frameborder="0">
+    <iframe src="{{ CAPTCHA_API_URL_SECURE }}/noscript?k={{ CAPTCHA_PUBLIC_KEY }}" height="300" width="500" frameborder="0">
     </iframe>
     <textarea name="recaptcha_challenge_field" rows="3" cols="40">
     </textarea>

=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2011-01-20 21:48:43 +0000
+++ identityprovider/views/ui.py	2011-05-12 07:49:34 +0000
@@ -413,6 +413,7 @@
     context = {
         'form': form,
         'CAPTCHA_PUBLIC_KEY': settings.CAPTCHA_PUBLIC_KEY,
+        'CAPTCHA_API_URL_SECURE': settings.CAPTCHA_API_URL_SECURE,
         # {{workflow}}
         'old': old
         }
@@ -652,6 +653,7 @@
             RequestContext(request, {
                 'form': form,
                 'CAPTCHA_PUBLIC_KEY': settings.CAPTCHA_PUBLIC_KEY,
+                'CAPTCHA_API_URL_SECURE': settings.CAPTCHA_API_URL_SECURE,
                 }))