Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/show-gadgetsnap-images into lp:developer-ubuntu-com

[Daniel Holbach]

Show gadget snap images (icon_url instead of screenshot_url) and display a more readable name.

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/show-gadgetsnap-images]

169. By Daniel Holbach on 2015-11-10

remove unnecessary blank line

170. By David Callé on 2015-11-10

Add shortlist CMS plugin for gadget snaps, layout fixes

[Daniel Holbach (dholbach)]

Good to go!

review: Approve

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/show-gadgetsnap-images]

171. By Daniel Holbach on 2015-11-10

simplify code and style generic-* snap names as well

172. By Daniel Holbach on 2015-11-10

use title field instead

173. By Daniel Holbach on 2015-11-10

fix -community name

174. By Daniel Holbach on 2015-11-10

add website field for store api

=== modified file 'developer_portal/templatetags/text_extras.py'
--- developer_portal/templatetags/text_extras.py	2015-07-02 19:51:07 +0000
+++ developer_portal/templatetags/text_extras.py	2015-11-10 14:53:00 +0000
@@ -24,3 +24,11 @@
 @register.filter
 def string(integer):
     return str(integer)
+
[e-mail]
+def style_snap_name(snap_name):
+    if snap_name.startswith('generic-'):
+        return 'Generic {}'.format(snap_name.split('-')[1])
+    if snap_name.endswith('-community'):
+        return snap_name.replace('-community', '').title()
+    return snap_name.split('.')[0].title()

=== modified file 'store_data/cms_plugins.py'
--- store_data/cms_plugins.py	2015-07-02 15:43:26 +0000
+++ store_data/cms_plugins.py	2015-11-10 14:53:00 +0000
@@ -5,8 +5,10 @@
 from .models import GadgetSnap
 
 
-class GadgetSnapListPlugin(CMSPluginBase):
-    name = _("Gadget Snap List Plugin")
+class GadgetSnapListPluginLarge(CMSPluginBase):
+    # Keeping the name short to be able to differentiate them 
+    # in the editor dropdown
+    name = _("Snap list - Gadget")
     render_template = "gadget_snap_list.html"
     text_enabled = True
 
@@ -16,4 +18,19 @@
         })
         return context
 
-plugin_pool.register_plugin(GadgetSnapListPlugin)
+plugin_pool.register_plugin(GadgetSnapListPluginLarge)
+
+class GadgetSnapListPluginSmall(CMSPluginBase):
+    # Keeping the name short to be able to differentiate them 
+    # in the editor dropdown
+    name = _("Snap shortlist - Gadget")
+    render_template = "gadget_snap_shortlist.html"
+    text_enabled = True
+
+    def render(self, context, instance, placeholder):
+        context.update({
+            'gadget_snap_list': GadgetSnap.objects.all(),
+        })
+        return context
+
+plugin_pool.register_plugin(GadgetSnapListPluginSmall)

=== modified file 'store_data/management/commands/update-gadget-snaps.py'
--- store_data/management/commands/update-gadget-snaps.py	2015-07-02 12:42:22 +0000
+++ store_data/management/commands/update-gadget-snaps.py	2015-11-10 14:53:00 +0000
@@ -20,7 +20,9 @@
                 'ratings_average': entry['ratings_average'],
                 'alias': entry['alias'], 'price': entry['price'],
                 'publisher': entry['publisher'], 'version': entry['version'],
-                'last_updated': now, 'description': entry['description']})
+                'last_updated': now, 'description': entry['description'],
+                'title': entry['title'], 'website': entry.get('website', ''),
+            })
         if not created:
             gadget_snap.last_updated = now
             gadget_snap.icon_url = entry['icon_url']
@@ -30,6 +32,8 @@
             gadget_snap.publisher = entry['publisher']
             gadget_snap.version = entry['version']
             gadget_snap.description = entry['description']
+            gadget_snap.title = entry['title']
+            gadget_snap.website = entry.get('website', '')
             gadget_snap.save()
         for arch in entry['architecture']:
             arch_ob, created = Architecture.objects.get_or_create(name=arch)

