Tidy and refactor Sync after Backporting

10 files changed, 44 insertions, 38 deletions

diff --git a/base/content/browser-context.inc b/base/content/browser-context.inc
index c0e4ef8..92bc03c 100644
--- a/base/content/browser-context.inc
+++ b/base/content/browser-context.inc
@@ -34,6 +34,7 @@
                   oncommand="gContextMenu.bookmarkThisPage();"/>
       </menugroup>
       <menuseparator id="context-sep-navigation"/>
+      <menuseparator id="page-menu-separator"/>
       <menuitem id="spell-no-suggestions"
                 disabled="true"
                 label="&spellNoSuggestions.label;"/>
diff --git a/base/content/browser-syncui.js b/base/content/browser-syncui.js
index 67056e2..af7f495 100644
--- a/base/content/browser-syncui.js
+++ b/base/content/browser-syncui.js
@@ -96,17 +96,25 @@ var gSyncUI = {
     document.getElementById("sync-setup-state").hidden = !needsSetup;
     document.getElementById("sync-syncnow-state").hidden = needsSetup;
 
-    if (!gBrowser)
+    if (!gBrowser) {
       return;
+    }
 
     let button = document.getElementById("sync-button");
-    if (!button)
+    if (!button) {
       return;
+    }
 
     button.removeAttribute("status");
+
     this._updateLastSyncTime();
-    if (needsSetup)
+
+    if (needsSetup) {
       button.removeAttribute("tooltiptext");
+      button.setAttribute("label", this._stringBundle.GetStringFromName("setupsync.label"));
+    } else {
+      button.setAttribute("label", this._stringBundle.GetStringFromName("syncnow.label"));
+    }
   },
 
 
