Merge pull request #5209 from alexgibson/bug-1405076-revert-quantum-l…

…anding-page

[bug 1405076] Revert Firefox Quantum home page design

bedrock/firefox/tests/test_views.py

@@ -808,34 +808,6 @@ def test_get_context_data_one_star(self):
         self.assertFalse('donate_stars_url' in ctx)
 
 
-@override_settings(DEV=False)
-@patch('bedrock.firefox.views.l10n_utils.render')
-class TestFirefoxFeatures(TestCase):
-    @patch.object(views, 'lang_file_is_active', lambda *x: True)
-    @patch('bedrock.firefox.views.switch', Mock(return_value=True))
-    def test_new_firefox_page_loads_with_active_switch(self, render_mock):
-        view = views.FirefoxHubView()
-        view.request = RequestFactory().get('/firefox/')
-        view.request.locale = 'en-US'
-        eq_(view.get_template_names(), ['firefox/firefox-quantum.html'])
-
-    @patch.object(views, 'lang_file_is_active', lambda *x: True)
-    @patch('bedrock.firefox.views.switch', Mock(return_value=False))
-    def test_firefox_hub_page_loads_with_inactive_switch(self, render_mock):
-        view = views.FirefoxHubView()
-        view.request = RequestFactory().get('/firefox/')
-        view.request.locale = 'en-US'
-        eq_(view.get_template_names(), ['firefox/hub/home.html'])
-
-    @patch.object(views, 'lang_file_is_active', lambda *x: False)
-    @patch('bedrock.firefox.views.switch', Mock(return_value=True))
-    def test_firefox_hub_page_loads_with_inactive_locale(self, render_mock):
-        view = views.FirefoxHubView()
-        view.request = RequestFactory().get('/firefox/')
-        view.request.locale = 'fr'
-        eq_(view.get_template_names(), ['firefox/hub/home.html'])
-
-
 @override_settings(DEV=False)
 @patch('bedrock.firefox.views.l10n_utils.render')
 class TestSyncPage(TestCase):

bedrock/firefox/views.py

@@ -753,17 +753,7 @@ class FirefoxHubView(BlogPostsView):
     blog_posts_template_variable = 'articles'
     blog_slugs = 'firefox'
     blog_tags = ['home']
-
-    def get_template_names(self):
-        locale = l10n_utils.get_locale(self.request)
-
-        if switch('firefox-57-release') and lang_file_is_active(
-                'firefox/firefox-quantum', locale):
-            template_name = 'firefox/firefox-quantum.html'
-        else:
-            template_name = 'firefox/hub/home.html'
-
-        return [template_name]
+    template_name = 'firefox/hub/home.html'
 
 
 def FirefoxProductDeveloperView(request):

bedrock/settings/static_media.py

@@ -576,12 +576,6 @@
         ),
         'output_filename': 'css/firefox-quantum-bundle.css',
     },
-    'firefox-quantum-landing': {
-        'source_filenames': (
-            'css/firefox/quantum-landing.scss',
-        ),
-        'output_filename': 'css/firefox_quantum_landing-bundle.css',
-    },
     'firefox_releases_index': {
         'source_filenames': (
             'css/base/menu-resp.less',
@@ -1394,16 +1388,6 @@
         ),
         'output_filename': 'js/firefox-quantum-bundle.js',
     },
-    'firefox-quantum-landing': {
-        'source_filenames': (
-            'js/libs/jquery.cycle2.min.js',
-            'js/libs/jquery.waypoints.min.js',
-            'js/libs/jquery.waypoints-sticky.min.js',
-            'js/hubs/sub-nav.js',
-            'js/firefox/quantum-landing.js',
-        ),
-        'output_filename': 'js/firefox_quantum_landing-bundle.js',
-    },
     'firefox_interest_dashboard': {
         'source_filenames': (
             'js/base/mozilla-accordion.js',