[fix bug 977916] Remove corner tab and tabzilla banner follow MWC

mozilla · Feb 28, 2014 · 09528dc · 09528dc
1 parent 532bbe7
commit 09528dc
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 102 deletions.
diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html
@@ -66,11 +66,6 @@
   <body id="{% block body_id %}{% endblock %}" class="html-{{ DIR }} {% block body_class %}{% endblock %}"{% block body_attrs %}{% endblock %}>
     <div id="strings" data-global-close="{{ _('Close') }}" {% block string_data %}{% endblock %}></div>
     <div id="outer-wrapper">
-
-    {% block mwc_badge %}
-    <div id="mwc-badge"><a href="/firefox/partners/">{{ _('Mobile World Congress') }}</a></div>
-    {% endblock %}
-
     <div id="wrapper">
 
     {% block site_header %}

diff --git a/bedrock/base/templates/base.html b/bedrock/base/templates/base.html
@@ -61,11 +61,6 @@
   <body id="{% block body_id %}{% endblock %}" class="html-{{ DIR }} {% block body_class %}{% endblock %}"{% block body_attrs %}{% endblock %}>
     <div id="strings" data-global-close="{{ _('Close') }}" {% block string_data %}{% endblock %}></div>
     <div id="outer-wrapper">
-
-    {% block mwc_badge %}
-    <div id="mwc-badge"><a href="/firefox/partners/">{{ _('Mobile World Congress') }}</a></div>
-    {% endblock %}
-
     <div id="wrapper">
 
     {% block site_header %}

diff --git a/bedrock/firefox/templates/firefox/partners/index.html b/bedrock/firefox/templates/firefox/partners/index.html
@@ -35,8 +35,6 @@
   {{ js('partners') }}
 {% endblock %}
 
-{% block mwc_badge %}{% endblock %}
-
 {% block site_header %}
   <header id="masthead">
     <a href="{{ url('mozorg.home') }}" id="tabzilla" data-infobar="{{ settings.TABZILLA_INFOBAR_OPTIONS }}">{{ _('Mozilla') }}</a>

diff --git a/bedrock/tabzilla/templates/tabzilla/tabzilla.js b/bedrock/tabzilla/templates/tabzilla/tabzilla.js
@@ -603,23 +603,13 @@ var Tabzilla = (function (Tabzilla) {
       '<div id="tabzilla-panel" class="tabzilla-closed" tabindex="-1">'
     + '  <div id="tabzilla-contents">'
     + '    <div id="tabzilla-promo">'
-    {% if l10n_has_tag('promo_mwc_2014') or settings.DEV %}
-    +'      <div class="snippet" id="tabzilla-promo-mwc">'
-    + '        <a href="https://www.mozilla.org/firefox/partners/?icn=tabz">'
-    + '          <h4>{{ _('Unleash the future')|js_escape }}</h4>'
-    + '          <p>{{ _('Mozilla at MWC 2014')|js_escape }} »</p>'
-    + '        </a>'
-    + '      </div>'
-    + '    </div>'
-    {% else %}
     +'      <div class="snippet" id="tabzilla-promo-fxos">'
     + '        <a href="https://www.mozilla.org/firefox/os/?icn=tabz">'
     + '          <h4>{{ _('Look ahead')|js_escape }}</h4>'
     + '          <p>{{ _('Learn all about Firefox OS')|js_escape }} »</p>'
     + '        </a>'
     + '      </div>'
     + '    </div>'
-    {% endif %}
     + '    <div id="tabzilla-nav">'
     + '      <ul>'
     + '        <li><h2>Mozilla</h2>'

diff --git a/media/css/sandstone/sandstone-resp.less b/media/css/sandstone/sandstone-resp.less
@@ -958,31 +958,6 @@ html[dir="rtl"] #colophon {
     }
 }
 
-/* {{{ MWC badge */
-#mwc-badge {
-    display: none;
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 1001;
-}
-
-.mwc2014 #mwc-badge {
-    display: block;
-}
-
-#mwc-badge a {
-    display: block;
-    text-indent: -999em;
-    overflow: hidden;
-    width: 140px;
-    height: 140px;
-    background: url(/media/img/firefox/partners/mwc_badge-corner.png) no-repeat;
-    color: #fff;
-    border-bottom-right-radius: 100%;
-}
-/* }}} */
-
 /* }}} */
 /* {{{ Responsive Grid */
 
@@ -1391,9 +1366,6 @@ html[dir="rtl"] #colophon {
         }
     }
 
-    .mwc2014 #mwc-badge {
-        display: none;
-    }
 }
 
 

diff --git a/media/css/sandstone/sandstone.less b/media/css/sandstone/sandstone.less
@@ -340,30 +340,6 @@ input[type=text]:focus {
     padding-bottom: @baseLine * 2;
 }
 
-/* {{{ MWC badge */
-#mwc-badge {
-    display: none;
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 1001;
-}
-
-.mwc2014 #mwc-badge {
-    display: block;
-}
-
-#mwc-badge a {
-    display: block;
-    text-indent: -999em;
-    overflow: hidden;
-    width: 140px;
-    height: 140px;
-    background: url(/media/img/firefox/partners/mwc_badge-corner.png) no-repeat;
-    color: #fff;
-    border-bottom-right-radius: 100%;
-}
-
 /* }}} */
 /* {{{ Less Framework Grid */
 

diff --git a/media/img/firefox/partners/mwc_badge-corner.png b/media/img/firefox/partners/mwc_badge-corner.png
diff --git a/media/js/base/site.js b/media/js/base/site.js
@@ -95,29 +95,4 @@
         // Add class to reflect javascript availability for CSS
         h.className = h.className.replace(/\bno-js\b/, 'js');
     })();
-
-    // Read cookies
-    function readCookie(name) {
-        var nameEQ = name + "=";
-        var ca = document.cookie.split(';');
-
-        for (var i = 0; i < ca.length; i++) {
-            var c = ca[i];
-
-            while (c.charAt(0) === ' ') {
-                c = c.substring(1, c.length);
-            }
-
-            if (c.indexOf(nameEQ) === 0) {
-                return c.substring(nameEQ.length, c.length);
-            }
-        }
-
-        return null;
-    }
-
-    // Add class if MWC cookie is true
-    if (readCookie('seen_mwc2014') === 'true') {
-        document.documentElement.className += ' mwc2014';
-    }
 })();
diff --git a/media/js/firefox/partners/common.js b/media/js/firefox/partners/common.js
@@ -129,7 +129,4 @@
             window.open(this.href);
         }
     });
-
-    // set a cookie
-    document.cookie = 'seen_mwc2014=true;expires=Tue, 4 Mar 2014 00:00:01 UTC;path=/';
 })(window, window.jQuery, window.enquire, window.Modernizr, window.trans);