Use the coloured globe icons as default for websites (bug 1174847)

mkt/site/utils.py

@@ -663,7 +663,8 @@ def make_rated(app):
     app.set_interactives([])
 
 
-def get_icon_url(base_url_format, obj, size):
+def get_icon_url(base_url_format, obj, size,
+                 default_format='default-{size}.png'):
     """
     Returns either the icon URL for a given (`obj`, `size`). base_url_format`
     is a string that will be used for url formatting, see ADDON_ICON_URL for an
@@ -680,7 +681,8 @@ def get_icon_url(base_url_format, obj, size):
     """
     # Return default image if no icon_type was stored.
     if not obj.icon_type:
-        return '%s/default-%s.png' % (static_url('ICONS_DEFAULT_URL'), size)
+        return '{path}/{name}'.format(path=static_url('ICONS_DEFAULT_URL'),
+                                      name=default_format.format(size=size))
     else:
         # [1] is the whole ID, [2] is the directory.
         split_id = re.match(r'((\d*?)\d{1,3})$', str(obj.pk))

mkt/websites/models.py

@@ -20,6 +20,14 @@
 from mkt.websites.indexers import WebsiteIndexer
 
 
+DEFAULT_ICON_REGIONS = ['americas', 'asia-australia', 'europe-africa']
+DEFAULT_ICON_COLORS = ['blue', 'cerulean', 'green', 'orange', 'pink', 'purple',
+                       'red', 'yellow']
+DEFAULT_ICONS = ['-'.join([region, color])
+                 for region in DEFAULT_ICON_REGIONS
+                 for color in DEFAULT_ICON_COLORS]
+
+
 class WebsiteManager(ManagerBase):
     def valid(self):
         return self.filter(status__in=LISTED_STATUSES, is_disabled=False)
@@ -117,7 +125,10 @@ def get_icon_dir(self):
         return os.path.join(settings.WEBSITE_ICONS_PATH, str(self.pk / 1000))
 
     def get_icon_url(self, size):
-        return get_icon_url(static_url('WEBSITE_ICON_URL'), self, size)
+        icon_name = '{icon}-{{size}}.png'.format(
+            icon=DEFAULT_ICONS[self.pk % len(DEFAULT_ICONS)])
+        return get_icon_url(static_url('WEBSITE_ICON_URL'), self, size,
+                            default_format=icon_name)
 
     def get_url_path(self):
         return reverse('website.detail', kwargs={'pk': self.pk})

mkt/websites/tests/test_models.py

@@ -42,9 +42,15 @@ def test_get_icon_url_hash(self):
         website = Website(pk=1, icon_type='image/png', icon_hash='abcdef')
         assert website.get_icon_url(32).endswith('?modified=abcdef')
 
-    def test_get_icon_no_icon(self):
-        website = Website(pk=1)
-        assert website.get_icon_url(32).endswith('/default-32.png')
+    def test_get_icon_no_icon_blue(self):
+        website = Website(pk=8)
+        url = website.get_icon_url(32)
+        assert url.endswith('hub/asia-australia-blue-32.png'), url
+
+    def test_get_icon_no_icon_pink(self):
+        website = Website(pk=164)
+        url = website.get_icon_url(32)
+        assert url.endswith('hub/europe-africa-pink-32.png'), url
 
     def test_get_preferred_regions(self):
         website = Website()