Bug 597522 - Update Start page and Firstrun page [r=mbrubeck]

mobile/app/mobile.js

@@ -400,9 +400,15 @@ pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
 pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/mobile/%VERSION%/releasenotes/");
 //pref("app.support.baseURL", "http://support.mozilla.com/1/mobile/%VERSION%/%OS%/%LOCALE%/");
 pref("app.support.baseURL", "http://mobile.support.mozilla.com/");
-pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/faq/");
-pref("app.privacyURL", "http://www.mozilla.com/%LOCALE%/legal/privacy/firefox/mobile/");
+pref("app.privacyURL", "https://www.mozilla.com/%LOCALE%/legal/privacy/firefox/mobile/");
 pref("app.creditsURL", "http://www.mozilla.com/%LOCALE%/mobile/credits/");
+#if MOZ_UPDATE_CHANNEL == beta
+pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/mobile/beta/features/");
+pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/beta/faq/");
+#else
+pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/mobile/features/");
+pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/faq/");
+#endif
 
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
 pref("security.alternate_certificate_error_page", "certerror");

mobile/chrome/content/aboutHome.xhtml

@@ -84,7 +84,7 @@
     </div>
 
     <div id="about">
-      <img src="chrome://browser/skin/images/mozilla-32.png"/> <a href="http://www.mozilla.com/about/">&aboutHome.aboutMozilla;</a>
+      <img src="chrome://browser/skin/images/mozilla-32.png"/> <a href="http://www.firefox.com/m/feedback/">&aboutHome.giveFeedback;</a>
     </div>
   </div>
 

mobile/chrome/content/firstrun/firstrun.xhtml

@@ -73,17 +73,21 @@
     <div id="content">
       <h2></h2>
       <ul id="recommended">
-        <li id="sync"><a href="javascript:loadSync();"><b>&firstrun.sync.title;</b> <span>&firstrun.sync.description;</span></a></li>
-        <li id="addons"><a href="javascript:loadAddons();"><b>&firstrun.addons.title;</b> <span>&firstrun.addons.description;</span></a></li>
-        <li id="home"><a href="about:home"><b>&firstrun.home.title;</b> <span>&firstrun.home.description;</span></a></li>
+        <li id="sync"><a href="javascript:loadSync();"><b>&firstrun.sync2.title;</b> <span>&firstrun.sync2.description;</span></a></li>
+        <li id="addons"><a href="javascript:loadAddons();"><b>&firstrun.addons2.title;</b> <span>&firstrun.addons2.description;</span></a></li>
+        <li id="home"><a href="about:home"><b>&firstrun.home2.title;</b> <span>&firstrun.home2.description;</span></a></li>
       </ul>
 
-      <p id="relNotes"><a id="releaseNotesURL">&firstrun.relNotes.label;</a></p>
+      <p id="features"><a id="featuresURL">&firstrun.features;</a></p>
       <script type="application/javascript;version=1.8"><![CDATA[
         let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils;
         let gChromeWin = null;
+
         let links = [
           {id: "releaseNotesURL", pref: "app.releaseNotesURL"},
+          {id: "featuresURL", pref: "app.featuresURL"},
+          {id: "faqURL", pref: "app.faqURL"},
+          {id: "privacyURL", pref: "app.privacyURL"}
         ];
 
         function getChromeWin() {
@@ -121,12 +125,13 @@
 
         function setupLinks() {
           try {
-            let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"]
-                                      .getService(Ci.nsIURLFormatter);
-            links.forEach(function (link) {
-              let url = formatter.formatURLPref(link.pref);
+            let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
+            links.forEach(function(link) {
               let element = document.getElementById(link.id);
-              element.setAttribute("href", url);
+              if (element) {
+                let url = formatter.formatURLPref(link.pref);
+                element.setAttribute("href", url);
+              }
             });
           } catch (ex) {}
         }
@@ -138,10 +143,8 @@
     <div id="footer">
 
       <ul class="nav">
-        <!--
-        <li><a href="http://mozilla.com/m/faq">&firstrun.faq;</a></li>
-        <li><a href="http://mozilla.com/m/privacy">&firstrun.privacy;</a></li>
-        -->
+        <li><a id="faqURL">&firstrun.faq;</a></li>
+        <li><a id="privacyURL">&firstrun.privacy;</a></li>
       </ul>
 
       <div id="follow">

mobile/locales/en-US/chrome/aboutHome.dtd

@@ -2,7 +2,7 @@
 <!ENTITY aboutHome.recentTabs                   "Your tabs from last time">
 <!ENTITY aboutHome.remoteTabs                   "Tabs from your other computers">
 <!ENTITY aboutHome.recommendedAddons2           "Add-ons for your &brandShortName;">
-<!ENTITY aboutHome.aboutMozilla                 "About Mozilla">
+<!ENTITY aboutHome.giveFeedback                 "Give Feedback">
 <!ENTITY aboutHome.openAllTabs                  "Open all in tabs">
 <!ENTITY aboutHome.noTabs                       "No tabs from last time">
 <!ENTITY aboutHome.noAddons                     "No recommended add-ons">

mobile/locales/en-US/chrome/firstrun.dtd

@@ -1,12 +1,12 @@
 <!ENTITY firstrun.title                "Welcome to &brandShortName;">
 <!ENTITY firstrun.heading2             "Welcome to &brandShortName;">
-<!ENTITY firstrun.sync.title           "Get Firefox Sync">
-<!ENTITY firstrun.sync.description     "Share your &brandShortName; history, passwords, bookmarks &amp; tabs between your desktop &amp; mobile">
-<!ENTITY firstrun.addons.title         "Get Add-ons">
-<!ENTITY firstrun.addons.description   "Install add-ons to enhance your &brandShortName; experience">
-<!ENTITY firstrun.home.title           "Get Started">
-<!ENTITY firstrun.home.description     "Tap to go to your personalized Start page and start browsing the Web">
-<!ENTITY firstrun.relNotes.label       "See the Release Notes">
+<!ENTITY firstrun.sync2.title          "Sync Up">
+<!ENTITY firstrun.sync2.description    "Login with your Sync account info and share your history, passwords, bookmarks &amp; tabs between your desktop and mobile">
+<!ENTITY firstrun.addons2.title        "Customize">
+<!ENTITY firstrun.addons2.description  "Discover and install add-ons to add new functionality to your &brandShortName;">
+<!ENTITY firstrun.home2.title          "Browse">
+<!ENTITY firstrun.home2.description    "Skip all this and go to your personalized Start page to start browsing the web">
+<!ENTITY firstrun.features             "See More Features">
 <!ENTITY firstrun.faq                  "FAQ">
 <!ENTITY firstrun.privacy              "Privacy Policy">
 <!ENTITY firstrun.follow               "Follow us on:">

mobile/themes/core/firstRun.css

@@ -190,6 +190,13 @@ img {
 #firstrun ul#recommended li span {
   display: block;
   padding: 0 10px;
+  min-height: 150px;
+}
+
+@media (max-width: 499px) {
+  #firstrun ul#recommended li span {
+    min-height: 180px;
+  }
 }
 
 #firstrun ul#recommended li#sync b {
@@ -201,15 +208,15 @@ img {
 }
 
 #firstrun ul#recommended li#home b {
-  background-position: 50% -300px;
+  background-position: 50% -280px;
 }
 
-#firstrun #relNotes {
+#firstrun #features {
   clear: both;
   text-align: center;
 }
 
-#firstrun #relNotes a {
+#firstrun #features a {
   display: inline-block;
   padding: 5px 35px 5px 0;
   background: url("chrome://browser/content/firstrun/nav-arrow.png") right center no-repeat;