Fix bug 1428150: Remove old tabzilla

As well as the old infobar code.
mozilla · Feb 23, 2018 · a3705ba · a3705ba
1 parent 4d1a313
commit a3705ba
Show file tree

Hide file tree

Showing 40 changed files with 18 additions and 2,177 deletions.
diff --git a/bedrock/base/templates/includes/tabzilla-console-footer.html b/bedrock/base/templates/includes/tabzilla-console-footer.html
diff --git a/bedrock/infobar/__init__.py b/bedrock/infobar/__init__.py
diff --git a/bedrock/infobar/templates/infobar/infobar.jsonp b/bedrock/infobar/templates/infobar/infobar.jsonp
diff --git a/bedrock/infobar/tests.py b/bedrock/infobar/tests.py
diff --git a/bedrock/infobar/urls.py b/bedrock/infobar/urls.py
diff --git a/bedrock/infobar/views.py b/bedrock/infobar/views.py
diff --git a/bedrock/mozorg/redirects.py b/bedrock/mozorg/redirects.py
@@ -1,4 +1,4 @@
-from bedrock.redirects.util import redirect, ua_redirector
+from bedrock.redirects.util import gone, redirect, ua_redirector
 
 
 def to_uppercase(url):
@@ -663,4 +663,12 @@ def decider(request, **kwargs):
     # Bug 1438464
     redirect(r'^collusion/?$', 'https://addons.mozilla.org/firefox/addon/lightbeam/'),
     redirect(r'^lightbeam(/.*)?', 'https://addons.mozilla.org/firefox/addon/lightbeam/'),
+
+    # Bug 1428150
+    gone(r'^tabzilla/transbar\.jsonp$'),
+    gone(r'^tabzilla/tabzilla\.js$'),
+    gone(r'^tabzilla/media/js/tabzilla\.js$'),
+    redirect(r'tabzilla/media/css/tabzilla\.css$',
+             'https://mozorg.cdn.mozilla.net/media/css/tabzilla-min.css',
+             locale_prefix=False),
 )
diff --git a/bedrock/privacy/templates/privacy/notices/facebook.html b/bedrock/privacy/templates/privacy/notices/facebook.html
@@ -14,7 +14,7 @@
 
 {% block site_header %}
   <header id="masthead">
-    <a href="{{ url('mozorg.home') }}" id="tabzilla" data-infobar="{{ settings.TABZILLA_INFOBAR_OPTIONS }}">{{ _('Mozilla') }}</a>
+    <a href="{{ url('mozorg.home') }}" id="tabzilla">{{ _('Mozilla') }}</a>
     {% block site_header_nav %}{% endblock %}
   </header>
 {% endblock %}

diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
@@ -294,11 +294,9 @@ def lazy_langs():
     r'^firefox/feedback',
     r'^firefox/stub_attribution_code/',
     r'^.+/(firstrun|whatsnew)/$',
-    r'^infobar/',
     r'^l10n_example/',
     r'^m/',
     r'^newsletter/(confirm|existing|hacks\.mozilla\.org|recovery|updated)/',
-    r'^tabzilla/',
     r'/system-requirements/$',
     r'.*/(firstrun|thanks)/$',
     r'^healthz/$',
@@ -431,7 +429,7 @@ def set_whitenoise_headers(headers, path, url):
     'bedrock.base.middleware.BasicAuthMiddleware',
     # must come before LocaleURLMiddleware
     'bedrock.redirects.middleware.RedirectsMiddleware',
-    'bedrock.tabzilla.middleware.TabzillaLocaleURLMiddleware',
+    'bedrock.base.middleware.LocaleURLMiddleware',
     'commonware.middleware.RobotsTagHeader',
     'bedrock.mozorg.middleware.ClacksOverheadMiddleware',
     'bedrock.mozorg.middleware.HostnameMiddleware',
@@ -474,14 +472,12 @@ def set_whitenoise_headers(headers, path, url):
     'bedrock.firefox',
     'bedrock.foundation',
     'bedrock.grants',
-    'bedrock.infobar',
     'bedrock.legal',
     'bedrock.mozorg',
     'bedrock.newsletter',
     'bedrock.press',
     'bedrock.privacy',
     'bedrock.styleguide',
-    'bedrock.tabzilla',
     'bedrock.teach',
     'bedrock.externalfiles',
     'bedrock.security',
@@ -1193,9 +1189,6 @@ def lazy_email_backend():
     'pt-BR': 'https://twitter.com/firefoxbrasil',
 }
 
-# Tabzilla Information Bar default options
-TABZILLA_INFOBAR_OPTIONS = 'update translation'
-
 # Optimize.ly project code
 OPTIMIZELY_PROJECT_ID = config('OPTIMIZELY_PROJECT_ID', default='')
 

diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py
@@ -720,13 +720,6 @@
         ),
         'output_filename': 'css/styleguide-docs-send-to-device-bundle.css',
     },
-    # no longer used on bedrock. possibly referenced on external sites? should investigate.
-    'tabzilla': {
-        'source_filenames': (
-            'css/tabzilla/tabzilla.less',
-        ),
-        'output_filename': 'css/tabzilla-min.css',
-    },
     'technology': {
         'source_filenames': (
             'css/base/mozilla-modal.less',

diff --git a/bedrock/tabzilla/__init__.py b/bedrock/tabzilla/__init__.py
diff --git a/bedrock/tabzilla/middleware.py b/bedrock/tabzilla/middleware.py
diff --git a/bedrock/tabzilla/models.py b/bedrock/tabzilla/models.py