Bug 1156383. Add TV to FxOS devices page.

mozilla · May 13, 2015 · 31c8aa4 · 31c8aa4
1 parent 7f31403
commit 31c8aa4
Show file tree

Hide file tree

Showing 10 changed files with 4,049 additions and 1 deletion.
diff --git a/bedrock/firefox/templates/firefox/os/devices-panasonic-tv.html b/bedrock/firefox/templates/firefox/os/devices-panasonic-tv.html
diff --git a/bedrock/firefox/urls.py b/bedrock/firefox/urls.py
@@ -86,7 +86,7 @@
     page('mwc', 'firefox/os/mwc-2015-preview.html',
         decorators=waffle_switch('mwc-2015-preview')),
 
-    page('firefox/os/devices', 'firefox/os/devices.html'),
+    url('^firefox/os/devices/$', views.os_devices_view, name='firefox.os.devices'),
     page('firefox/os/devices/tv', 'firefox/os/tv.html',
         decorators=waffle_switch('firefox-os-tv')),
 

diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py
@@ -21,6 +21,7 @@
 from lib import l10n_utils
 from lib.l10n_utils.dotlang import _
 from product_details.version_compare import Version
+import waffle
 
 from bedrock.base.geo import get_country_from_request
 from bedrock.firefox.firefox_details import firefox_desktop
@@ -511,3 +512,12 @@ def get_template_names(self):
             template = 'firefox/feedback/unhappy.html'
 
         return [template]
+
+
+def os_devices_view(request):
+    if (waffle.switch_is_active('fxos-devices-panasonic-tv')):
+        template = 'devices-panasonic-tv'
+    else:
+        template = 'devices'
+
+    return l10n_utils.render(request, 'firefox/os/' + template + '.html')
diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py
@@ -453,6 +453,17 @@
         ),
         'output_filename': 'css/firefox_os_devices-bundle.css',
     },
+    'firefox_os_devices_panasonic_tv': {
+        'source_filenames': (
+            'css/libs/tipsy.css',
+            'css/sandstone/sandstone-resp.less',
+            'css/firefox/family-nav.less',
+            'css/base/mozilla-modal.less',
+            'css/firefox/os/get_device.less',
+            'css/firefox/os/devices-panasonic-tv.less',
+        ),
+        'output_filename': 'css/firefox_os_devices_panasonic_tv-bundle.css',
+    },
     'firefox_os_devices_ie': {
         'source_filenames': (
             'css/firefox/os/devices-ie.less',
@@ -1217,6 +1228,19 @@
         ),
         'output_filename': 'js/firefox_os_devices-bundle.js',
     },
+    'firefox_os_devices_panasonic_tv': {
+        'source_filenames': (
+            'js/libs/jquery.tipsy.js',
+            'js/libs/jquery.waypoints.min.js',
+            'js/libs/jquery.waypoints-sticky.min.js',
+            'js/base/mozilla-pager.js',
+            'js/base/mozilla-modal.js',
+            'js/firefox/family-nav.js',
+            'js/firefox/os/partner_data.js',
+            'js/firefox/os/devices-panasonic-tv.js',
+        ),
+        'output_filename': 'js/firefox_os_devices_panasonic_tv-bundle.js',
+    },
     'firefox_os_mwc_2015_preview': {
         'source_filenames': (
             'js/base/mozilla-modal.js',