Revert "fix filters position and cancel button (bug 818952, bug 818939)"

This reverts commit 8a874d2.
mozilla · Dec 6, 2012 · 860d25a · 860d25a
1 parent c9c40ab
commit 860d25a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/media/js/mkt/banners.js b/media/js/mkt/banners.js
@@ -1,8 +1,6 @@
 (function() {
-    var $incompatible = $('.incompatible-browser');
-
-    if ($incompatible.length && (!z.capabilities.localStorage || !localStorage.seen_beta_pitch)) {
-        $incompatible.addClass('active');
+    if (!z.capabilities.localStorage || !localStorage.seen_beta_pitch) {
+        $('.incompatible-browser').addClass('active');
         z.body.addClass('incompatible');
     }
 
@@ -11,13 +9,13 @@
         if (z.capabilities.localStorage) {
             localStorage.seen_beta_pitch = '1';
         }
-        $incompatible.removeClass('active');
+        $('.incompatible-browser').removeClass('active');
         z.body.removeClass('incompatible');
     }).on('click', '.incompatible.button:not(.firefoxos)', _pd(function(e) {
         if (z.capabilities.localStorage) {
             delete localStorage.seen_beta_pitch;
         }
-        $incompatible.addClass('active');
+        $('.incompatible-browser').addClass('active');
         z.body.addClass('incompatible');
     }));
 

diff --git a/mkt/templates/mkt/header.html b/mkt/templates/mkt/header.html
@@ -32,8 +32,8 @@ <h1 class="page">{{ headertitle }}</h1>
       {% endif %}
       <a href="#" id="nav-back" class="header-button icon back left" title="{{ _('Back') }}"><b></b></a>
       <a href="#" class="header-button icon search right" title="{{ _('Search') }}"></a>
+      <a href="#" class="header-button cancel right">{{ _('Cancel') }}</a>
       {% if request.MOBILE %}
-        <a href="#" class="header-button cancel right">{{ _('Cancel') }}</a>
         <a href="#" class="header-button filter right">{{ _('Filter') }}</a>
       {% endif %}
       <a href="#" class="header-button icon expand right" title="{{ _('Expand') }}"></a>