Merge lp:~elachuni/ubuntu-webcatalog/navigation into lp:ubuntu-webcatalog

[Anthony Lenton]

Add a right sidebar navigation portlet to switch between distroseries

Overview
========
Add a right sidebar navigation portlet to switch between distroseries

Details
=======

The portlet was added both on the application details and the department overview screens. For that we needed to provide a distroseries-specific department overview url.
For consistency, I made the distroseries-specific url for apps specify the distroseries before the package name.

While I was there, I
- Fixed the breadcrumbs background to work with apps with extra-long names (like "A tool for the blackbox/fluxbox window managers that runs commands" -- package bbrun)

- Registered DistroSeries with the admin

[lp:~elachuni/ubuntu-webcatalog/navigation]

41. By Anthony Lenton on 2011-07-01

Test fix.

42. By Anthony Lenton on 2011-07-01

Just bumping rev.

[Danny Tamez (zematynnad)]

Looks fine.

review: Approve

=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2011-06-17 16:21:59 +0000
+++ src/webcatalog/admin.py	2011-07-01 17:17:27 +0000
@@ -25,6 +25,7 @@
 from webcatalog.models import (
     Application,
     Department,
+    DistroSeries,
     )
 
 __metaclass__ = type
@@ -41,3 +42,4 @@
 
 admin.site.register(Application, ApplicationAdmin)
 admin.site.register(Department)
+admin.site.register(DistroSeries)
 
=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2011-06-29 14:42:24 +0000
+++ src/webcatalog/models/applications.py	2011-07-01 17:17:27 +0000
@@ -99,6 +99,11 @@
         stripped = [x.strip() for x in self.categories.split(';')]
         return set(x for x in stripped if x)
 
+    def available_distroseries(self):
+        """Return the set of distroseries for which this app is available"""
+        return DistroSeries.objects.filter(
+            application__package_name=self.package_name).order_by('version')
+
     @classmethod
     def from_json(cls, data):
         app = Application()
 
=== modified file 'src/webcatalog/static/css/webcatalog.css'
--- src/webcatalog/static/css/webcatalog.css	2011-06-23 14:49:53 +0000
+++ src/webcatalog/static/css/webcatalog.css	2011-07-01 17:17:27 +0000
@@ -16,6 +16,8 @@
     -webkit-box-shadow: #bbb 2px 2px 5px 1px;
     margin: 12px 0 20px;
     font-size: 14px;
+    width: 684px;
+    float: left;
 }
 
 #sc-mockup h2 {
@@ -44,7 +46,7 @@
 }
 .screenshot {
     float: right;
-    margin-right: 16px;
+    margin: 0 16px;
 }
 
 .noscreenshot {
@@ -73,14 +75,63 @@
 
 /* End software centre mockup */
 
+/* Right sidebar */
+#rightbar {
+    float: right;
+    width: 206px;
+    margin-top: 28px;
+}
+
+.portletheader {
+    padding: 10px 8px;
+    font-size: 14px;
+    background: #DD4814;
+    color: white;
+    -moz-border-radius: 4px 4px 0 0;
+    -webkit-border-radius: 4px 4px 0 0;
+    -khtml-border-radius: 4px 4px 0 0;
+    border-radius: 4px 4px 0 0;
+}
+
+ul.portletactions {
+    font-size: 12px;
+    list-style-image: none;
+}
+
+ul.portletactions li {
+    border-bottom: 1px dotted gray;
+    margin: 0;
+}
+
+ul.portletactions li a, ul.portletactions li span {
+    padding: 8px;
+    display: block;
+    color: black;
+}
+
+ul.portletactions li.active span, ul.portletactions a:hover {
+    background: transparent url("/assets/images/subnav_active_bg.png");
+    color: #E24912;
+    text-decoration: none;
+}
+/* End right sidebar */
+
+.main-column {
+    width: 684px;
+    float: left;
+}
 .app-overview-row {
-    height: 36px;
+    min-height: 36px;
     padding: 2px;
 }
 .app-overview-row img {
     float: left;
     margin-right: 10px;
 }
