From a58c38ad74c30a34b0719c93a8536838148587a7 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Wed, 5 Jan 2011 09:20:59 -0800
Subject: [PATCH] Bug 618300 - Easy Setup UI: "Device Connected" modal dialog
 has no OK/Close button. r=mconnor a=blocking-betaN

---
 browser/base/content/syncAddDevice.js  | 22 +++++++++++-----------
 browser/base/content/syncAddDevice.xul | 26 +++++++++++++-------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/browser/base/content/syncAddDevice.js b/browser/base/content/syncAddDevice.js
index 82ac771ac33..10f0131271c 100644
--- a/browser/base/content/syncAddDevice.js
+++ b/browser/base/content/syncAddDevice.js
@@ -45,8 +45,8 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 const PIN_PART_LENGTH = 4;
 
 const ADD_DEVICE_PAGE       = 0;
-const DEVICE_CONNECTED_PAGE = 1;
-const SYNC_KEY_PAGE         = 2;
+const SYNC_KEY_PAGE         = 1;
+const DEVICE_CONNECTED_PAGE = 2;
 
 let gSyncAddDevice = {
 
@@ -70,21 +70,21 @@ let gSyncAddDevice = {
       case ADD_DEVICE_PAGE:
         this.wizard.canAdvance = false;
         this.wizard.canRewind = false;
+        this.wizard.getButton("next").hidden = false;
         this.pin1.focus();
         break;
+      case SYNC_KEY_PAGE:
+        this.wizard.canAdvance = false;
+        this.wizard.canRewind = true;
+        this.wizard.getButton("back").hidden = false;
+        this.wizard.getButton("next").hidden = true;
+        document.getElementById("weavePassphrase").value =
+          Weave.Utils.hyphenatePassphrase(Weave.Service.passphrase);
+        break;
       case DEVICE_CONNECTED_PAGE:
         this.wizard.canAdvance = true;
         this.wizard.canRewind = false;
-        this.wizard.getButton("next").hidden = true;
         this.wizard.getButton("cancel").hidden = true;
-        this.wizard.getButton("finish").hidden = false;
-        break;
-      case SYNC_KEY_PAGE:
-        this.wizard.canAdvance = true;
-        this.wizard.canRewind = true;
-        this.wizard.getButton("back").hidden = false;
-        document.getElementById("weavePassphrase").value =
-          Weave.Utils.hyphenatePassphrase(Weave.Service.passphrase);
         break;
     }
   },
diff --git a/browser/base/content/syncAddDevice.xul b/browser/base/content/syncAddDevice.xul
index d0ec9d2abeb..ccc051d5a30 100644
--- a/browser/base/content/syncAddDevice.xul
+++ b/browser/base/content/syncAddDevice.xul
@@ -114,18 +114,6 @@
            onclick="gSyncAddDevice.goToSyncKeyPage();"/>
   </wizardpage>
 
-  <wizardpage id="deviceConnectedPage"
-              label="&addDevice.dialog.connected.label;"
-              onpageshow="gSyncAddDevice.onPageShow();">
-    <vbox align="center">
-      <image id="successPageIcon"/>
-    </vbox>
-    <separator/>
-    <description class="normal">
-      &addDevice.dialog.successful.label;
-    </description>
-  </wizardpage>
-
   <!-- Need a non-empty label here, otherwise we get a default label on Mac -->
   <wizardpage id="syncKeyPage"
               label=" "
@@ -140,7 +128,7 @@
              accesskey="&syncKeyEntry.accesskey;"
              control="weavePassphrase"/>
       <textbox id="weavePassphrase"
-               disabled="true"/>
+               readonly="true"/>
     </groupbox>
 
     <groupbox align="center">
@@ -158,4 +146,16 @@
     </groupbox>
   </wizardpage>
 
+  <wizardpage id="deviceConnectedPage"
+              label="&addDevice.dialog.connected.label;"
+              onpageshow="gSyncAddDevice.onPageShow();">
+    <vbox align="center">
+      <image id="successPageIcon"/>
+    </vbox>
+    <separator/>
+    <description class="normal">
+      &addDevice.dialog.successful.label;
+    </description>
+  </wizardpage>
+
 </wizard>