@@ -120,6 +128,7 @@ var gSyncUI = {
       return;
 
     button.setAttribute("status", "active");
+    button.setAttribute("label", this._stringBundle.GetStringFromName("syncing2.label"));
   },
 
   onSyncDelay: function SUI_onSyncDelay() {
@@ -275,7 +284,6 @@ var gSyncUI = {
     openPreferences("paneSync");
   },
 
-
   // Helpers
   _updateLastSyncTime: function SUI__updateLastSyncTime() {
     if (!gBrowser)
diff --git a/base/content/browser.xul b/base/content/browser.xul
index 6b0d6ea..d15a76a 100644
--- a/base/content/browser.xul
+++ b/base/content/browser.xul
@@ -291,10 +291,10 @@
                 oncommand="BrowserFullScreen();"/>
     </menupopup>
 
-    <menupopup id="contentAreaContextMenu"
+    <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator"
                onpopupshowing="if (event.target != this)
                                  return true;
-                               gContextMenu = new nsContextMenu(this);
+                               gContextMenu = new nsContextMenu(this, event.shiftKey);
                                if (gContextMenu.shouldDisplay)
                                  updateEditUIVisibility();
                                return gContextMenu.shouldDisplay;"
@@ -768,17 +768,6 @@
                        cui-areatype="toolbar"
                        tooltip="dynamic-shortcut-tooltip"/>
 
-#ifdef MOZ_SERVICES_SYNC
-      <toolbarbutton id="sync-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&syncToolbarButton.label;"
-                     oncommand="gSyncUI.handleToolbarButton();"/>>
-      <toolbarbutton id="sync-tabs-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&syncTabsToolbarButton.label;"
-                     oncommand="BrowserOpenSyncTabs();"/>
-#endif
-
         <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        removable="true"
                        label="&homeButton.label;"
@@ -917,6 +906,18 @@
                      type="checkbox"
                      label="&fullScreenCmd.label;"
                      tooltip="dynamic-shortcut-tooltip"/>
+
+#ifdef MOZ_SERVICES_SYNC
+      <toolbarbutton id="sync-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&syncToolbarButton.label;"
+                     oncommand="gSyncUI.handleToolbarButton();"/>
+
+      <toolbarbutton id="sync-tabs-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&syncTabsToolbarButton.label;"
+                     oncommand="BrowserOpenSyncTabs();"/>
+#endif
     </toolbarpalette>
   </toolbox>
 
diff --git a/components/preferences/in-content/preferences.xul b/components/preferences/in-content/preferences.xul
index 6be6299..61639aa 100644
--- a/components/preferences/in-content/preferences.xul
+++ b/components/preferences/in-content/preferences.xul
@@ -143,6 +143,7 @@
         <image class="category-icon"/>
         <label class="category-name" flex="1">&paneSecurity.title;</label>
       </richlistitem>
+
 #ifdef MOZ_SERVICES_SYNC
       <richlistitem id="category-sync"
                     class="category"
@@ -154,6 +155,7 @@
         <label class="category-name" flex="1">&paneSync.title;</label>
       </richlistitem>
 #endif
+
       <richlistitem id="category-advanced"
                     class="category"
                     value="paneAdvanced"
diff --git a/components/preferences/in-content/sync.xul b/components/preferences/in-content/sync.xul
index a9b1870..13fac7a 100644
--- a/components/preferences/in-content/sync.xul
+++ b/components/preferences/in-content/sync.xul
@@ -138,7 +138,7 @@
                value="&unlinkDevice.label;"/>
       </hbox>
     </groupbox>
-        <hbox id="tosPP" pack="center">
+    <hbox id="tosPP" pack="center">
       <label class="text-link"
              onclick="event.stopPropagation();gSyncUtils.openToS();"
              value="&prefs.tosLink.label;"/>
@@ -148,7 +148,7 @@
     </hbox>
   </vbox>
 
-   <vbox id="needsUpdate" align="center" pack="center">
+  <vbox id="needsUpdate" align="center" pack="center">
     <hbox>
       <label id="loginError" value=""/>
       <label class="text-link"
diff --git a/locales/en-US/chrome/browser/syncKey.dtd b/locales/en-US/chrome/browser/syncKey.dtd
index 2ff0018..f37f2c9 100644
--- a/locales/en-US/chrome/browser/syncKey.dtd
+++ b/locales/en-US/chrome/browser/syncKey.dtd
@@ -5,12 +5,12 @@
 <!ENTITY syncKey.page.title               "Your &syncBrand.fullName.label; Key">
 <!ENTITY syncKey.page.description2        "This key is used to decode the data in your &syncBrand.fullName.label; account. You will need to enter the key each time you configure &syncBrand.fullName.label; on a new device.">
 <!ENTITY syncKey.keepItSecret.heading     "Keep it secret">
-<!ENTITY syncKey.keepItSecret.description "Your &syncBrand.fullName.label; account is encrypted to protect your privacy. Without this key, it would take years for anyone to decode your personal information. You are the only person who holds this key. This means you’re the only one who can access your &syncBrand.fullName.label; data.">
+<!ENTITY syncKey.keepItSecret.description "Your &syncBrand.fullName.label; account is encrypted to protect your privacy. Without this key, it would take years for anyone to decode your personal information. You are the only person who holds this key. This means you're the only one who can access your &syncBrand.fullName.label; data.">
 <!ENTITY syncKey.keepItSafe.heading       "Keep it safe">
 <!ENTITY syncKey.keepItSafe1.description  "Do not lose this key.">
-<!ENTITY syncKey.keepItSafe2.description  " We don’t keep a copy of your key (that wouldn’t be keeping it secret!) so ">
-<!ENTITY syncKey.keepItSafe3.description  "we can’t help you recover it">
-<!ENTITY syncKey.keepItSafe4a.description " if it’s lost. You’ll need to use this key any time you connect a new device to &syncBrand.fullName.label;.">
+<!ENTITY syncKey.keepItSafe2.description  " We don't keep a copy of your key (that wouldn't be keeping it secret!) so ">
+<!ENTITY syncKey.keepItSafe3.description  "we can't help you recover it">
+<!ENTITY syncKey.keepItSafe4a.description " if it's lost. You'll need to use this key any time you connect a new device to &syncBrand.fullName.label;.">
 <!ENTITY syncKey.findOutMore1.label       "Find out more about &syncBrand.fullName.label; and your privacy at ">
 <!ENTITY syncKey.findOutMore2.label       ".">
 <!ENTITY syncKey.footer1.label            "&syncBrand.fullName.label; Terms of Service are available at ">
diff --git a/locales/en-US/chrome/browser/syncSetup.dtd b/locales/en-US/chrome/browser/syncSetup.dtd
index 2657156..f993f7a 100644
--- a/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/locales/en-US/chrome/browser/syncSetup.dtd
@@ -6,13 +6,13 @@
 
 <!-- First page of the wizard -->
 
-<!ENTITY setup.pickSetupType.description2 "Welcome! If you’ve never used &syncBrand.fullName.label; before, you will need to create a new account.">
+<!ENTITY setup.pickSetupType.description2 "Welcome! If you've never used &syncBrand.fullName.label; before, you will need to create a new account.">
 <!ENTITY button.createNewAccount.label "Create a New Account">
 <!ENTITY button.haveAccount.label      "I Have an Account">
 
 <!ENTITY setup.choicePage.title.label     "Have you used &syncBrand.fullName.label; before?">
-<!ENTITY setup.choicePage.new.label       "I’ve never used &syncBrand.shortName.label; before">
-<!ENTITY setup.choicePage.existing2.label "I’m already using &syncBrand.shortName.label; on another device">
+<!ENTITY setup.choicePage.new.label       "I've never used &syncBrand.shortName.label; before">
+<!ENTITY setup.choicePage.existing2.label "I'm already using &syncBrand.shortName.label; on another device">
 
 <!-- New Account AND Existing Account -->
 <!ENTITY server.label               "Server">
@@ -60,7 +60,7 @@
 <!-- Existing Account Page 1: Pair a Device (incl. Pair a Device dialog strings) -->
 <!ENTITY pairDevice.title.label             "Pair a Device">
 <!ENTITY addDevice.showMeHow.label          "Show me how.">
-<!ENTITY addDevice.dontHaveDevice.label     "I don’t have the device with me">
+<!ENTITY addDevice.dontHaveDevice.label     "I don't have the device with me">
 <!ENTITY pairDevice.setup.description.label  "To activate, select &#x0022;Pair a Device&#x0022; on your other device.">
 <!ENTITY addDevice.setup.enterCode.label    "Then, enter this code:">
 <!ENTITY pairDevice.dialog.description.label "To activate your new device, select &#x0022;Set Up Sync&#x0022; on the device.">
@@ -72,7 +72,7 @@
 
 <!-- Existing Account Page 2: Manual Login -->
 <!ENTITY setup.signInPage.title.label "Sign In">
-<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Preferences on your other device, and selecting  &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
+<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
 <!ENTITY verifying.label              "Verifying…">
 <!ENTITY resetPassword.label          "Reset Password">
 <!ENTITY resetSyncKey.label           "I have lost my other device.">
@@ -96,14 +96,14 @@
 <!ENTITY engine.addons.label        "Add-ons">
 <!ENTITY engine.addons.accesskey    "A">
 
-<!ENTITY choice2a.merge.main.label       "Merge this device’s data with my &syncBrand.shortName.label; data">
+<!ENTITY choice2a.merge.main.label       "Merge this device's data with my &syncBrand.shortName.label; data">
 <!ENTITY choice2.merge.recommended.label "Recommended:">
 <!ENTITY choice2a.client.main.label      "Replace all data on this device with my &syncBrand.shortName.label; data">
-<!ENTITY choice2a.server.main.label      "Replace all other devices with this device’s data">
+<!ENTITY choice2a.server.main.label      "Replace all other devices with this device's data">
 
 <!-- Confirm Merge Options -->
 <!ENTITY setup.optionsConfirmPage.title "Confirm">
-<!ENTITY confirm.merge2.label    "&syncBrand.fullName.label; will now merge all this device’s browser data into your Sync account.">
+<!ENTITY confirm.merge2.label    "&syncBrand.fullName.label; will now merge all this device's browser data into your Sync account.">
 <!ENTITY confirm.client3.label         "Warning: The following &brandShortName; data on this device  will be deleted:">
 <!ENTITY confirm.client2.moreinfo.label "&brandShortName; will then copy your &syncBrand.fullName.label; data to this device.">
 <!ENTITY confirm.server2.label         "Warning: The following devices will be overwritten with your local data:">
diff --git a/locales/en-US/chrome/browser/syncSetup.properties b/locales/en-US/chrome/browser/syncSetup.properties
index 33ac0d4..0c49494 100644
--- a/locales/en-US/chrome/browser/syncSetup.properties
+++ b/locales/en-US/chrome/browser/syncSetup.properties
@@ -42,7 +42,7 @@ save.recoverykey.defaultfilename = Iceweasel-UXP Recovery Key.html
 
 newAccount.action.label = Sync is now set up to automatically sync all of your browser data.
 newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below.
-resetClient.change2.label = Sync will now merge all this device’s browser data into your Sync account.
+resetClient.change2.label = Sync will now merge all this device's browser data into your Sync account.
 wipeClient.change2.label = Sync will now replace all of the browser data on this device with the data in your Sync account.
 wipeRemote.change2.label = Sync will now replace all of the browser data in your Sync account with the data on this device.
 existingAccount.change.label = You can change this preference by selecting Sync Options below.
diff --git a/themes/shared/menupanel.inc.css b/themes/shared/menupanel.inc.css
index 9daa82a..6bbc9a7 100644
--- a/themes/shared/menupanel.inc.css
+++ b/themes/shared/menupanel.inc.css
@@ -49,7 +49,6 @@ toolbarpaletteitem[place="palette"] > #save-page-button {
 }
 
 %ifdef MOZ_SERVICES_SYNC
-
 #sync-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #sync-button {
   -moz-image-region: rect(0px, 384px, 32px, 352px)
@@ -71,7 +70,6 @@ toolbarpaletteitem[place="palette"] > #sync-button {
 toolbarpaletteitem[place="palette"] > #sync-tabs-button {
   -moz-image-region: rect(0px, 1024px, 32px, 992px);
 }
