Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/get-gadget-snaps into lp:developer-ubuntu-com

[David Callé]

Add gadget type snaps from the snap store to the existing oem type snaps list.

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/get-gadget-snaps]

222. By David Callé on 2016-05-12

Give the possibility for the icon_url to be null, make migrations

[Daniel Holbach (dholbach)]

Can you rename the migration scripts (both) to something more descriptive?

review: Approve

[Daniel Holbach (dholbach)]

Apart from that: great work so far. The presentation is something which would be good to change too.

review: Needs Fixing

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/get-gadget-snaps]

223. By Daniel Holbach on 2016-05-14

rename migrations to be more descriptive

224. By Daniel Holbach on 2016-05-14

order by release

225. By Daniel Holbach on 2016-05-14

show which release a snap is available for

226. By Daniel Holbach on 2016-05-14

show which release a snap is available for (on short gadget snap list)

227. By Daniel Holbach on 2016-05-14

indicate if snap is officially supported

[Daniel Holbach (dholbach)]

David: I made a couple of changes which reflect what we talked about earlier (official support, indicate which release is supported). Now we just need to make it look pretty. :-)

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/get-gadget-snaps]

228. By Daniel Holbach on 2016-05-16

add icon for official support

229. By David Callé on 2016-05-16

Support logo

230. By Daniel Holbach on 2016-05-16

fix sorting to make davidc3 happy

=== added file 'developer_portal/migrations/0002_update_rawhtml_data_type.py'
--- developer_portal/migrations/0002_update_rawhtml_data_type.py	1970-01-01 00:00:00 +0000
+++ developer_portal/migrations/0002_update_rawhtml_data_type.py	2016-05-16 22:29:20 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('developer_portal', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rawhtml',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(parent_link=True, related_name='developer_portal_rawhtml', primary_key=True, serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]

=== modified file 'store_data/cms_plugins.py'
--- store_data/cms_plugins.py	2016-03-29 08:29:43 +0000
+++ store_data/cms_plugins.py	2016-05-16 22:29:20 +0000
@@ -5,6 +5,14 @@
 from .models import GadgetSnap
 
 
+def get_gadget_snaps():
+    snaps = [a for a in GadgetSnap.objects.exclude(
+        release__name='rolling-core').order_by('-release')]
+    snaps += [a for a in GadgetSnap.objects.filter(
+        release__name='rolling-core')]
+    return snaps
+
+
 class GadgetSnapListPluginLarge(CMSPluginBase):
     # Keeping the name short to be able to differentiate them
     # in the editor dropdown
@@ -14,7 +22,7 @@
 
     def render(self, context, instance, placeholder):
         context.update({
-            'gadget_snap_list': GadgetSnap.objects.all(),
+            'gadget_snap_list': get_gadget_snaps(),
         })
         return context
 
@@ -30,7 +38,7 @@
 
     def render(self, context, instance, placeholder):
         context.update({
-            'gadget_snap_list': GadgetSnap.objects.all(),
+            'gadget_snap_list': get_gadget_snaps(),
         })
         return context
 

=== modified file 'store_data/management/store/api.py'
--- store_data/management/store/api.py	2015-07-02 12:34:31 +0000
+++ store_data/management/store/api.py	2016-05-16 22:29:20 +0000
@@ -14,22 +14,18 @@
 
 
 class GadgetSnapData(object):
-    data = {}
+    data = []
 
-    def get_data(self):
-        params = urlencode({'q': 'content:oem'})
+    def get_data(self, snap_type):
+        params = urlencode({'q': 'content:%s' % snap_type})
         url = PACKAGE_API + "?%s" % params
         req = Request(url)
-        req.add_header('X-Ubuntu-Frameworks', 'ubuntu-core-15.04-dev1')
-        # XXX: This is supposed to work, but doesn't.
-        # req.add_header('X-Ubuntu-Release',
-        #                '[15.04-core|rolling-core|rolling-personal]')
         req.add_header('Accept', 'application/hal+json')
         f = urlopen(req)
         s = f.read().decode('utf-8')
         f.close()
         packages = json.loads(s)
-        self.data = packages['_embedded']['clickindex:package']
+        self.data += packages['_embedded']['clickindex:package']
 
     def get_additional_snap_data(self):
         for entry in self.data:
@@ -48,5 +44,6 @@
             entry['description'] = data['description']
 
     def __init__(self):
-        self.get_data()
+        for snap_type in ['oem', 'gadget']:
+            self.get_data(snap_type)
         self.get_additional_snap_data()

=== added file 'store_data/migrations/0003_make_iconurl_optional.py'
--- store_data/migrations/0003_make_iconurl_optional.py	1970-01-01 00:00:00 +0000
+++ store_data/migrations/0003_make_iconurl_optional.py	2016-05-16 22:29:20 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('store_data', '0002_make_screenshot_optional'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gadgetsnap',
+            name='icon_url',
+            field=models.URLField(null=True, blank=True),
+        ),
+    ]

