Merge lp:~michael.nelson/ubuntu-webcatalog/bigger-stars into lp:ubuntu-webcatalog

[Michael Nelson]

Use bigger star images for ratings (from recent USC tree).

Overview
========

This branch updates the images used for the rating summary (the stars):

http://people.canonical.com/~michaeln/tmp/bigger-stars-list.png

and enables large stars to be used for the detail view:

http://people.canonical.com/~michaeln/tmp/bigger-stars-detail.png

Details
=======
Turns out, since I did the first version of the stars on webcat, softwarecenter had the new qml interface added to trunk, which includes png's of the small and large stars (which I've used here).

To test:
`fab test`

[David Owen (dsowen)]

Nice use of parameters on the template tag (nice use of template tags, even).

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-07-19 15:44:09 +0000
+++ .bzrignore	2011-08-15 11:39:22 +0000
@@ -11,3 +11,4 @@
 sourcecode/framework/
 sourcecode/django/
 django_project/rnrclient.py
+django_project/adminaudit

=== modified file 'src/webcatalog/static/css/webcatalog.css'
--- src/webcatalog/static/css/webcatalog.css	2011-08-09 19:48:37 +0000
+++ src/webcatalog/static/css/webcatalog.css	2011-08-15 11:39:22 +0000
@@ -210,6 +210,9 @@
     width: 100px;
     float: right;
 }
+.star-rating.large {
+    width: 175px;
+}
 #sc-mockup .star-rating img {
     margin: 0;
     float: none;

=== added file 'src/webcatalog/static/images/star-large-0.5.png'
Binary files src/webcatalog/static/images/star-large-0.5.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/star-large-0.5.png	2011-08-15 11:39:22 +0000 differ
=== added file 'src/webcatalog/static/images/star-large-0.png'
Binary files src/webcatalog/static/images/star-large-0.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/star-large-0.png	2011-08-15 11:39:22 +0000 differ
=== added file 'src/webcatalog/static/images/star-large-1.png'
Binary files src/webcatalog/static/images/star-large-1.png	1970-01-01 00:00:00 +0000 and src/webcatalog/static/images/star-large-1.png	2011-08-15 11:39:22 +0000 differ
=== renamed file 'src/webcatalog/static/images/star-0.5.png' => 'src/webcatalog/static/images/star-small-0.5.png'
Binary files src/webcatalog/static/images/star-0.5.png	2011-07-21 12:57:52 +0000 and src/webcatalog/static/images/star-small-0.5.png	2011-08-15 11:39:22 +0000 differ
=== renamed file 'src/webcatalog/static/images/star-0.png' => 'src/webcatalog/static/images/star-small-0.png'
Binary files src/webcatalog/static/images/star-0.png	2011-07-21 12:57:52 +0000 and src/webcatalog/static/images/star-small-0.png	2011-08-15 11:39:22 +0000 differ
=== renamed file 'src/webcatalog/static/images/star-1.png' => 'src/webcatalog/static/images/star-small-1.png'
Binary files src/webcatalog/static/images/star-1.png	2011-07-21 12:57:52 +0000 and src/webcatalog/static/images/star-small-1.png	2011-08-15 11:39:22 +0000 differ
=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2011-08-09 19:48:37 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2011-08-15 11:39:22 +0000
@@ -24,7 +24,7 @@
     </div>
   <div id="sc-mockup">
     <div class="header">
-      {% rating_summary application %}
+      {% rating_summary application 'large' %}
       {% if application.icon %}
           <img class="icon64" src="{{ application.icon.url }}"/>
       {% else %}

=== modified file 'src/webcatalog/templates/webcatalog/rating_summary.html'
--- src/webcatalog/templates/webcatalog/rating_summary.html	2011-07-21 11:31:10 +0000
+++ src/webcatalog/templates/webcatalog/rating_summary.html	2011-08-15 11:39:22 +0000
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% if total %}
-<div class="star-rating">
+<div class="star-rating {{ size }}">
   {% for star in stars %}
-  <img src="{{ STATIC_URL }}images/star-{{ star }}.png" />
+  <img src="{{ STATIC_URL }}images/star-{{ size }}-{{ star }}.png" />
   {% endfor %}
   <p>{% blocktrans %}{{ total }} Ratings{% endblocktrans %}</p>
 </div>

=== modified file 'src/webcatalog/templatetags/webcatalog.py'
--- src/webcatalog/templatetags/webcatalog.py	2011-07-21 13:38:37 +0000
+++ src/webcatalog/templatetags/webcatalog.py	2011-08-15 11:39:22 +0000
@@ -183,7 +183,7 @@
 
 
 @register.inclusion_tag("webcatalog/rating_summary.html")
-def rating_summary(app):
+def rating_summary(app, size='small'):
     stars = []
     if not app.ratings_average:
         return {}
@@ -198,4 +198,4 @@
             stars.append(0)
 
     return dict(stars=stars, total=app.ratings_total,
-        STATIC_URL=settings.STATIC_URL)
+        STATIC_URL=settings.STATIC_URL, size=size)

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-08-09 19:48:37 +0000
+++ src/webcatalog/tests/test_views.py	2011-08-15 11:39:22 +0000
@@ -181,7 +181,7 @@
         url = reverse('wc-package-detail', args=['lucid', 'foo'])
         response = self.client.get(url)
 
-        self.assertContains(response, 'images/star-1.png', 3)
+        self.assertContains(response, 'images/star-large-1.png', 3)
         self.assertContains(response, '23 Ratings', 1)
 
 
@@ -312,7 +312,7 @@
 
         response = self.client.get(url, data={'q': query})
 
-        self.assertContains(response, 'images/star-1.png', 3)
+        self.assertContains(response, 'images/star-small-1.png', 3)
         self.assertContains(response, '23 Ratings', 1)
 
     def test_response_shows_number_of_apps_found(self):
@@ -476,7 +476,7 @@
         url = reverse('wc-department', args=['lucid', dept.id])
         response = self.client.get(url)
 
-        self.assertContains(response, 'images/star-1.png', 3)
+        self.assertContains(response, 'images/star-small-1.png', 3)
         self.assertContains(response, '23 Ratings', 1)
 
     def test_invalid_distroseries_returns_404(self):