+.app-overview-text {
+    float: left;
+    width: 634px;
+}
 .app-overview-row h3 {
     padding: 0;
     margin: 0;
 
=== added file 'src/webcatalog/static/images/applications-other-64.png'
 Binary files src/webcatalog/static/images/applications-other-64.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/applications-other-64.png	2011-07-01 17:17:27 +0000 differ
=== added file 'src/webcatalog/static/images/applications-other.png'
 Binary files src/webcatalog/static/images/applications-other.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/applications-other.png	2011-07-01 17:17:27 +0000 differ
=== modified file 'src/webcatalog/static/images/breadcrumbs_bg.png'
 Binary files src/webcatalog/static/images/breadcrumbs_bg.png	2011-06-23 14:20:52 +0000 and src/webcatalog/static/images/breadcrumbs_bg.png	2011-07-01 17:17:27 +0000 differ
=== added file 'src/webcatalog/static/images/subnav_active_bg.png'
 Binary files src/webcatalog/static/images/subnav_active_bg.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/subnav_active_bg.png	2011-07-01 17:17:27 +0000 differ
=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2011-06-29 09:24:48 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2011-07-01 17:17:27 +0000
@@ -7,13 +7,27 @@
 
 {% block content %}
     {% include "webcatalog/breadcrumbs_snippet.html" %}
-
+    <div id="rightbar">
+        <div class="portlet">
+            <div class="portletheader">Available versions</div>
+            <ul class="portletactions">
+                {% for ds in available_distroseries %}
+                <li class="item{% ifequal ds.code_name distroseries %} active{% endifequal %}{% if forloop.last %} last{% endif %}">
+                    {% ifequal ds.code_name distroseries %}
+                        <span>Ubuntu {{ ds.version }} ({{ ds.code_name }})</span>
+                    {% else %}
+                        <a href="{% url wc-package-detail ds.code_name application.package_name %}">Ubuntu {{ ds.version }} ({{ ds.code_name }})</a>
+                    {% endifequal %}</li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
   <div id="sc-mockup">
     <div class="header">
       {% if application.icon %}
           <img class="icon64" src="{{ application.icon.url }}"/>
       {% else %}
-          <img class="icon64" src="{{ STATIC_URL }}images/noicon_32.png"/>
+          <img class="icon64" src="{{ STATIC_URL }}images/applications-other-64.png"/>
       {% endif %}
 
       <h2>{{ application.name }}</h2>
 
=== modified file 'src/webcatalog/templates/webcatalog/application_overview_snippet.html'
--- src/webcatalog/templates/webcatalog/application_overview_snippet.html	2011-06-28 15:03:12 +0000
+++ src/webcatalog/templates/webcatalog/application_overview_snippet.html	2011-07-01 17:17:27 +0000
@@ -1,11 +1,15 @@
 <div class="app-overview-row">
+    <div>
     {% if app.icon %}
         <img src="{{ app.icon.url }}" width="32" height="32" />
     {% else %}
-        <img src="{{ STATIC_URL }}images/noicon_32.png"/>
+        <img src="{{ STATIC_URL }}images/applications-other.png"/>
     {% endif %}
-    <h3>
-    <a href="{% url wc-package-detail app.distroseries.code_name app.package_name %}">{{ app.name }}</a>
-    </h3>
-    <p>{{ app.comment }}</p>
+    </div>
+    <div class="app-overview-text">
+        <h3>
+        <a href="{% url wc-package-detail app.distroseries.code_name app.package_name %}">{{ app.name }}</a>
+        </h3>
+        <p>{{ app.comment }}</p>
+    </div>
 </div>
 
=== modified file 'src/webcatalog/templates/webcatalog/department_overview.html'
--- src/webcatalog/templates/webcatalog/department_overview.html	2011-06-28 15:03:12 +0000
+++ src/webcatalog/templates/webcatalog/department_overview.html	2011-07-01 17:17:27 +0000
@@ -7,6 +7,23 @@
 {% block content %}
     {% include "webcatalog/breadcrumbs_snippet.html" %}
 
+    <div id="rightbar">
+        <div class="portlet">
+            <div class="portletheader">Available versions</div>
+            <ul class="portletactions">
+                {% for ds in available_distroseries %}
+                <li class="item{% ifequal ds.code_name distroseries %} active{% endifequal %}{% if forloop.last %} last{% endif %}">
+                    {% ifequal ds.code_name distroseries %}
+                        <span>Ubuntu {{ ds.version }} ({{ ds.code_name }})</span>
+                    {% else %}
+                        <a href="{% url wc-department ds.code_name dept.id %}">Ubuntu {{ ds.version }} ({{ ds.code_name }})</a>
+                    {% endifequal %}</li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+
+<div class="main-column">
 {% if subdepts %}
 <h3>{% trans "Subsections" %}:</h3>
 
@@ -26,5 +43,6 @@
 {% else %}
 <p>{% trans "No applications found." %}</p>
 {% endif %}
+</div>
 
 {% endblock %}
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-06-29 15:24:23 +0000
+++ src/webcatalog/tests/test_views.py	2011-07-01 17:17:27 +0000
@@ -68,7 +68,8 @@
         if not detail_package:
             detail_package = app.package_name
 
-        url = reverse('wc-package-detail', args=[detail_package, detail_distro])
+        url = reverse('wc-package-detail', args=[detail_distro,
+            detail_package])
 
         if useragent:
             response = self.client.get(url, HTTP_USER_AGENT=useragent)
@@ -134,6 +135,22 @@
             '<a href="{lucid_app_url}">your version of Ubuntu</a>.'.format(
                 lucid_app_url=lucid_app_url))
 