=== added file 'store_data/migrations/0002_add_title_field.py'
--- store_data/migrations/0002_add_title_field.py	1970-01-01 00:00:00 +0000
+++ store_data/migrations/0002_add_title_field.py	2015-11-10 14:53:00 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'GadgetSnap.title'
+        db.add_column(u'store_data_gadgetsnap', 'title',
+                      self.gf('django.db.models.fields.CharField')(max_length=250, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'GadgetSnap.title'
+        db.delete_column(u'store_data_gadgetsnap', 'title')
+
+
+    models = {
+        u'store_data.architecture': {
+            'Meta': {'object_name': 'Architecture'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'store_data.gadgetsnap': {
+            'Meta': {'object_name': 'GadgetSnap'},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Architecture']", 'symmetrical': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '5000'}),
+            'icon_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'publisher': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'max_digits': '2', 'decimal_places': '1'}),
+            'release': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Release']", 'symmetrical': 'False'}),
+            'screenshot_url': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.ScreenshotURL']", 'symmetrical': 'False'}),
+            'store_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '25'})
+        },
+        u'store_data.release': {
+            'Meta': {'object_name': 'Release'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '25'})
+        },
+        u'store_data.screenshoturl': {
+            'Meta': {'object_name': 'ScreenshotURL'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['store_data']
\ No newline at end of file

=== added file 'store_data/migrations/0003_add_website_field.py'
--- store_data/migrations/0003_add_website_field.py	1970-01-01 00:00:00 +0000
+++ store_data/migrations/0003_add_website_field.py	2015-11-10 14:53:00 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'GadgetSnap.website'
+        db.add_column(u'store_data_gadgetsnap', 'website',
+                      self.gf('django.db.models.fields.URLField')(default='', max_length=200, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'GadgetSnap.website'
+        db.delete_column(u'store_data_gadgetsnap', 'website')
+
+
+    models = {
+        u'store_data.architecture': {
+            'Meta': {'object_name': 'Architecture'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'store_data.gadgetsnap': {
+            'Meta': {'object_name': 'GadgetSnap'},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Architecture']", 'symmetrical': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '5000'}),
+            'icon_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'publisher': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'max_digits': '2', 'decimal_places': '1'}),
+            'release': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.Release']", 'symmetrical': 'False'}),
+            'screenshot_url': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['store_data.ScreenshotURL']", 'symmetrical': 'False'}),
+            'store_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '25'}),
+            'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        u'store_data.release': {
+            'Meta': {'object_name': 'Release'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '25'})
+        },
+        u'store_data.screenshoturl': {
+            'Meta': {'object_name': 'ScreenshotURL'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['store_data']
\ No newline at end of file

=== modified file 'store_data/models.py'
--- store_data/models.py	2015-07-02 08:49:35 +0000
+++ store_data/models.py	2015-11-10 14:53:00 +0000
@@ -17,6 +17,7 @@
     icon_url = models.URLField(blank=True)
     release = models.ManyToManyField(Release)
     name = models.CharField(max_length=100)
+    title = models.CharField(max_length=250, blank=True, null=True)
     ratings_average = models.DecimalField(max_digits=2, decimal_places=1)
     alias = models.CharField(max_length=100, blank=True, null=True)
     price = models.DecimalField(max_digits=5, decimal_places=2)
@@ -27,3 +28,4 @@
     last_updated = models.DateTimeField()
     description = models.TextField(max_length=5000)
     screenshot_url = models.ManyToManyField(ScreenshotURL)
+    website = models.URLField(blank=True)

=== modified file 'templates/gadget_snap_list.html'
--- templates/gadget_snap_list.html	2015-07-03 08:00:09 +0000
+++ templates/gadget_snap_list.html	2015-11-10 14:53:00 +0000
@@ -1,32 +1,42 @@
 {% load i18n static text_extras %}
 
-<div class="row equal-height no-border">
-	{% for snap in gadget_snap_list %}
-	    {% if gadget_snap_list|index:snap|divisibleby:3 %}
-	        <div class="left four-col last-col box">
+<div class="no-border">
+    {% for snap in gadget_snap_list %}
+        {% if gadget_snap_list|index:snap|divisibleby:1 %}
+            <div class="left twelve-col last-col box">
         {% else %}
-            <div class="left four-col box">
+            <div class="left twelve-col box">
         {% endif %}
-        {% if snap.screenshot_url.0.url %}
-	        <p><img src="{{ snap.screenshot_url.0.url }}"/></p>
+        {% if snap.icon_url %}
+            <div class="two-col no-margin-bottom">
+                <img src="{{ snap.icon_url }}"/>
+            </div>
         {% else %}
             {% with 0|randint:10|string as rand %} 
                 {% with "img/boards/noboard-"|add:rand|add:".png" as noboard %}
-                    <p><img src="{% static noboard %}"/></p>
+                    <div class="two-col no-margin-bottom">
+                        <img src="{% static noboard %}"/>
+                    </div>
                 {% endwith %}
             {% endwith %}
         {% endif %}
-            <h3>{{ snap.alias|default_if_none:snap.name }}</h3>
+        <div class="ten-col last-col no-margin-bottom">
+        <h3>
+        {% with snap_name=snap.title|default_if_none:snap.name %}
+	    {{ snap_name|style_snap_name }}
+        {% endwith %}
+        </h3>
             {% if snap.description|length > 180 %}
                 <p>{{ snap.description|truncatechars:180 }}</p>
             {% else %}
                 <p>{% autoescape off %}{{ snap.description|html_links }}{% endautoescape %}</p>
             {% endif %}
-	        <ul class="list-ubuntu">
-	            <li>
-		        <a href="https://developer.ubuntu.com/en/snappy/start/">{% trans "Install Snappy on this device" %}</a>
-                </li>
-            </ul>
+                <ul class="list-ubuntu">
+                    <li>
+                    <a href="https://developer.ubuntu.com/en/snappy/start/">{% trans "Install Snappy on this device" %}</a>
+                    </li>
+                </ul>
+            </div>
         </div>
     {% endfor %}
 </div>

=== added file 'templates/gadget_snap_shortlist.html'
--- templates/gadget_snap_shortlist.html	1970-01-01 00:00:00 +0000
+++ templates/gadget_snap_shortlist.html	2015-11-10 14:53:00 +0000
@@ -0,0 +1,32 @@
+{% load i18n static text_extras %}
+
+<div class="equal-height no-border">
+    {% for snap in gadget_snap_list|slice:"6" %}
+        {% if gadget_snap_list|index:snap|divisibleby:6 %}
+            <div class="two-col last-col box">
+        {% else %}
+            <div class="two-col box">
+        {% endif %}
+        {% if snap.icon_url %}
+            <div class="two-col">
+                <img src="{{ snap.icon_url }}"/>
+            </div>
+        {% else %}
+            {% with 0|randint:10|string as rand %} 
+                {% with "img/boards/noboard-"|add:rand|add:".png" as noboard %}
+                    <div class="two-col">
+                        <img src="{% static noboard %}"/>
+                    </div>
+                {% endwith %}
+            {% endwith %}
+        {% endif %}
+        <div class="two-col no-margin-bottom">
+            <h4>
+            {% with snap_name=snap.title|default_if_none:snap.name %}
+	        {{ snap_name|style_snap_name }}
+            {% endwith %}
+            </h4>
+        </div>
+        </div>
+    {% endfor %}
+</div>