Bug 1392517 - Add 2nd header to about:preferences#sync and update button string r?mconley draft
authorRicky Chien <ricky060709@gmail.com>
Tue, 22 Aug 2017 15:08:13 +0800
changeset 651829 3e6a0192296de122b9f7d4b624b0e78bd848a43e
parent 651826 d1c70c20e7b52f7295411343e4dc5db8ee7c92b9
child 727872 7911afb52937ccdd832f197ccba046e4f3ca0bb3
push id75819
push userbmo:rchien@mozilla.com
push dateThu, 24 Aug 2017 02:12:25 +0000
reviewersmconley
bugs1392517
milestone57.0a1
Bug 1392517 - Add 2nd header to about:preferences#sync and update button string r?mconley
browser/components/preferences/in-content-new/sync.xul
browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js
browser/locales/en-US/chrome/browser/preferences/sync.dtd
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/in-content-new/sync.xul
+++ b/browser/components/preferences/in-content-new/sync.xul
@@ -87,16 +87,18 @@
         -->&mobilePromo3.end;
     </label>
   </groupbox>
 
   <vbox id="hasFxaAccount">
     <hbox>
       <vbox id="fxaContentWrapper" flex="1">
         <groupbox id="fxaGroup">
+          <caption class="search-header" hidden="true"><label>&paneSync1.title;</label></caption>
+
           <deck id="fxaLoginStatus" flex="1">
 
             <!-- logged in and verified and all is good -->
             <hbox id="fxaLoginVerified" align="center" flex="1">
               <image class="fxaProfileImage actionable"
                      role="button"
                      onclick="gSyncPane.openChangeProfileImage(event);"
                      onkeypress="gSyncPane.openChangeProfileImage(event);"
--- a/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js
+++ b/browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js
@@ -43,19 +43,19 @@ add_task(async function() {
     if (child.id == "header-searchResults" ||
         child.id == "weavePrefsDeck") {
       is_element_visible(child, "Should be in search results");
     } else if (child.id) {
       is_element_hidden(child, "Should not be in search results");
     }
   }
 
-  // Ensure the "Forget this Email" button exists in the hidden child of the <xul:deck>.
+  // Ensure the "Forget this email" button exists in the hidden child of the <xul:deck>.
   let unlinkFxaAccount = weavePrefsDeck.childNodes[1].querySelector("#unverifiedUnlinkFxaAccount");
-  is(unlinkFxaAccount.label, "Forget this Email", "The Forget this Email button should exist");
+  is(unlinkFxaAccount.label, "Forget this email", "The Forget this email button should exist");
 
   // Performs search.
   searchInput.focus();
   query = "Forget this Email";
   searchCompletedPromise = BrowserTestUtils.waitForEvent(
       gBrowser.contentWindow, "PreferencesSearchCompleted", evt => evt.detail == query);
   EventUtils.sendString(query);
   await searchCompletedPromise;
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -53,19 +53,19 @@ both, to better adapt this sentence to t
 <!ENTITY notSignedIn.label           "You are not signed in.">
 <!ENTITY signIn.label                "Sign in">
 <!ENTITY signIn.accesskey            "g">
 <!ENTITY profilePicture.tooltip      "Change profile picture">
 <!ENTITY verifiedManage.label        "Manage account">
 <!ENTITY verifiedManage.accesskey    "o">
 <!ENTITY disconnect3.label           "Disconnect…">
 <!ENTITY disconnect3.accesskey       "D">
-<!ENTITY verify.label                "Verify Email">
+<!ENTITY verify.label                "Verify email">
 <!ENTITY verify.accesskey            "V">
-<!ENTITY forget.label                "Forget this Email">
+<!ENTITY forget.label                "Forget this email">
 <!ENTITY forget.accesskey            "F">
 
 <!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.create2 "Don’t have an account? Get started">
 <!ENTITY signedOut.accountBox.create2.accesskey "C">
 <!ENTITY signedOut.accountBox.signin2 "Sign In…">
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -36,17 +36,18 @@
 #mainPrefPane description {
   font-size: 1.36rem;
 }
 
 groupbox + groupbox {
   margin-top: 16px;
 }
 
-groupbox + groupbox > .groupbox-body {
+groupbox + groupbox > .groupbox-body,
+groupbox + vbox groupbox > .groupbox-body {
   margin-top: 4px;
 }
 
 .groupbox-title {
   margin-top: 16px;
 }
 
 input,
@@ -544,17 +545,16 @@ separator.thin:not([orient="vertical"]) 
   padding-inline-end: 52px;
 }
 
 .separator {
   border-bottom: 1px solid var(--in-content-box-border-color);
 }
 
 #fxaGroup {
-  margin-top: 16px;
   margin-bottom: 32px;
 }
 
 #signedOutAccountBoxTitle {
   font-weight: bold;
 }
 
 .openLink {