+    def test_includes_right_navigation(self):
+        lucid = self.factory.make_distroseries(code_name='lucid',
+            version='10.04')
+        maverick = self.factory.make_distroseries(code_name='maverick',
+            version='10.10')
+        lucid_app = self.factory.make_application(package_name='pkgfoo',
+            distroseries=lucid)
+        maverick_app = self.factory.make_application(package_name='pkgfoo',
+            distroseries=maverick)
+
+        response, app = self.get_app_and_response(name="Foobar")
+
+        for ds in ['lucid', 'maverick']:
+            url = reverse('wc-package-detail', args=[ds, 'pkgfoo'])
+            self.assertContains(response, '<a href="{0}">Ubuntu'.format(url))
+
 
 class ApplicationDetailNoSeriesTestCase(TestCaseWithFactory):
 
@@ -155,7 +172,7 @@
 
                 self.assertRedirects(
                     response, reverse(
-                        'wc-package-detail', args=['pkgfoo', default_distro]))
+                        'wc-package-detail', args=[default_distro, 'pkgfoo']))
 
     def test_redirects_to_ua_distroseries(self):
         # If a distroseries is not included in the url, but we
@@ -175,7 +192,7 @@
 
         self.assertRedirects(
             response, reverse(
-                'wc-package-detail', args=['pkgfoo', 'lucid']))
+                'wc-package-detail', args=['lucid', 'pkgfoo']))
 
 
 class SearchTestCase(TestCaseWithFactory):
@@ -297,7 +314,8 @@
         dept = self.factory.make_department('foo')
         subdept = self.factory.make_department('bar', parent=dept)
 
-        response = self.client.get(reverse('wc-department', args=[dept.id]))
+        response = self.client.get(reverse('wc-department', args=[
+            settings.DEFAULT_DISTRO, dept.id]))
 
         self.assertContains(response, reverse('wc-department',
             args=[subdept.id]))
@@ -307,7 +325,8 @@
         dept = self.factory.make_department('bar')
         app.departments.add(dept)
 
-        response = self.client.get(reverse('wc-department', args=[dept.id]))
+        response = self.client.get(reverse('wc-department', args=[
+            app.distroseries.code_name, dept.id]))
 
         self.assertContains(response, reverse('wc-package-detail',
             args=[app.distroseries.code_name, app.package_name]))
@@ -315,17 +334,19 @@
     def test_department_with_no_subdepts_doesnt_contain_header(self):
         dept = self.factory.make_department('bar')
 
-        response = self.client.get(reverse('wc-department', args=[dept.id]))
+        response = self.client.get(reverse('wc-department', args=[
+            settings.DEFAULT_DISTRO, dept.id]))
 
         self.assertNotContains(response, 'Subsections')
 
     def test_department_shows_paginated_results(self):
         dept = self.factory.make_department('bar')
+        lucid = self.factory.make_distroseries(code_name='lucid')
         for count in range(3):
-            app = self.factory.make_application()
+            app = self.factory.make_application(distroseries=lucid)
             app.departments.add(dept)
 
-        url = reverse('wc-department', args=[dept.id])
+        url = reverse('wc-department', args=['lucid', dept.id])
         with patch_settings(PAGE_BATCH_SIZE=2):
             response = self.client.get(url)
 
@@ -340,8 +361,7 @@
 
     def test_invalid_page_doesnt_error(self):
         dept = self.factory.make_department('bar')
