Bug 1362571 - Move 'Saved Logins' button under the remember logins checkbox. r=mconley draft
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Fri, 05 May 2017 15:13:55 -0700
changeset 573527 fb6f0744e02797d5322f7458c84a55004a849597
parent 573526 e4c214e91757f598b20f09958ac1db38092afaee
child 573528 885a2e7e789964b4c78f38ac397ab402d7eae444
child 573529 b44724e5a7ae77ee2d2053c052895db176bcc7db
push id57415
push usermozilla@noorenberghe.ca
push dateFri, 05 May 2017 22:14:51 +0000
reviewersmconley
bugs1362571
milestone55.0a1
Bug 1362571 - Move 'Saved Logins' button under the remember logins checkbox. r=mconley MozReview-Commit-ID: 9TDKQXnvUlb
browser/components/preferences/in-content/privacy.xul
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -301,55 +301,53 @@
     </vbox>
   </deck>
 </groupbox>
 
 <!-- Passwords -->
 <groupbox id="passwordsGroup" orient="vertical" data-category="panePrivacy" hidden="true">
   <caption><label>&formsAndPasswords.label;</label></caption>
 
-  <hbox id="savePasswordsBox">
-    <checkbox id="savePasswords"
-              label="&rememberLogins1.label;" accesskey="&rememberLogins1.accesskey;"
-              preference="signon.rememberSignons"
-              onsyncfrompreference="return gPrivacyPane.readSavePasswords();"
-              flex="1" />
-    <button id="passwordExceptions"
-            class="accessory-button"
-            label="&passwordExceptions.label;"
-            accesskey="&passwordExceptions.accesskey;"
-            preference="pref.privacy.disable_button.view_passwords_exceptions"/>
-  </hbox>
   <grid id="passwordGrid">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
     <rows id="passwordRows">
-      <row id="masterPasswordRow">
-        <hbox id="masterPasswordBox">
-          <checkbox id="useMasterPassword"
-                    label="&useMasterPassword.label;"
-                    accesskey="&useMasterPassword.accesskey;"
-                    flex="1" />
-        </hbox>
-        <button id="changeMasterPassword"
+      <row id="savePasswordsBox">
+        <checkbox id="savePasswords"
+                  label="&rememberLogins1.label;" accesskey="&rememberLogins1.accesskey;"
+                  preference="signon.rememberSignons"
+                  onsyncfrompreference="return gPrivacyPane.readSavePasswords();"
+                  flex="1" />
+        <button id="passwordExceptions"
                 class="accessory-button"
-                label="&changeMasterPassword.label;"
-                accesskey="&changeMasterPassword.accesskey;"/>
+                label="&passwordExceptions.label;"
+                accesskey="&passwordExceptions.accesskey;"
+                preference="pref.privacy.disable_button.view_passwords_exceptions"/>
       </row>
       <row id="showPasswordRow">
         <hbox id="showPasswordsBox"/>
         <button id="showPasswords"
                 class="accessory-button"
                 label="&savedLogins.label;" accesskey="&savedLogins.accesskey;"
                 preference="pref.privacy.disable_button.view_passwords"/>
       </row>
     </rows>
   </grid>
+  <hbox id="masterPasswordRow">
+    <checkbox id="useMasterPassword"
+              label="&useMasterPassword.label;"
+              accesskey="&useMasterPassword.accesskey;"
+              flex="1" />
+    <button id="changeMasterPassword"
+            class="accessory-button"
+            label="&changeMasterPassword.label;"
+            accesskey="&changeMasterPassword.accesskey;"/>
+  </hbox>
 </groupbox>
 
 <!-- Tracking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true">
   <caption><label>&trackingProtectionHeader2.label;</label></caption>
   <vbox id="trackingprotectionbox" hidden="true">
     <hbox align="start">
       <vbox flex="1">