Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/938226-multiple-screenshots into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Add multiple screenthots support.

Overview
========
This branch adds ability to display multiple screenshots for an application. End result looks this: http://ubuntuone.com/7k2Jn4I2Gu9N5QnZSGDQsq

Details
=======
- added new model, ApplicationMedia, which allows tracking unlimited number of screenshots, videos and other media for each application, this will be useful when implementing video support,
- with the new model there are appropriate migrations for moving data from application attribute to the new model (most of the code are from migrations),
- added code to the template, which uses carousel to display screenthots, but only in case when there's more than one

[lp:~canonical-ca-hackers/ubuntu-webcatalog/938226-multiple-screenshots]

92. By Łukasz Czyżykowski on 2012-03-20

Added unique_together index to the ApplicationMedia to restrict possibility of multiple same urls for the same application.

93. By Łukasz Czyżykowski on 2012-03-20

Merged from trunk.

[Anthony Lenton (elachuni)]

Nice!

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-03-16 00:37:44 +0000
+++ src/webcatalog/forms.py	2012-03-20 14:12:21 +0000
@@ -29,6 +29,7 @@
 from django import forms
 from django.conf import settings
 from django.core.mail import EmailMultiAlternatives
+from django.core.validators import URLValidator
 from django.template.loader import render_to_string
 
 from webcatalog.models import Application
@@ -55,6 +56,8 @@
 
 class ApplicationForm(forms.ModelForm):
 
+    screenshot_url = forms.URLField(required=False)
+
     class Meta:
         model = Application
         exclude = ('distroseries', 'for_purchase', 'archive_id', 'price')
@@ -68,13 +71,11 @@
             if desktop_key in data:
                 data[app_key] = data[desktop_key]
                 del(data[desktop_key])
-
         try:
             instance = Application.objects.get(
                 package_name=data['package_name'], distroseries=distroseries)
         except Application.DoesNotExist:
             instance = None
-
         return cls(data=data, instance=instance)
 
     def clean(self):
@@ -86,12 +87,43 @@
             for key, value in cleaned_data.items():
                 if not value:
                     instance_value = getattr(self.instance, key, False)
+                    if hasattr(instance_value, 'all'):
+                        instance_value = instance_value.all()
                     cleaned_data[key] = instance_value or value
 
         return cleaned_data
 
+    def save(self, commit=True):
+        app = super(ApplicationForm, self).save(commit)
+        screenshot_url = self.cleaned_data['screenshot_url']
+        if screenshot_url:
+            if screenshot_url not in app.screenshots:
+                app.applicationmedia_set.create(
+                    media_type='screenshot', url=screenshot_url)
+        return app
+
+
+class MultiURLField(forms.Field):
+    def to_python(self, value):
+        "Normalize data to a list of strings."
+        # Return an empty list if no input was given.
+        if not value:
+            return []
+        return value.split(',')
+
+    def validate(self, value):
+        "Check if value consists only of valid urls."
+        # Use the parent's handling of required fields, etc.
+        super(MultiURLField, self).validate(value)
+
+        for email in value:
+            validator = URLValidator()
+            validator(email)
+
 
 class ForPurchaseApplicationForm(forms.ModelForm):
+    screenshot_urls = MultiURLField(required=False)
+
     class Meta:
         model = Application
         exclude = ('distroseries', 'section', 'popcon')
@@ -103,6 +135,8 @@
             tagline, _, description = app_data['description'].partition('\n')
             app_data['comment'] = tagline
             app_data['description'] = description
