From fba95c8690a9fd8d3d4312cd670208d9c7e284d1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 14 Jun 2011 03:13:54 -0500
Subject: Rearranged the login panel to put the grid selector on the left.

The choice of grid affects the name and password fields, so the grid
selector should be on the left, so that users will interact with it
first. If it were on the right, users would often interact with it
*after* typing in their name and password, which would cause the name
and password fields to be reset, frustrating the user.
---
 .../skins/default/xui/en-us/panel_login.xml        | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index ae60abc..5e4bd39 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -30,10 +30,26 @@
 	</string>
 
 
+  <!-- GRIDS -->
+
+  <text name="grid_text"
+	      bottom="80" left="15" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+	      font="SansSerif" mouse_opaque="true">
+    Grid:
+  </text>
+  <combo_box name="server_combo"
+             bottom_delta="-20" left_delta="0" height="20" width="120"
+             follows="left|bottom" allow_text_entry="false"
+             max_chars="20" mouse_opaque="true" />
+
+
   <!-- FIRST NAME -->
 
 	<text name="first_name_text" 
-	      bottom="80" left="24" height="16" width="120"
+	      bottom="80" left="165" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -73,7 +89,7 @@
   <!-- SL USERNAME -->
 
   <text name="username_text"
-	      bottom="80" left="24" height="16" width="250"
+	      bottom="80" left="165" height="16" width="250"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -93,7 +109,7 @@
   <!-- PASSWORD -->
 
 	<text name="password_text" 
-	      bottom_delta="20" left="285" height="16" width="120"
+	      bottom_delta="20" left="425" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -110,26 +126,18 @@
                allow_translate="false" />
 
 
-  <!-- GRIDS -->
-
-  <text name="grid_text"
-	      bottom="80" left_delta="150" height="16" width="120"
-        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
-        bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-	      font="SansSerif" mouse_opaque="true">
-    Grid:
-  </text>
-  <combo_box name="server_combo"
-             bottom_delta="-20" left_delta="0" height="20" width="120"
-             follows="left|bottom" allow_text_entry="false"
-             max_chars="20" mouse_opaque="true" />
+  <!-- GRID MANAGER -->
+  
+  <button name="grid_btn" label="Grid Manager"
+        bottom="32" left="25" height="20" width="100"
+        follows="left|bottom" font="SansSerifSmall" halign="center"
+        mouse_opaque="true" scale_image="TRUE" />
 
 
   <!-- START LOCATION -->
 
   <text name="start_location_text"
-	      bottom="32" left="10" height="16" right="115"
+	      bottom_delta="0" left="125" height="16" width="115"
         follows="left|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -137,7 +145,7 @@
     Start location:
   </text>
   <combo_box name="start_location_combo"
-             bottom_delta="2" left="120" height="16" width="150"
+             bottom_delta="2" left_delta="125" height="16" width="150"
              follows="left|bottom" font="SansSerifSmall"
              mouse_opaque="true" allow_text_entry="true" max_chars="128">
     <combo_item name="MyHome" value="My Home">
@@ -155,23 +163,15 @@
   <!-- REMEMBER PASSWORD -->
 
   <check_box name="remember_check" label="Remember password"
-           bottom_delta="-2" left="282" height="16" width="140"
+           bottom_delta="-2" left="425" height="16" width="140"
            follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"
            initial_value="false" mouse_opaque="true"  />
 
 
-  <!-- GRID MANAGER -->
-  
-  <button name="grid_btn" label="Grid Manager"
-        bottom_delta="0" left="434" height="20" width="100"
-        follows="left|bottom" font="SansSerifSmall" halign="center"
-        mouse_opaque="true" scale_image="TRUE" />
-
-
   <!-- LOG IN -->
 
 	<button name="connect_btn" label="Log In"
-          bottom="58" left_delta="150" height="24" width="120"
+          bottom="58" left="575" height="24" width="120"
           follows="left|bottom" font="SansSerif" halign="center"
 	        mouse_opaque="true" scale_image="TRUE" />
 
-- 
cgit v1.1