=== modified file 'store_data/models.py'
--- store_data/models.py	2016-03-29 08:30:26 +0000
+++ store_data/models.py	2016-05-16 22:29:20 +0000
@@ -23,7 +23,7 @@
 
 
 class GadgetSnap(models.Model):
-    icon_url = models.URLField(blank=True)
+    icon_url = models.URLField(blank=True, null=True)
     release = models.ManyToManyField(Release)
     name = models.CharField(max_length=100)
     title = models.CharField(max_length=250, blank=True, null=True)

=== added file 'store_data/static/img/official.svg'
--- store_data/static/img/official.svg	1970-01-01 00:00:00 +0000
+++ store_data/static/img/official.svg	2016-05-16 22:29:20 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="180.284px" height="180.284px" viewBox="11.274 82.408 180.284 180.284" enable-background="new 11.274 82.408 180.284 180.284" xml:space="preserve">
+<g>
+	<path fill="#DD4814" d="M120.732,210.424c-31.26,0-56.691-25.433-56.691-56.691c0-31.261,25.432-56.692,56.691-56.692   c31.259,0,56.692,25.432,56.692,56.692C177.425,184.991,151.991,210.424,120.732,210.424"/>
+	<path fill="#DD4814" d="M57.083,157.812c1.299,20.461,12.287,38.332,28.418,49.062l0.002-0.004l-39.398,22.748l10.384-38.738   l-38.732-10.358l39.332-22.709H57.083z"/>
+	<path fill="#DD4814" d="M92.378,210.855c8.546,4.258,18.174,6.655,28.354,6.655c10.173,0,19.8-2.396,28.343-6.651l-0.002-0.004   v45.634l-28.355-28.362l-28.337,28.362v-45.638L92.378,210.855z"/>
+</g>
+</svg>
\ No newline at end of file

=== modified file 'templates/gadget_snap_list.html'
--- templates/gadget_snap_list.html	2015-12-08 10:25:29 +0000
+++ templates/gadget_snap_list.html	2016-05-16 22:29:20 +0000
@@ -2,6 +2,10 @@
 
 <div class="no-border">
     {% for snap in gadget_snap_list %}
+        {% ifchanged snap.release.all|first %}
+            <h4>Available on release: {{ snap.release.all|first }}</h4>
+        {% endifchanged %}
+
         {% if gadget_snap_list|index:snap|divisibleby:1 %}
             <div class="left twelve-col last-col box">
         {% else %}
@@ -12,7 +16,7 @@
                 <img src="{{ snap.icon_url }}"/>
             </div>
         {% else %}
-            {% with 0|randint:10|string as rand %} 
+            {% with 0|randint:10|string as rand %}
                 {% with "img/boards/noboard-"|add:rand|add:".png" as noboard %}
                     <div class="two-col no-margin-bottom">
                         <img src="{% static noboard %}"/>
@@ -20,10 +24,11 @@
                 {% endwith %}
             {% endwith %}
         {% endif %}
-        <div class="ten-col last-col no-margin-bottom">
+        <div class="eight-col">
+
         <h3>
         {% with snap_name=snap.title|default_if_none:snap.name %}
-	    {{ snap_name|style_snap_name }}
+	          {{ snap_name|style_snap_name }}             {% if snap.publisher == "Canonical" %}<img src="{% static "img/official.svg" %}" title="Officially supported" alt="Officially supported" style="width:5%;"/>            {% endif %}
         {% endwith %}
         </h3>
             {% if snap.description|length > 180 %}
@@ -31,11 +36,13 @@
             {% 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>
+
+          </div>
+
+            
+            <div class="ten-col no-margin-bottom">
+
+
             </div>
         </div>
     {% endfor %}

=== modified file 'templates/gadget_snap_shortlist.html'
--- templates/gadget_snap_shortlist.html	2015-11-10 14:13:42 +0000
+++ templates/gadget_snap_shortlist.html	2016-05-16 22:29:20 +0000
@@ -2,6 +2,10 @@
 
 <div class="equal-height no-border">
     {% for snap in gadget_snap_list|slice:"6" %}
+        {% ifchanged snap.release.all|first %}
+            <h2>Available on release: {{ snap.release.all|first }}</h2>
+        {% endifchanged %}
+
         {% if gadget_snap_list|index:snap|divisibleby:6 %}
             <div class="two-col last-col box">
         {% else %}
@@ -12,7 +16,7 @@
                 <img src="{{ snap.icon_url }}"/>
             </div>
         {% else %}
-            {% with 0|randint:10|string as rand %} 
+            {% 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 %}"/>
@@ -23,7 +27,10 @@
         <div class="two-col no-margin-bottom">
             <h4>
             {% with snap_name=snap.title|default_if_none:snap.name %}
-	        {{ snap_name|style_snap_name }}
+	              {{ snap_name|style_snap_name }}
+                {% if snap.publisher == "Canonical" %}
+                 (officially supported)
+                {% endif %}
             {% endwith %}
             </h4>
         </div>