+        if 'screenshot_urls' in app_data:
+            app_data['screenshot_urls'] = ",".join(app_data['screenshot_urls'])
         try:
             instance = Application.objects.get(
                 archive_id=app_data.get('archive_id'),
@@ -116,6 +150,17 @@
         value = self.cleaned_data['version']
         return apt.apt_pkg.upstream_version(value)
 
+    def save(self, commit=True):
+        app = super(ForPurchaseApplicationForm, self).save(commit)
+        if commit:
+            self.save_screenshot_urls()
+        return app
+
+    def save_screenshot_urls(self):
+        for screenshot_url in self.cleaned_data['screenshot_urls']:
+            self.instance.applicationmedia_set.get_or_create(
+                url=screenshot_url, media_type='screenshot')
+
 
 class EmailDownloadLinkForm(forms.Form):
     email = forms.EmailField()

=== modified file 'src/webcatalog/management/commands/import_for_purchase_apps.py'
--- src/webcatalog/management/commands/import_for_purchase_apps.py	2012-03-16 01:42:36 +0000
+++ src/webcatalog/management/commands/import_for_purchase_apps.py	2012-03-20 14:12:21 +0000
@@ -76,6 +76,7 @@
             app.distroseries = distroseries
             app.for_purchase = True
             app.save()
+            form.save_screenshot_urls()
             app.update_departments()
             self.add_icon_to_app(app, data=icon_data)
             self.output(u"{0} created.\n".format(app.name).encode('utf-8'), 1)

=== added file 'src/webcatalog/migrations/0015_add_applicationmedia.py'
--- src/webcatalog/migrations/0015_add_applicationmedia.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0015_add_applicationmedia.py	2012-03-20 14:12:21 +0000
@@ -0,0 +1,169 @@
+# encoding: utf-8
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        db.create_table('webcatalog_applicationmedia', (
+            ('id',
+             self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('application',
+             self.gf('django.db.models.fields.related.ForeignKey')(
+                 to=orm['webcatalog.Application'])),
+            ('media_type',
+             self.gf('django.db.models.fields.CharField')(max_length=16)),
+            ('url',
+             self.gf('django.db.models.fields.URLField')(
+                 max_length=200, verify_exists=False)),
+        ))
+        db.send_create_signal('webcatalog', ['ApplicationMedia'])
+
+    def backwards(self, orm):
+        db.delete_table('webcatalog_applicationmedia')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [],
+                    {'max_length': '200', 'verify_exists': 'False'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'screenshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'TqnEDawbCrtYpntzTHKnAyIYkQxStI'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'QwZbSFwQynUCbUyICBRGQlveynoyGnkAXPBQnTkHXomzhKkxAe'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'wTyHCVgrQHxgbdUzoeanRdVaDvtGAojXsYoPjZaoarXzyieOmh'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== added file 'src/webcatalog/migrations/0016_populate_application_media.py'
--- src/webcatalog/migrations/0016_populate_application_media.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0016_populate_application_media.py	2012-03-20 14:12:21 +0000
@@ -0,0 +1,168 @@
+# encoding: utf-8
+from south.v2 import DataMigration
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        for app in orm.Application.objects.all():
+            if app.screenshot_url:
+                orm.ApplicationMedia.objects.create(
+                    application=app,
+                    media_type='screenshot',
+                    url=app.screenshot_url,
+                )
+
+    def backwards(self, orm):
+        for app in orm.Application.objects.all():
+            # Set first found screenshot url to the screenshot_url attribute
+            screenshots = app.applicationmedia_set.filter(
+                media_type='screenshot')
+            if screenshots.count():
+                app.screenshot_url = screenshots[0].url
+                app.save()
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'screenshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [],
+                    {'max_length': '200', 'verify_exists': 'False'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'WpxqoTmAenfQszGjGvfbFISHJhThgo'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'HVhkYAvgwlonjshHUvoeilzKvaqwvoowjADVxoonRifHvlnktE'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'xKXYwfpMJLvPvmayvjqlPqWvKrviDopKCXcnyUEkNTtWJoTXCE'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== added file 'src/webcatalog/migrations/0017_delete_screenshot_url.py'
--- src/webcatalog/migrations/0017_delete_screenshot_url.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0017_delete_screenshot_url.py	2012-03-20 14:12:21 +0000
@@ -0,0 +1,158 @@
+# encoding: utf-8
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        db.delete_column('webcatalog_application', 'screenshot_url')
+
+    def backwards(self, orm):
+        db.add_column('webcatalog_application', 'screenshot_url',
+                      self.gf('django.db.models.fields.URLField')(
+                          default='', max_length=200, blank=True),
+                      keep_default=False)
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'DuVUqQPfeNRHRxrsetXaaCgCAsqCpl'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'tKSJuAZIguDcEzJQNGqCebjlZUEosUkZtKYJcEHqtCHgipXtOs'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'gUFMuThoNMYOuRbIqLcmEiITrEcHWLibbLFOdDdaaICoVoZHyo'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== added file 'src/webcatalog/migrations/0018_add_unique_together_to_application_media.py'
--- src/webcatalog/migrations/0018_add_unique_together_to_application_media.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0018_add_unique_together_to_application_media.py	2012-03-20 14:12:21 +0000
@@ -0,0 +1,157 @@
+# encoding: utf-8
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        db.create_unique('webcatalog_applicationmedia',
+                         ['url', 'application_id'])
+
+    def backwards(self, orm):
+        db.delete_unique('webcatalog_applicationmedia',
+                         ['url', 'application_id'])
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'unique_together': "(('application', 'url'),)", 'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'RVPuZojYHnlWbiYQtZFBDrLEQFVKjR'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'hxEWMjHsidgiAoDiyBOmdzzAynmFtUySRnVTtAQxLjXgNmkMgw'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'yNkBVzMQcOPQKuzNuVWHNTjQPQAdSXGYJToNQqpsuXyioPfmMw'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/__init__.py'
--- src/webcatalog/models/__init__.py	2012-03-01 21:38:31 +0000
+++ src/webcatalog/models/__init__.py	2012-03-20 14:12:21 +0000
@@ -25,6 +25,7 @@
     # applications
     'DistroSeries',
     'Application',
+    'ApplicationMedia',
     'Department',
     'Exhibit',
     'ReviewStatsImport',
@@ -34,6 +35,7 @@
 from .oauthtoken import Token, Consumer, Nonce, DataStore
 from .applications import (
     Application,
+    ApplicationMedia,
     Department,
     DistroSeries,
     Exhibit,

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-03-19 20:43:17 +0000
+++ src/webcatalog/models/applications.py	2012-03-20 14:12:21 +0000
@@ -37,6 +37,7 @@
 __metaclass__ = type
 __all__ = [
     'Application',
+    'ApplicationMedia',
     'Department',
     'DistroSeries',
     'Exhibit',
@@ -73,8 +74,6 @@
     comment = models.CharField(max_length=255, blank=True)
     popcon = models.IntegerField(null=True, blank=True)
     channel = models.CharField(max_length=255, blank=True)
-    screenshot_url = models.URLField(blank=True, verify_exists=False,
-      help_text="Only use this if it is other than the normal screenshot url.")
     mimetype = models.CharField(max_length=2048, blank=True)
     architectures = models.CharField(max_length=255, blank=True)
     keywords = models.CharField(max_length=255, blank=True)
@@ -114,6 +113,13 @@
         return u"{0} ({1})".format(self.name, self.package_name)
 
     @property
+    def screenshots(self):
+        if not hasattr(self, '_screenshots'):
+            qs = self.applicationmedia_set.filter(media_type='screenshot')
+            self._screenshots = [am.url for am in qs]
+        return self._screenshots
+
+    @property
     def categories_set(self):
         """Return the set of categories for this app"""
         stripped = [x.strip() for x in self.categories.split(';')]
@@ -170,6 +176,28 @@
         unique_together = ('distroseries', 'archive_id')
 
 
+class ApplicationMedia(models.Model):
+    MEDIA_CHOICES = (
+        ('icon_16', 'Icon 16x16'),
+        ('icon_32', 'Icon 32x32'),
+        ('icon_64', 'Icon 64x64'),
+        ('icon_128', 'Icon 128x128'),
+        ('screenshot', 'Screenshot'),
+        ('video', 'Video'),
+        )
+
+    application = models.ForeignKey(Application)
+    media_type = models.CharField(max_length=16, choices=MEDIA_CHOICES)
+    url = models.URLField(verify_exists=False)
+
+    def __unicode__(self):
+        return "{0} for {1}".format(self.media_type, self.application)
+
+    class Meta:
+        app_label = 'webcatalog'
+        unique_together = (('application', 'url'),)
+
+
 class Department(models.Model):
     parent = models.ForeignKey('self', blank=True, null=True)
     name = models.CharField(max_length=64)

=== modified file 'src/webcatalog/static/css/carousel.css'
--- src/webcatalog/static/css/carousel.css	2012-03-19 20:43:17 +0000
+++ src/webcatalog/static/css/carousel.css	2012-03-20 14:12:21 +0000
@@ -187,6 +187,43 @@
 .featured-widget h4 {
     font-weight: bold;
 }
+
+/* Screenshots carousel */
+.screenshot .carousel-wrapper {
+    height: 190px;
+    width: 233px;
+}
+.screenshot .carousel .pagination li a.active {
+    background-color: #DD4814;
+}
+#screenshots-controls {
+    width: 70px;
+    height: 32px;
+    margin-left: 94px;
+}
+#screenshots-controls .next, #screenshots-controls .prev {
+    background: url(/assets/images/arrow-sliders.png) no-repeat 0 0;
+    float: left;
+    z-index: 20;
+    width: 32px;
+    height: 29px;
+}
+#screenshots-controls .next span, #screenshots-controls .prev span {
+    position:absolute;
+    left: -9999em;
+    height: 0;
+    width: 0;
+}
+#screenshots-controls .prev {
+    background-position:0 0;
+}
+#screenshots-controls .next {
+    background-position: -32px 0;
+}
+#screenshots-controls .prev:hover, #screenshots-controls .prev:focus,
+#screenshots-controls .next:hover, #screenshots-controls .next:focus {
+    outline: none;
+
 .top-rated-stars {
     position: relative;
     left: -50px;

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-03-16 17:18:41 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2012-03-20 14:12:21 +0000
@@ -6,7 +6,8 @@
 {% block header %}Details for {{ application.name }}{% endblock %}
 {% block head_extra %}
 {{ block.super }}
-<script src="{{ STATIC_URL }}yui/3.4.0/build/yui/yui-min.js"></script>
+<link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css&css/carousel.css"/>
+<script src="{% url wc-combo %}?yui/3.4.0/build/yui/yui-min.js&js/carousel.js"></script>
 <script>
 YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('io-base', 'node-base', function (Y) {
     function complete(id, obj){
@@ -71,8 +72,8 @@
     </div>
     <div class="description">
       <div class="screenshot">
-        {% if application.screenshot_url %}
-        <img src="{{ application.screenshot_url }}" />
+        {% if application.screenshots %}
+          {% include "webcatalog/screenshot_widget.html" %}
         {% else %}
         <img src="http://screenshots.ubuntu.com/thumbnail-with-version/{{ application.package_name }}/ignored" />
         {% endif %}

=== added file 'src/webcatalog/templates/webcatalog/screenshot_widget.html'
--- src/webcatalog/templates/webcatalog/screenshot_widget.html	1970-01-01 00:00:00 +0000
+++ src/webcatalog/templates/webcatalog/screenshot_widget.html	2012-03-20 14:12:21 +0000
@@ -0,0 +1,28 @@
+{% if application.screenshots|length_is:1 %}
+  <img src="{{ application.screenshots.0 }}" />
+{% else %}
+  <div class="carousel-wrapper">
+    <div id="screenshots-carousel" class="carousel">
+      <ol class="carouselol">
+        {% for screenshot in application.screenshots %}
+        <li class="slide{% if forloop.counter > 1 %} disabled{% endif %}">
+          <img src="{{ screenshot }}" />
+        </li>
+        {% endfor %}
+      </ol>
+    </div>
+  </div>
+  <div id="screenshots-controls"></div>
+  <script type="text/javascript">
+  YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
+      var caro = new Y.uwc.Carousel({
+          nodeContainer: "#screenshots-carousel",
+          controlsContainer: "#screenshots-controls",
+          containerHeight: 170,
+          containerWidth: 225,
+          autoPlay: true
+      });
+      Y.all('.slide').removeClass('disabled');
+  });
+  </script>
+{% endif %}

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-03-16 19:27:47 +0000
+++ src/webcatalog/tests/factory.py	2012-03-20 14:12:21 +0000
@@ -30,6 +30,7 @@
 
 from webcatalog.models import (
     Application,
+    ApplicationMedia,
     Consumer,
     Department,
     DistroSeries,
@@ -106,15 +107,22 @@
         if distroseries is None:
             distroseries = self.make_distroseries()
 
-        return Application.objects.create(
+        application = Application.objects.create(
             package_name=package_name, name=name, comment=comment,
             description=description, popcon=999, icon=icon,
             icon_name=icon_name, distroseries=distroseries, architectures=arch,
             ratings_average=ratings_average, ratings_total=ratings_total,
-            ratings_histogram=ratings_histogram, screenshot_url=screenshot_url,
+            ratings_histogram=ratings_histogram,
             archive_id=archive_id, version=version, is_latest=is_latest,
             wilson_score=wilson_score)
 
+        if screenshot_url:
+            ApplicationMedia.objects.create(
+                application=application,
+                url=screenshot_url,
+                media_type='screenshot')
+        return application
+
     def make_department(self, name, parent=None, slug=None):
         if slug is None:
             slug = self.get_unique_string(prefix='slug-')

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-03-16 19:27:47 +0000
+++ src/webcatalog/tests/test_commands.py	2012-03-20 14:12:21 +0000
@@ -483,6 +483,14 @@
             distroseries=self.natty)
         self.assertTrue(app.is_latest)
 
+    def test_app_gets_screenshots(self):
+        call_command('import_for_purchase_apps')
+
+        app = Application.objects.get(package_name='hello',
+            distroseries=self.natty)
+        qs = app.applicationmedia_set.filter(media_type='screenshot')
+        self.assertEqual(2, qs.count())
+
 
 class ImportRatingsTestCase(TestCaseWithFactory):
 
@@ -561,7 +569,7 @@
         self.assertEqual(Decimal('4.00'), scribus.ratings_average)
         self.assertEqual(4, scribus.ratings_total)
         self.assertEqual('[0, 1, 0, 1, 2]', scribus.ratings_histogram)
-        self.assertEqual(3.36480032198111, scribus.wilson_score)
+        self.assertAlmostEqual(3.36480032198111, scribus.wilson_score)
         otherapp = Application.objects.get(id=otherapp.id)
         self.assertEqual(None, otherapp.ratings_total)
 

=== modified file 'src/webcatalog/tests/test_data/sca_apps.txt'
--- src/webcatalog/tests/test_data/sca_apps.txt	2012-03-13 14:09:29 +0000
+++ src/webcatalog/tests/test_data/sca_apps.txt	2012-03-20 14:12:21 +0000
@@ -10,6 +10,10 @@
         "archive_id": "launchpad_zematynnad2/myppa",
         "icon_data": "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",
         "screenshot_url": "",
+        "screenshot_urls": [
+                "http://localhost:8000/screenshot_1.png",
+                "http://localhost:8000/screenshot_2.png"
+        ],
         "archive_root": "",
         "tos_url": "",
         "icon_url": "http://localhost:8000/site_media/icons/2011/06/eg_64x64.png",

=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/tests/test_forms.py	2012-03-20 14:12:21 +0000
@@ -28,7 +28,7 @@
     ApplicationForm,
     desktop_field_mappings,
     )
-from webcatalog.models import Application
+from webcatalog.models import Application, ApplicationMedia
 from webcatalog.tests.factory import TestCaseWithFactory
 
 __metaclass__ = type
@@ -132,6 +132,26 @@
             self.assertEqual(
                 extra_desktop_info[key], form.cleaned_data[form_key])
 
+    def test_screenshot_url_is_properly_saved_as_application_media(self):
+        app = self.factory.make_application()
+        extra_desktop_info = {
+            'X-AppInstall-Screenshot-Url': 'http://example.com/screenshot',
+            'X-AppInstall-Package': app.package_name,
+            }
+        desktop_entry = self.get_desktop_entry(self.get_desktop_data(
+            extra_desktop_info))
+
+        form = ApplicationForm.get_form_from_desktop_data(desktop_entry,
+            distroseries=app.distroseries)
+        form.save()
+
+        app = Application.objects.get(pk=app.pk)
+
+        self.assertTrue('http://example.com/screenshot' in app.screenshots)
+        self.assertTrue(ApplicationMedia.objects.filter(
+            application=app, media_type='screenshot',
+            url='http://example.com/screenshot').exists())
+
     def test_screenshot_url_isnt_verified(self):
         # Verifying if this URLField actually exists is a bad idea:
         # - It expects us to allow arbitrary outgoing connections from the DC

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-20 11:12:02 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-20 14:12:21 +0000
@@ -60,6 +60,10 @@
 
 class ApplicationDetailTestCase(TestCaseWithFactory):
 
+    def get_app_details_url(self, app):
+        return reverse('wc-package-detail',
+                       args=[app.distroseries.code_name, app.package_name])
+
     def get_app_and_response(self, code_name='natty', version='11.04',
                              arch='x86_64', name=None, comment=None,
                              description=None, detail_distro=None,
@@ -216,9 +220,7 @@
 
         app.for_purchase = True
         app.save()
-        url = reverse('wc-package-detail', args=[app.distroseries.code_name,
-            app.package_name])
-        response = self.client.get(url)
+        response = self.client.get(self.get_app_details_url(app))
         self.assertContains(response, '<td>Proprietary</td>')
         self.assertNotContains(response, '<td>Open Source</td>')
 
@@ -241,8 +243,7 @@
     def test_email_for_download_contents(self):
         response, app = self.get_app_and_response(name="salamander")
         data = {'email': '[e-mail]'}
-        args = [app.distroseries.code_name, app.package_name]
-        url = reverse('wc-package-detail', args=args)
+        url = self.get_app_details_url(app)
 
         self.client.post(url, data=data, follow=True)
 
@@ -254,8 +255,7 @@
     def test_email_for_download_success_message(self):
         response, app = self.get_app_and_response(name="salamander")
         data = {'email': '[e-mail]'}
-        args = [app.distroseries.code_name, app.package_name]
-        url = reverse('wc-package-detail', args=args)
+        url = self.get_app_details_url(app)
 
         response = self.client.post(url, data=data, follow=True)
 
@@ -265,8 +265,7 @@
     def test_email_error_blank(self):
         response, app = self.get_app_and_response(name="salamander")
         data = {'email': ''}
-        args = [app.distroseries.code_name, app.package_name]
-        url = reverse('wc-package-detail', args=args)
+        url = self.get_app_details_url(app)
 
         response = self.client.post(url, data=data, follow=True)
 
@@ -277,8 +276,7 @@
     def test_email_error_bogus(self):
         response, app = self.get_app_and_response(name="salamander")
         data = {'email': 'bogus'}
-        args = [app.distroseries.code_name, app.package_name]
-        url = reverse('wc-package-detail', args=args)
+        url = self.get_app_details_url(app)
 
         response = self.client.post(url, data=data, follow=True)
 
@@ -290,9 +288,7 @@
         app = self.factory.make_application(version='1.2.3',
             distroseries=self.factory.make_distroseries())
 
-        url = reverse('wc-package-detail', kwargs=dict(
-            distro=app.distroseries.code_name, package_name=app.package_name))
-        response = self.client.get(url)
+        response = self.client.get(self.get_app_details_url(app))
 
         self.assertContains(response, '<th>Version:</th>')
         self.assertContains(response, '<td>1.2.3</td>')
@@ -301,12 +297,27 @@
         app = self.factory.make_application(version='',
             distroseries=self.factory.make_distroseries())
 
-        url = reverse('wc-package-detail', kwargs=dict(
-            distro=app.distroseries.code_name, package_name=app.package_name))
-        response = self.client.get(url)
+        response = self.client.get(self.get_app_details_url(app))
 
         self.assertNotContains(response, '<th>Version</th>')
 
+    def test_with_only_one_screenshot_there_is_no_carousel(self):
+        response, _ = self.get_app_and_response(
+            screenshot_url='http://example.com/screenshot.png')
+
+        self.assertNotContains(response, 'Y.uwc.Carousel')
+
+    def test_with_multiple_screenshots_there_is_js_carousel(self):
+        app = self.factory.make_application()
+        for i in range(3):
+            app.applicationmedia_set.create(
+                url='http://example.com/{}.png'.format(i),
+                media_type='screenshot')
+
+        response = self.client.get(self.get_app_details_url(app))
+
+        self.assertContains(response, 'id="screenshots-carousel"')
+
 
 class ApplicationDetailNoSeriesTestCase(TestCaseWithFactory):
     def test_renders_latest(self):