Bug 601019 - Sync UI: Always show "I have lost my Sync Key" and "Reset Password". r=mconnor a=blocking-betaN
authorPhilipp von Weitershausen <philipp@weitershausen.de>
Fri, 14 Jan 2011 14:44:58 -0800
changeset 60629 d3675348f88b5f5a6d9a6ae782a6679cb865f986
parent 60628 9091ba1594f883eaea9c5d8c3c79dc5d9fc5de85
child 60630 fcd0e21db895c9b6cadfa76c5aff88b9152dfdfa
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconnor, blocking-betaN
bugs601019
milestone2.0b10pre
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 601019 - Sync UI: Always show "I have lost my Sync Key" and "Reset Password". r=mconnor a=blocking-betaN
browser/base/content/syncSetup.xul
browser/locales/en-US/chrome/browser/syncSetup.dtd
--- a/browser/base/content/syncSetup.xul
+++ b/browser/base/content/syncSetup.xul
@@ -307,25 +307,26 @@
                      type="password"
                      onkeyup="gSyncSetup.checkFields(event)"
                      onchange="gSyncSetup.checkFields(event)"/>
           </row>
           <row id="existingPasswordFeedbackRow" align="center" hidden="true">
             <spacer/>
             <hbox>
               <image class="statusIcon"/>
-              <vbox>
-                <label class="status" value=" "/>
-                <label class="text-link"
-                       value="&resetPassword.label;"
-                       onclick="gSyncUtils.resetPassword(); return false;"/>
-              </vbox>
+              <label class="status" value=" "/>
             </hbox>
           </row>
           <row align="center">
+            <spacer/>
+            <label class="text-link"
+                   value="&resetPassword.label;"
+                   onclick="gSyncUtils.resetPassword(); return false;"/>
+	  </row>
+          <row align="center">
             <label control="existingServer"
                    value="&server.label;"/>
             <menulist id="existingServer"
                       oncommand="gSyncSetup.onExistingServerCommand()"
                       oninput="gSyncSetup.onExistingServerInput()">
               <menupopup>
                 <menuitem label="&serverType.main.label;"
                           value="main"/>
@@ -355,32 +356,30 @@
                oninput="gSyncSetup.checkFields()"/>
       <hbox id="login-throbber" hidden="true">
         <image/>
         <label value="&verifying.label;"/>
       </hbox>
       <vbox align="left" id="existingPassphraseFeedbackRow" hidden="true">
         <hbox>
           <image class="statusIcon"/>
-          <vbox>
-            <label class="status" value=" "/>
-            <label class="text-link"
-                   value="&lostSyncKey.label;"
-                   onclick="gSyncUtils.resetPassphrase(); return false;"/>
-          </vbox>
+          <label class="status" value=" "/>
         </hbox>
       </vbox>
     </groupbox>
 
     <vbox id="passphraseHelpBox">
       <description>
         &existingSyncKey.description;
         <label class="text-link"
                value="&addDevice.showMeHow.label;"
                href="https://services.mozilla.com/sync/help/manual-setup"/>
+        <label class="text-link"
+               value="&resetSyncKey.label;"
+               onclick="gSyncUtils.resetPassphrase(); return false;"/>
       </description>
     </vbox>
   </wizardpage>
 
   <wizardpage id="syncOptionsPage"
               label="&setup.optionsPage.title;"
               onpageshow="gSyncSetup.onPageShow()">
     <groupbox id="syncOptions">
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ -66,17 +66,17 @@
 <!ENTITY addDevice.dialog.syncKey.label     "To activate your device you will need to enter your Sync Key. Please print or save this key and take it with you.">
 <!ENTITY addDevice.dialog.connected.label   "Device Connected">
 
 <!-- Existing Account Page 2: Manual Login -->
 <!ENTITY setup.signInPage.title.label "Sign In">
 <!ENTITY existingSyncKey.description "You can get a copy of your Sync Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  &#x0022;My Sync Key&#x0022; under &#x0022;Manage Account&#x0022;.">
 <!ENTITY verifying.label              "Verifying…">
 <!ENTITY resetPassword.label          "Reset Password">
-<!ENTITY lostSyncKey.label            "I have lost my Sync Key">
+<!ENTITY resetSyncKey.label           "I have lost my other device.">
 
 <!-- Sync Options -->
 <!ENTITY setup.optionsPage.title      "Sync Options">
 <!ENTITY syncComputerName.label       "Computer Name:">
 <!ENTITY syncComputerName.accesskey   "c">
 
 <!ENTITY syncMy.label               "Sync My">
 <!ENTITY engine.bookmarks.label     "Bookmarks">