-        url = reverse('wc-department', args=[dept.id])
-
+        url = reverse('wc-department', args=[settings.DEFAULT_DISTRO, dept.id])
         response = self.client.get(url, data={'page': 'aef8'})
         page = response.context['page']
         self.assertEqual(1, page.number)
@@ -353,3 +373,18 @@
         response = self.client.get(url, data={'page': '999'})
         page = response.context['page']
         self.assertEqual(1, page.number)
+
+    def test_department_includes_right_navigation(self):
+        dept = self.factory.make_department('bar')
+        lucid = self.factory.make_distroseries(code_name='lucid',
+            version='10.04')
+        maverick = self.factory.make_distroseries(code_name='maverick',
+            version='10.10')
+
+        response = self.client.get(reverse('wc-department', args=[
+            settings.DEFAULT_DISTRO, dept.id]))
+
+        for ds in ['lucid', 'maverick']:
+            url = reverse('wc-department', args=[ds, dept.id])
+            self.assertContains(response, '<a href="{0}">Ubuntu'.format(url))
+
 
=== modified file 'src/webcatalog/urls.py'
--- src/webcatalog/urls.py	2011-06-29 12:47:09 +0000
+++ src/webcatalog/urls.py	2011-07-01 17:17:27 +0000
@@ -31,9 +31,11 @@
 
 urlpatterns = patterns('webcatalog.views',
     url(r'^$', 'index', name='wc-index'),
+    url(r'^department/(?P<distro>[-.+\w]+)/(?P<dept_id>\d+)/$',
+        'department_overview', name='wc-department'),
     url(r'^department/(?P<dept_id>\d+)/$', 'department_overview',
         name='wc-department'),
-    url(r'^applications/(?P<package_name>[-.+\w]+)/(?P<distro>[-.+\w]+)/$',
+    url(r'^applications/(?P<distro>[-.+\w]+)/(?P<package_name>[-.+\w]+)/$',
         'application_detail', name="wc-package-detail"),
     url(r'^applications/(?P<package_name>[-.+\w]+)/$', 'application_detail',
         name="wc-package-detail"),
 
=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2011-06-30 16:38:56 +0000
+++ src/webcatalog/views.py	2011-07-01 17:17:27 +0000
@@ -39,6 +39,7 @@
 from webcatalog.models import (
     Application,
     Department,
+    DistroSeries,
     )
 from webcatalog.utilities import UserAgentString
 
@@ -95,11 +96,24 @@
         context_instance=context)
 
 
-def department_overview(request, dept_id):
+def department_overview(request, dept_id, distro=None):
+    if distro is None:
+        useragent = UserAgentString(request.META.get('HTTP_USER_AGENT', ''))
+        # Check for the distroseries in the useragent, if we have it,
+        # redirect there.
+        if useragent.distroseries:
+            distro = useragent.distroseries
+        else:
+            distro = settings.DEFAULT_DISTRO
+        return HttpResponseRedirect(
+            reverse('wc-department', args=[distro, dept_id]))
+
     dept = get_object_or_404(Department, pk=dept_id)
     subdepts = Department.objects.filter(parent=dept)
     subdepts = subdepts.order_by('name')
-    apps = Application.objects.filter(departments=dept)
+    
+    apps = Application.objects.filter(departments=dept,
+        distroseries__code_name=distro)
     apps = apps.order_by('name')
     paginator = Paginator(apps, settings.PAGE_BATCH_SIZE)
     page_num = _get_page_num_from_request(request, paginator)
@@ -108,6 +122,8 @@
         'subdepts': subdepts,
         'page': paginator.page(page_num),
         'breadcrumbs': dept.crumbs(),
+        'available_distroseries': DistroSeries.objects.all(),
+        'distroseries': distro,
         })
     return render_to_response('webcatalog/department_overview.html',
         context_instance=context)
@@ -125,11 +141,16 @@
             distro = settings.DEFAULT_DISTRO
         return HttpResponseRedirect(
             reverse('wc-package-detail',
-                    args=[package_name, distro]))
+                    args=[distro, package_name]))
 
     app = get_object_or_404(Application, package_name=package_name,
                             distroseries__code_name=distro)
+    atts = {'application': app,
+        'available_distroseries': app.available_distroseries(),
+        'breadcrumbs': app.crumbs(),
+        'distroseries': distro,
+        }
 
     return render_to_response(
         'webcatalog/application_detail.html', RequestContext(
-            request, dict(application=app, breadcrumbs=app.crumbs())))
+            request, atts))