Merge lp:~michael.nelson/ubuntu-webcatalog/923633-link-to-dev into lp:ubuntu-webcatalog

[Michael Nelson]

Add "Create your own apps for Ubunut!" link to footer.

Simply adds a "Create your own apps for Ubuntu!" link to the footer, as shown:

https://bugs.launchpad.net/ubuntu-webcatalog/+bug/923633/+attachment/2839004/+files/923633-link-to-devportal.png

I couldn't find a way to neatly add the link without adding it directly to the absolute footer. I tried the actual footer block which we override, but it adds way to much whitespace etc.

[lp:~michael.nelson/ubuntu-webcatalog/923633-link-to-dev]

74. By Michael Nelson on 2012-03-12

Updated copyright to 2012.

75. By Michael Nelson on 2012-03-12

Added XXX and linked bug for updating to use thee light theme template.

76. By Michael Nelson on 2012-03-12

Rework the copyright block to be more extensible.

=== modified file 'src/webcatalog/static/light/css/styles.css'
--- src/webcatalog/static/light/css/styles.css	2011-04-12 13:16:43 +0000
+++ src/webcatalog/static/light/css/styles.css	2012-03-12 09:08:18 +0000
@@ -128,7 +128,10 @@
     height: 40px;
     line-height: 14px;
 }
-#copyright a {
+#copyright p {
+    display: inline;
+}
+#copyright a.logo {
     background-image: url(/assets/light/images/footer_logo.png);
     width: 118px;
     height: 27px;
 
=== modified file 'src/webcatalog/templates/light/index.1col.html'
--- src/webcatalog/templates/light/index.1col.html	2012-03-05 17:41:06 +0000
+++ src/webcatalog/templates/light/index.1col.html	2012-03-12 09:08:18 +0000
@@ -136,8 +136,18 @@
             {% endblock %}
             </div>
             <div id="copyright">
-                <a href="http://www.ubuntu.com"></a>
-                <p>&copy; 2010, 2011 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
+                {% block copyright %}
+                <a class="logo" href="http://www.ubuntu.com"></a>
+                <p>&copy; 2012 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
+                {% endblock %}
+                {% comment %}
+                    XXX bug=952802 2012-03-12 michaeln Update light theme.
+                    We should not need to customise the complete index.1col.html
+                    here, we should either make the light theme itself extensible,
+                    or stop using it. Our link here to dev.ubuntu.com should
+                    really be in the footer section, but we're not currently
+                    using it.
+                {% endcomment %}
             </div>
         </div>
 
 
=== modified file 'src/webcatalog/templates/webcatalog/base.html'
--- src/webcatalog/templates/webcatalog/base.html	2012-03-05 17:41:06 +0000
+++ src/webcatalog/templates/webcatalog/base.html	2012-03-12 09:08:18 +0000
@@ -1,4 +1,5 @@
 {% extends "light/index.1col.html" %}
+{% load i18n %}
 
 {% block menus %}{% endblock %}
 
@@ -20,3 +21,6 @@
 {% endblock %}
 
 {% block footer %}{% endblock %}
+{% block copyright %}
+{{ block.super }}
+<p><a href="http://developer.ubuntu.com">{% trans "Create your own apps for Ubuntu!"%}</a></p>{% endblock %}
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-09 22:03:27 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-12 09:08:18 +0000
@@ -524,8 +524,16 @@
 
         self.assertEqual([app], response.context[0]['featured_apps'])
 
+    def test_link_to_dev_site(self):
+        response = self.client.get(reverse('wc-index'))
+
+        self.assertContains(response,
+            '<a href="http://developer.ubuntu.com">'
+            'Create your own apps for Ubuntu!</a>')
+
 
 class OverviewTestCase(TestCaseWithFactory):
+
     def test_department_contains_links_to_subdepartments(self):
         dept = self.factory.make_department('foo')
         subdept = self.factory.make_department('bar', parent=dept)