[gnome-initial-setup/shell/4765: 359/362] Reorder account page elements

[Jasper St. Pierre <jstpierre src gnome org>]

commit 426e294ed63ddb9b4a6cc44515e33d43503ceca9
Author: Roddy Shuler <roddy endlessm com>
Date:   Tue Mar 17 08:51:54 2015 -0700

    Reorder account page elements
    
    For cosmetic purposes / readability only.
    No change to actual content.
    
    [endlessm/eos-shell#1623]

 .../pages/account/gis-account-page.ui              |  160 ++++++++++----------
 1 files changed, 80 insertions(+), 80 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-page.ui 
b/gnome-initial-setup/pages/account/gis-account-page.ui
index 9e19795..2297ef2 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page.ui
@@ -78,28 +78,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="account-password-explanation">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
-                <property name="margin_bottom">12</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">You may want to write down your password. Make 
sure you pay attention to upper case letters. If the caps lock key is pressed, the symbol ⚠ will appear at 
the right side of the space in which you're writing. You'll need to type in this password identically each 
time you access your account.</property>
-                <property name="wrap">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">7</property>
-                <property name="width">3</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkLabel" id="account-fullname-label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -199,34 +177,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="account-confirm-label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Confirm password</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">account-confirm-entry</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">6</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="account-confirm-entry">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
-                <property name="invisible_char">●</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">6</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -270,24 +220,31 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="local-continue">
+              <object class="GtkLabel" id="account-confirm-label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">To continue, please make sure you fill in all the 
blanks.</property>
-                <property name="wrap">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/>
-                </attributes>
+                <property name="halign">end</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Confirm password</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">account-confirm-entry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">11</property>
-                <property name="width">2</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="account-confirm-entry">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
             <child>
@@ -306,14 +263,25 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="account-reminder-entry">
+              <object class="GtkLabel" id="account-password-explanation">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="valign">start</property>
+                <property name="margin_bottom">12</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">You may want to write down your password. Make 
sure you pay attention to upper case letters. If the caps lock key is pressed, the symbol ⚠ will appear at 
the right side of the space in which you're writing. You'll need to type in this password identically each 
time you access your account.</property>
+                <property name="wrap">True</property>
+                <attributes>
+                  <attribute name="scale" value="0.8"/>
+                </attributes>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">9</property>
-                <property name="width">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">7</property>
+                <property name="width">3</property>
               </packing>
             </child>
             <child>
@@ -352,6 +320,17 @@
               </packing>
             </child>
             <child>
+              <object class="GtkEntry" id="account-reminder-entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">9</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkLabel" id="account-reminder-explanation">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -374,6 +353,27 @@
               </packing>
             </child>
             <child>
+              <object class="GtkLabel" id="local-continue">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="valign">start</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">To continue, please make sure you fill in all the 
blanks.</property>
+                <property name="wrap">True</property>
+                <attributes>
+                  <attribute name="scale" value="0.8"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">11</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
               <placeholder/>
             </child>
             <child>
@@ -482,6 +482,18 @@
               </packing>
             </child>
             <child>
+              <object class="GtkEntry" id="enterprise-login">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -497,18 +509,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="enterprise-login">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="invisible_char">●</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkEntry" id="enterprise-password">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>