-
 %endif
 
 #containers-panelmenu[cui-areatype="menu-panel"],
diff --git a/themes/shared/toolbarbuttons.inc.css b/themes/shared/toolbarbuttons.inc.css
index 4d72b33..6675189 100644
--- a/themes/shared/toolbarbuttons.inc.css
+++ b/themes/shared/toolbarbuttons.inc.css
@@ -53,7 +53,6 @@ toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarke
 }
 
 %ifdef MOZ_SERVICES_SYNC
-
 #sync-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
@@ -78,7 +77,6 @@ toolbar[brighttext] #sync-button[cui-areatype="toolbar"][status="active"] {
 #sync-tabs-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 792px, 18px, 774px);
 }
-
 %endif
 
 #containers-panelmenu[cui-areatype="toolbar"] {
@@ -252,7 +250,6 @@ toolbar[brighttext] #sync-button[cui-areatype="toolbar"][status="active"] {
   }
 
 %ifdef MOZ_SERVICES_SYNC
-
   #sync-button[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 540px, 36px, 504px);
   }
@@ -277,7 +274,6 @@ toolbar[brighttext] #sync-button[cui-areatype="toolbar"][status="active"] {
   #sync-tabs-button[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 1584px, 36px, 1548px);
   }
-
 %endif
 
   #containers-panelmenu[cui-areatype="toolbar"] {