Bug 1199354 - add link to Firefox for iOS and fix link to Firefox for Android on Sync prefs pane. r=adw
authorMark Hammond <mhammond@skippinet.com.au>
Fri, 30 Oct 2015 21:29:53 +1100
changeset 270327 fc898522b3fb251031c8968e126792ac067e2902
parent 270326 dad7e0ee99051eb80ea281dd2c77817f4ff34ef7
child 270328 d989914e47e227efb248c7d8fe707b52149eaed7
push id29611
push userkwierso@gmail.com
push dateFri, 30 Oct 2015 23:16:47 +0000
treeherdermozilla-central@eb49e19d2e06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersadw
bugs1199354
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1199354 - add link to Firefox for iOS and fix link to Firefox for Android on Sync prefs pane. r=adw
browser/components/preferences/in-content/sync.xul
browser/locales/en-US/chrome/browser/preferences/sync.dtd
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -206,23 +206,26 @@
           </vbox>
         </groupbox>
       </vbox>
       <vbox>
         <image class="fxaSyncIllustration"/>
       </vbox>
     </hbox>
     <label class="fxaMobilePromo">
-        &mobilePromo.start;<!-- We put these comments to avoid inserting white spaces
-        --><image class="androidLogo"/><!--
-        --><label class="androidLink text-link" href="https://www.mozilla.org/firefox/android/"><!--
-        -->&mobilePromo.androidLink;</label><!--
-        -->&mobilePromo.end;
+        &mobilePromo2.start;<!-- We put these comments to avoid inserting white spaces
+        --><label class="androidLink text-link"
+                  href="https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
+        -->&mobilePromo2.androidLink;</label><!--
+        -->&mobilePromo2.iOSBefore;<!--
+        --><label class="iOSLink text-link"
+                  href="https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
+        -->&mobilePromo2.iOSLink;</label><!--
+        -->&mobilePromo2.end;
     </label>
-    <label class="androidAttribution">&androidAttribution;</label>
   </vbox>
 
   <vbox id="hasFxaAccount">
     <hbox>
       <vbox id="fxaContentWrapper">
         <groupbox id="fxaGroup">
           <caption><label>&syncBrand.fxAccount.label;</label></caption>
           <deck id="fxaLoginStatus">
@@ -337,28 +340,30 @@
                   label="&cancelChangeSyncDeviceName.label;"
                   hidden="true"/>
           <button id="fxaSaveChangeDeviceName"
                   label="&saveChangeSyncDeviceName.label;"
                   hidden="true"/>
         </hbox>
       </hbox>
     </groupbox>
-    <spacer class="separator"/>
     <label class="fxaMobilePromo">
-        &mobilePromo.start;<!-- We put these comments to avoid inserting white spaces
-        --><image class="androidLogo"/><!--
-        --><label class="androidLink text-link" href="https://www.mozilla.org/firefox/android/"><!--
-        -->&mobilePromo.androidLink;</label><!--
-        -->&mobilePromo.end;
+        &mobilePromo2.start;<!-- We put these comments to avoid inserting white spaces
+        --><label class="androidLink text-link"
+                  href="https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
+        -->&mobilePromo2.androidLink;</label><!--
+        -->&mobilePromo2.iOSBefore;<!--
+        --><label class="iOSLink text-link"
+                  href="https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&amp;utm_medium=firefox-browser&amp;utm_campaign=sync-preferences"><!--
+        -->&mobilePromo2.iOSLink;</label><!--
+        -->&mobilePromo2.end;
     </label>
-    <spacer flex="1"/>
+    <spacer class="separator" flex="1"/>
     <vbox id="tosPP-small" align="start">
       <label id="tosPP-small-ToS" class="text-link">
         &prefs.tosLink.label;
       </label>
       <label id="tosPP-small-PP" class="text-link">
         &fxaPrivacyNotice.link.label;
       </label>
     </vbox>
-    <label class="androidAttribution">&androidAttribution;</label>
   </vbox>
 </deck>
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -86,13 +86,23 @@ both, to better adapt this sentence to t
 <!ENTITY signedOut.caption            "Take your Web with you">
 <!ENTITY signedOut.description        "Synchronize your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.">
 <!ENTITY signedOut.accountBox.title   "Connect with a &syncBrand.fxAccount.label;">
 <!ENTITY signedOut.accountBox.create  "Create Account">
 <!ENTITY signedOut.accountBox.signin  "Sign In">
 
 <!ENTITY signedIn.engines.label       "Sync across all devices">
 
-<!ENTITY mobilePromo.start            "Download Firefox for ">
-<!-- LOCALIZATION NOTE (mobilePromo.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
-<!ENTITY mobilePromo.androidLink      "Androidâ„¢">
-<!ENTITY mobilePromo.end              " to sync with your mobile device.">
-<!ENTITY androidAttribution           "Android is a trademark of Google Inc.">
+<!-- LOCALIZATION NOTE (mobilePromo2.*): the following strings will be used to
+     create a single sentence with active links.
+     The resulting sentence in English is: "Sync to your mobile device.
+     Download Firefox for Android or Firefox for iOS." -->
+
+<!ENTITY mobilePromo2.start            "Sync to your mobile device. Download ">
+<!-- LOCALIZATION NOTE (mobilePromo2.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
+<!ENTITY mobilePromo2.androidLink      "Firefox for Android">
+
+<!-- LOCALIZATION NOTE (mobilePromo2.iOSBefore): This is text displayed between mobilePromo2.androidLink and mobilePromo2.iosLink -->
+<!ENTITY mobilePromo2.iOSBefore         " or ">
+<!-- LOCALIZATION NOTE (mobilePromo2.iOSLink): This is a link title that links to https://www.mozilla.org/firefox/ios/ -->
+<!ENTITY mobilePromo2.iOSLink          "Firefox for iOS">
+
+<!ENTITY mobilePromo2.end              ".">
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -619,58 +619,42 @@ description > html|a {
 
 .fxaFirefoxLogo {
   list-style-image: url(chrome://browser/skin/fxa/logo.png);
   max-width: 64px;
   margin-inline-end: 14px;
 }
 
 .fxaMobilePromo {
-  margin-top: 14px;
-  margin-bottom: 41px;
+  margin-bottom: 31px;
 }
 
 #fxaLoginRejectedWarning {
   list-style-image: url(chrome://browser/skin/warning.svg);
   filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
   margin: 4px 8px 0px 0px;
 }
 
 #syncOptions {
   margin-bottom: 27.5px;
 }
 
-.androidLogo {
-  list-style-image: url(chrome://browser/skin/fxa/android.png);
-  max-width: 24px;
-  position: relative;
-  top: 8px;
-  margin: 0px;
-  margin-inline-end: 5px;
-}
-
-.androidLink {
+.androidLink,
+.iOSLink {
   margin: 0;
 }
 
 #tosPP-small {
+  margin-top: 20px;
   margin-bottom: 20px;
 }
 
-.androidAttribution {
-  font-size: 12px;
-  color: #D1D2D3;
-}
-
 @media (min-resolution: 1.1dppx) {
   .fxaSyncIllustration {
     list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
   }
   .fxaFirefoxLogo {
     list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
   }
-  .androidLogo {
-    list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
-  }
   #fxaProfileImage {
     list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
   }
 }