From f0c7346f9028c749d3a7bbd2a55a3c7d6863ad04 Mon Sep 17 00:00:00 2001
From: Chris Van <cwiemeersch@mozilla.com>
Date: Wed, 7 Sep 2011 14:24:18 -0700
Subject: [PATCH] new welcome message (bug 678788)

---
 apps/addons/tests/test_views.py | 12 ++++++++++++
 media/css/impala/header.less    |  3 +--
 templates/impala/base.html      | 13 ++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/addons/tests/test_views.py b/apps/addons/tests/test_views.py
index c3a3498ca96..2645fe9f190 100644
--- a/apps/addons/tests/test_views.py
+++ b/apps/addons/tests/test_views.py
@@ -62,6 +62,18 @@ def test_thunderbird(self):
         doc = pq(r.content)
         eq_('Add-ons for Thunderbird', doc('title').text())
 
+    def test_welcome_msg(self):
+        r = self.client.get('/en-US/firefox/')
+        welcome = pq(r.content)('#site-welcome').remove('a.close')
+        eq_(welcome.text(),
+            'Welcome to Firefox Add-ons. Choose from thousands of extra '
+            'features and styles to make Firefox your own.')
+        r = self.client.get('/en-US/thunderbird/')
+        welcome = pq(r.content)('#site-welcome').remove('a.close')
+        eq_(welcome.text(),
+            'Welcome to Thunderbird Add-ons. Add extra features and styles to '
+            'make Thunderbird your own.')
+
     def test_no_unreviewed(self):
         response = self.client.get(self.base_url)
         addon_lists = 'popular featured hotness personas'.split()
diff --git a/media/css/impala/header.less b/media/css/impala/header.less
index 2d333f1e962..4d025756d8c 100644
--- a/media/css/impala/header.less
+++ b/media/css/impala/header.less
@@ -339,8 +339,7 @@ button.search-button {
     border: 2px solid #e3873b;
     .border-radius(10px);
     display: none;
-    font-family: Arial, sans-serif;
-    font-size: 14px;
+    font: 14px/16px Arial, sans-serif;
     position: relative;
     margin-top: 22px;
     h3, p {
diff --git a/templates/impala/base.html b/templates/impala/base.html
index 4dfdea61613..545be61ca40 100644
--- a/templates/impala/base.html
+++ b/templates/impala/base.html
@@ -120,9 +120,16 @@
             {# L10n: {0} is an application, such as Firefox. #}
             <h3>{{ _('Welcome to {0} Add-ons.')|f(APP.pretty) }}</h3>
             <p>
-              {% trans app=APP.pretty %}
-                Choose from thousands of extra features and styles for {{ app }}.
-              {% endtrans %}
+              {% if APP == amo.FIREFOX %}
+                {% trans %}
+                  Choose from thousands of extra features and styles to make
+                  Firefox your own.
+                {% endtrans %}
+              {% else %}
+                {% trans app=APP.pretty %}
+                  Add extra features and styles to make {{ app }} your own.
+                {% endtrans %}
+              {% endif %}
             </p>
             <a href="#" class="close">{{ _('Close') }}</a>
           </div>