Merge lp:~elachuni/ubuntu-webcatalog/hib-widget into lp:ubuntu-webcatalog

[Anthony Lenton]

Added a little HIB widget for HIB apps.

This branch adds a little HIB widget for HIB apps.

[lp:~elachuni/ubuntu-webcatalog/hib-widget]

129. By Anthony Lenton on 2012-05-31

Added tests for the hib widget.

130. By Anthony Lenton on 2012-05-31

Added a bit of padding.

131. By Anthony Lenton on 2012-05-31

Small template improvements.

132. By Anthony Lenton on 2012-05-31

Margin fix.

[Natalia Bidart (nataliabidart)]

Looks good! Thanks.

review: Approve

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2012-05-30 22:39:39 +0000
+++ src/webcatalog/schema.py	2012-05-31 21:29:18 +0000
@@ -61,6 +61,8 @@
         number_top_rated_apps = schema.IntOption(default=8)
         screenshots_base_url = schema.StringOption(
             default='http://screenshots.ubuntu.com/')
+        hib_apps = schema.ListOption(item=schema.StringOption(),
+            default=[])
 
     class google(schema.Section):
         google_analytics_id = schema.StringOption()

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-05-29 07:49:06 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2012-05-31 21:29:18 +0000
@@ -109,6 +109,12 @@
       <p>{{ application.description|htmlize_package_description }}</p>
       <div class="install-button">{% install_options application %}</div>
     </div>
+    {% if display_hib_widget %}
+    <div id="hib-widget" style="width: 652px; padding:24px 16px 8px; clear:both">
+        <p>{{ application.name }} is currently also available as part of the <a href="http://www.humblebundle.com/?utm_source=ubuntu">Humble Bundle</a></p>
+    <iframe style="display: block; margin:0 auto; border:none;" src="http://www.humblebundle.com/_widget/html" width="410" height="150"></iframe>
+    </div>
+    {% endif %}
     <div class="license">
       <table>
         <tr>

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-05-29 07:49:06 +0000
+++ src/webcatalog/tests/test_views.py	2012-05-31 21:29:18 +0000
@@ -196,6 +196,18 @@
         self.assertContains(response, "Tweet</a>")
         self.assertContains(response, "https://twitter.com/share")
 
+    def test_hib_widget_is_present_for_hib_apps(self):
+        with patch_settings(HIB_APPS=['pkgfoo']):
+            response, app = self.get_app_and_response()
+
+        self.assertContains(response, '<div id="hib-widget"')
+
+    def test_hib_widget_not_present_for_non_hib_apps(self):
+        with patch_settings(HIB_APPS=['something', 'different']):
+            response, app = self.get_app_and_response()
+
+        self.assertNotContains(response, '<div id="hib-widget"')
+
     def test_twitter_link_does_not_contain_none(self):
         app = self.factory.make_application()
 

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-05-25 07:43:26 +0000
+++ src/webcatalog/views.py	2012-05-31 21:29:18 +0000
@@ -209,6 +209,8 @@
 
     debtags = None if not app.debtags else json.loads(app.debtags)
 
+    hib_apps = getattr(settings, 'HIB_APPS', [])
+
     atts = {'application': app,
         'available_distroseries': app.available_distroseries(),
         'breadcrumbs': app.crumbs(),
@@ -217,6 +219,7 @@
             reverse('wc-package-detail', args=[package_name])),
         'email_form': form,
         'debtags': debtags,
+        'display_hib_widget': app.package_name in hib_apps
         }
 
     return render_to_response(