[fix bug 1295332] Decommission and redirect Hello product page

mozilla · Sep 7, 2016 · d89d139 · d89d139
1 parent bc9b2cf
commit d89d139
Show file tree

Hide file tree

Showing 32 changed files with 9 additions and 1,288 deletions.
diff --git a/bedrock/firefox/redirects.py b/bedrock/firefox/redirects.py
@@ -119,9 +119,6 @@ def firefox_mobile_faq(request, *args, **kwargs):
     redirect(r'^seamonkey-transition\.html$',
              'http://www-archive.mozilla.org/seamonkey-transition.html'),
 
-    # bug 1121082
-    redirect(r'^hello/?$', 'firefox.hello'),
-
     # Bug 1186373
     redirect(r'^firefox/hello/npssurvey/?$',
              'https://www.surveygizmo.com/s3/2227372/Firefox-Hello-Product-Survey',
@@ -499,9 +496,6 @@ def firefox_mobile_faq(request, *args, **kwargs):
     # bug 1260423
     redirect(r'^firefox/choose/?$', 'firefox.new'),
 
-    # bug 1273837
-    redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/hello/start/?$', 'firefox.hello'),
-
     # bug 1283397
     redirect(r'^firefox/pocket/?$', 'https://getpocket.com/firefox/'),
 
@@ -512,4 +506,9 @@ def firefox_mobile_faq(request, *args, **kwargs):
     # bug 1293539
     redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/tour/?$',
              'https://support.mozilla.org/kb/get-started-firefox-overview-main-features'),
+
+    # bug 1295332
+    redirect(r'^hello/?$', 'https://support.mozilla.org/kb/hello-status'),
+    redirect(r'^firefox/hello/?$', 'https://support.mozilla.org/kb/hello-status'),
+    redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/hello/start/?$', 'https://support.mozilla.org/kb/hello-status'),
 )
diff --git a/bedrock/firefox/templates/firefox/hello/index-b.html b/bedrock/firefox/templates/firefox/hello/index-b.html
diff --git a/bedrock/firefox/templates/firefox/hello/index.html b/bedrock/firefox/templates/firefox/hello/index.html
diff --git a/bedrock/firefox/templates/firefox/includes/top-menu.html b/bedrock/firefox/templates/firefox/includes/top-menu.html
@@ -10,7 +10,6 @@
         <li>
           <hr>{# <hr> before first sub/minor link #}
           <a class="sublink" href="{{ url('firefox.sync') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Sync">{{ _('Sync') }}</a>
-          <a class="sublink" href="{{ url('firefox.hello') }}" tabindex="-1" data-link-type="nav" data-link-name="Firefox: Hello">{{ _('Hello') }}</a>
         </li>
       </ul>
     </li>

diff --git a/bedrock/firefox/urls.py b/bedrock/firefox/urls.py
@@ -41,7 +41,6 @@
     page('firefox/developer', 'firefox/developer.html'),
     page('firefox/features', 'firefox/features.html'),
     page('firefox/geolocation', 'firefox/geolocation.html'),
-    url(r'^firefox/hello/$', views.hello, name='firefox.hello'),
     page('firefox/interest-dashboard', 'firefox/interest-dashboard.html'),
     page('firefox/android', 'firefox/android/index.html'),
     page('firefox/android/faq', 'firefox/android/faq.html'),

diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py
@@ -354,16 +354,6 @@ def get_template_names(self):
         return [template]
 
 
-def hello(request):
-    variant = request.GET.get('v', '')
-    if variant == 'b':
-        template = 'firefox/hello/index-b.html'
-    else:
-        template = 'firefox/hello/index.html'
-
-    return l10n_utils.render(request, template)
-
-
 class FeedbackView(TemplateView):
 
     donate_url = ('https://donate.mozilla.org/'

diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py
@@ -370,14 +370,6 @@
         ),
         'output_filename': 'css/firefox_developer-bundle.css',
     },
-    'firefox_hello': {
-        'source_filenames': (
-            'css/firefox/family-nav.less',
-            'css/newsletter/fxnewsletter-subscribe.less',
-            'css/firefox/hello/index.less',
-        ),
-        'output_filename': 'css/firefox_hello-bundle.css',
-    },
     'firefox_ios': {
         'source_filenames': (
             'css/firefox/family-nav.less',
@@ -1289,17 +1281,6 @@
         ),
         'output_filename': 'js/firefox_feedback-bundle.js',
     },
-    'firefox_hello': {
-        'source_filenames': (
-            'js/base/uitour-lib.js',
-            'js/libs/jquery.waypoints.min.js',
-            'js/libs/jquery.waypoints-sticky.min.js',
-            'js/firefox/family-nav.js',
-            'js/base/mozilla-svg-image-fallback.js',
-            'js/firefox/hello/index.js',
-        ),
-        'output_filename': 'js/firefox_hello-bundle.js',
-    },
     'firefox_ios': {
         'source_filenames': (
             'js/base/mozilla-smoothscroll.js',