From 92830dc68518ee3f30485918cb65a346f4e13910 Mon Sep 17 00:00:00 2001
From: Guigui <heygui@gmail.com>
Date: Mon, 18 Apr 2011 23:47:47 +0200
Subject: [PATCH] Bug 650310 - Added a FAQ above 'About us' section on both
 desktop and mobile pages

---
 apps/desktop/templates/desktop/dashboard.html |  1 +
 apps/desktop/templates/desktop/home.html      |  1 +
 apps/desktop/templates/desktop/user.html      |  1 +
 apps/mobile/templates/mobile/iphone.html      |  2 ++
 apps/mobile/templates/mobile/non_firefox.html |  2 ++
 apps/mobile/templates/mobile/user.html        |  4 +++-
 media/css/mobile.css                          |  5 ++++
 media/css/screen.css                          | 24 +++++++++++++++++++
 templates/mobile/page.html                    |  2 +-
 9 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/templates/desktop/dashboard.html b/apps/desktop/templates/desktop/dashboard.html
index 849562f..556fae9 100644
--- a/apps/desktop/templates/desktop/dashboard.html
+++ b/apps/desktop/templates/desktop/dashboard.html
@@ -23,6 +23,7 @@
                 {% include 'desktop/sections/challenges.html' %}
     			{% include 'desktop/sections/share.html' %}
 				{% include 'desktop/sections/globalspark.html' %}
+                {% include 'desktop/sections/faq.html' %}
 				{% include 'desktop/sections/about.html' %}
 
     	        {% include 'desktop/includes/footer.html' %}
diff --git a/apps/desktop/templates/desktop/home.html b/apps/desktop/templates/desktop/home.html
index 2d0ef31..1f84b4a 100644
--- a/apps/desktop/templates/desktop/home.html
+++ b/apps/desktop/templates/desktop/home.html
@@ -46,6 +46,7 @@
     			{% include 'desktop/sections/globalspark.html' %}
     		    {% include 'desktop/sections/learn.html' %}
     			{% include 'desktop/sections/getfirefox.html' %}
+                {% include 'desktop/sections/faq.html' %}
                 {% include 'desktop/sections/about.html' %}
                 
                 {% include 'desktop/includes/footer.html' %}
diff --git a/apps/desktop/templates/desktop/user.html b/apps/desktop/templates/desktop/user.html
index 9990e40..430b2d7 100644
--- a/apps/desktop/templates/desktop/user.html
+++ b/apps/desktop/templates/desktop/user.html
@@ -47,6 +47,7 @@
     			{% include 'desktop/sections/yourspark.html' %}
                 {% include 'desktop/sections/yourbadges.html' %}
                 {% include 'desktop/sections/globalspark.html' %}
+                {% include 'desktop/sections/faq.html' %}
     			{% include 'desktop/sections/about.html' %}
     			
     			{% include 'desktop/includes/footer.html' %}
diff --git a/apps/mobile/templates/mobile/iphone.html b/apps/mobile/templates/mobile/iphone.html
index 2f58831..3b5136f 100644
--- a/apps/mobile/templates/mobile/iphone.html
+++ b/apps/mobile/templates/mobile/iphone.html
@@ -58,6 +58,8 @@
     </div>
     <a href="http://www.mozilla.com/mobile/home/" class="button">{{ _('Learn more') }}</a>
 
+    {% include 'mobile/includes/faq.html' %}
+
     <hr>
     <div class="section">
         <h2>{{ _('About Us') }}</h2>
diff --git a/apps/mobile/templates/mobile/non_firefox.html b/apps/mobile/templates/mobile/non_firefox.html
index 0aa8407..b2c2a7b 100644
--- a/apps/mobile/templates/mobile/non_firefox.html
+++ b/apps/mobile/templates/mobile/non_firefox.html
@@ -65,6 +65,8 @@
     </div>
     <a href="http://www.mozilla.com/m/" class="button">{{ _('Learn more') }}</a>
 
+    {% include 'mobile/includes/faq.html' %}
+
     <hr>
     <div class="section">
         <h2>{{ _('About Us') }}</h2>
diff --git a/apps/mobile/templates/mobile/user.html b/apps/mobile/templates/mobile/user.html
index 81297b4..cceaef1 100644
--- a/apps/mobile/templates/mobile/user.html
+++ b/apps/mobile/templates/mobile/user.html
@@ -60,7 +60,7 @@
             {% if firefox %}
             {#  Compatible phone, viewing with Firefox, logged-out #}
             <hr>
-            <h2 class="cta"><a href="{{ url('mobile.instructions') }}">{{ _('What is Firefox Spark?') }}</a></h2>
+            <div class="cta"><a href="{{ url('mobile.instructions') }}">{{ _('What is Firefox Spark?') }}</a></div>
             <hr>
             {% else %}
             <hr>
@@ -107,6 +107,8 @@
      </div>
      <a href="http://www.mozilla.com/firefox/" class="button">{{ _('Learn more') }}</a>
 
+     {% include 'mobile/includes/faq.html' %}
+
      <hr>
      <div class="section">
          <h2>{{ _('About Us') }}</h2>
diff --git a/media/css/mobile.css b/media/css/mobile.css
index ceb3722..3fb76d5 100644
--- a/media/css/mobile.css
+++ b/media/css/mobile.css
@@ -1094,4 +1094,9 @@ body#user-share {
 
 .logged-out #flame-bg {
     top:0;
+}
+
+/* FAQ */
+#faq ol span {
+    font-weight:bold;
 }
\ No newline at end of file
diff --git a/media/css/screen.css b/media/css/screen.css
index 714658b..c373668 100644
--- a/media/css/screen.css
+++ b/media/css/screen.css
@@ -1656,3 +1656,27 @@ padding:5px 10px;
 .error404 h3 {
     margin-top:1em;
 }
+
+/* FAQ */
+
+#faq ol {
+    font-size:1.231em;
+}
+
+#faq ol li {
+    margin-top:20px;
+}
+
+#faq ol li:first-child {
+    margin-top:0px;
+}
+
+#faq ol p {
+    color:#999;
+    line-height:1.6em;
+}
+
+#faq ol span {
+    font-weight:bold;
+    color:#fff;
+}
\ No newline at end of file
diff --git a/templates/mobile/page.html b/templates/mobile/page.html
index 2a6518a..4ddb27a 100644
--- a/templates/mobile/page.html
+++ b/templates/mobile/page.html
@@ -1,6 +1,6 @@
 {% extends "mobile/base.html" %}
 
-{% if body_id not in ['user-share'] and hide_menu %}
+{% if body_id not in ['user-share', 'home'] and hide_menu %}
 {% set body_class = 'no-menu' %}
 {% endif %}