Scold users not using a compatible application (Bug 638005)

jbalogh · Mar 7, 2011 · 5423003 · 5423003
1 parent be53153
commit 5423003
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 5 deletions.
diff --git a/apps/addons/templates/addons/mobile/button.html b/apps/addons/templates/addons/mobile/button.html
@@ -32,9 +32,6 @@
     </a>
   {% endfor %}
   <ul class="badges">
-    {% if False %}
-      <li class="error">{{ _('Requires Newer Version of Firefox') }}</li>
-    {% endif %}
     {% if settings.PERF_THRESHOLD and addon.ts_slowness >= settings.PERF_THRESHOLD %}
       <li class="warning">{{ _('May Slow Down Your Browser') }}</li>
     {% endif %}

diff --git a/apps/addons/templates/addons/mobile/home.html b/apps/addons/templates/addons/mobile/home.html
@@ -5,6 +5,9 @@
 {% block header %}
   <header id="home-header">
     {% include "mobile/header.html" %}
+    <div class="get-fx-message">
+      {{ _('You need Firefox to install addons. <a href="http://mozilla.com/firefox">Learn More&nbsp;&raquo;</a>') }}
+    </div>
     <hgroup>
       <h1 class="site-title">
         {% set appicon = 'firefox' if request.APP == amo.MOBILE else request.APP.short %}

diff --git a/media/css/zamboni/mobile.css b/media/css/zamboni/mobile.css
@@ -434,6 +434,20 @@ header #home, header .back-link {
     border-bottom-color: #444;
     pointer-events: none;
 }
+
+.get-fx-message {
+    border: 1px solid #e3873b;
+    -moz-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    background: #fcefb7 url(../../img/zamboni/icons/alert-32x32.png) 11px center no-repeat;
+    margin-top: 12px;
+    font-size: 105%;
+    clear: both;
+    display: none;
+    line-height: 1.1em;
+    padding: 12px 12px 10px 56px;
+}
 /************************************/
 /*             LISTVIEWS            */
 /************************************/

diff --git a/media/img/zamboni/icons/alert-32x32.png b/media/img/zamboni/icons/alert-32x32.png
diff --git a/media/js/zamboni/browser.js b/media/js/zamboni/browser.js
@@ -22,14 +22,16 @@ function BrowserUtils() {
     // browser detection
     var browser = {},
         browserVersion = 0,
-        pattern, match, i;
+        pattern, match, i,
+        badBrowser = true;
     for (i in userAgentStrings) {
         if (userAgentStrings.hasOwnProperty(i)) {
             pattern = userAgentStrings[i];
             match = pattern.exec(navigator.userAgent);
             browser[i] = !!(match && match.length === 3);
             if (browser[i]) {
                 browserVersion = escape_(match[2]);
+                badBrowser = false;
             }
         }
     }
@@ -53,6 +55,7 @@ function BrowserUtils() {
     return {
         "browser": browser,
         "browserVersion": browserVersion,
+        "badBrowser": badBrowser,
         "os": os,
         "platform": platform,
         "platformName": gettext(osStrings[platform])

diff --git a/media/js/zamboni/init.js b/media/js/zamboni/init.js
@@ -128,3 +128,7 @@ if (z.browser.firefox) {
 } else {
     z.fxBeta = false;
 }
+
+if (z.badBrowser) {
+    $(".get-fx-message").show();
+}
diff --git a/media/js/zamboni/mobile_buttons.js b/media/js/zamboni/mobile_buttons.js
@@ -184,7 +184,7 @@
                     if (self.tooOld) errors.push("tooOld");
                     if (self.tooNew) errors.push("tooNew");
                 } else {
-                    if (!appSupported) errors.push("badApp");
+                    if (!appSupported && !z.badBrowser) errors.push("badApp");
                     if (!platformSupported) {
                         errors.push("badPlatform");
                         dom.buttons.hide().eq(0).show();
@@ -209,6 +209,10 @@
                 }
             }
 
+            if (z.badBrowser) {
+                canInstall = false;
+            }
+
             if (!canInstall) {
                 dom.buttons.addClass("disabled");
                 if (!dom.buttons.filter(":visible").length) {

diff --git a/templates/mobile/base.html b/templates/mobile/base.html
@@ -45,6 +45,9 @@ <h1 class="site-title">
               </a>
             </h1>
           </hgroup>
+          <div class="get-fx-message">
+            {{ _('You need Firefox to install addons. <a href="http://mozilla.com/firefox">Learn More&nbsp;&raquo;</a>') }}
+          </div>
           {% block back_link %}
           <a href="{{ url('home') }}" id="home">
             <svg width="18" height="16"><polygon fill="#447BC4" points="9,0 18,9 15,9 15,16 11,16 11,11 7,11 7,18 3,16 3,9 0,9"/></svg>