From eb60de37ec15c7893acc12fcca5a3b16ec0d6869 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 13 Jan 2015 18:10:18 +0200
Subject: MAINT-4790 WIP XML changes

---
 indra/newview/skins/default/xui/en/panel_login.xml | 128 +++++++--------------
 1 file changed, 41 insertions(+), 87 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a258a874b0..c69d5cdbca 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -30,7 +30,7 @@
       auto_resize="false"
       follows="left|right|top"
       name="ui_container"
-      width="960"
+      width="1000"
       left="0"
       top="0"
       height="172">
@@ -75,69 +75,28 @@
     select_on_focus="true"
     commit_on_focus_lost="false"
     bottom_delta="0"
-    width="200" />
-  <check_box
-    control_name="RememberPassword"
-    follows="left|top"
-    font="SansSerifMedium"
-    left_pad="20"
-    bottom_delta="-14"
-    height="24"
-    label="Remember me"
-    check_button.bottom="3"
-    name="remember_check"
-    width="145" />
-  <text
-    follows="left|top"
-    font="SansSerifMedium"
-    text_color="EmphasisColor"
-    height="16"
-    name="forgot_password_text"
-    left_delta="0"
-    bottom_delta="16"
-    width="200">
-    Forgotten password
-  </text>
-  <button
-    follows="left|top"
-    image_unselected="PushButton_Login"
-    image_pressed="PushButton_Login_Pressed"
-    image_hover="PushButton_Login_Over"
-    label="Log In"
-    label_color="White"
-    font="SansSerifMedium"
-    name="connect_btn"
-    enabled="true"
-    left="0"
-    width="80"
-    height="26"
-    bottom_delta="44" />
-  <text
-    follows="left|top"
-    font="SansSerifLarge"
-    height="24"
-    name="At_My_Last_Location_Label"
-    left_pad="8"
-    bottom_delta="1"
-    width="120">
-    at last location
-  </text>
+    width="165" />
   <combo_box
+    allow_text_entry="true"
     control_name="NextLoginLocation"
     follows="left|top"
     label="My favorite places"
-    height="26"
+    height="32"
     max_chars="128"
     combo_editor.font="SansSerifMedium"
-    left_pad="20"
+    left_pad="15"
     bottom_delta="0"
     name="start_location_combo"
     width="175"
     combo_button.scale_image="true">
+    <combo_box.item
+      label="My last location"
+      name="MyLastLocation"
+      value="last" />
     <combo_box.item
       label="My home"
       name="MyHome"
-      value="home" />
+      value="home" />     
   </combo_box>
   <button
     follows="left|top"
@@ -146,38 +105,12 @@
     image_hover="PushButton_Login_Over"
     label="Log In"
     label_color="White"
-    font="SansSerifMedium"
-    name="connect_favorite_btn"
-    left_pad="8"
-    width="80"
-    enabled="false"
-    height="26"
-    bottom_delta="0" />
-  <line_editor
-    follows="left|top"
-    width="170"
-    height="26"
-    left_pad="40"
-    text_pad_left="8"
-    name="location_edit"
-    label="Type a location"
-    font="SansSerifMedium"
-    select_on_focus="true"
-    commit_on_focus_lost="false"
-    bottom_delta="0" />
-  <button
-    follows="left|top"
-    image_unselected="PushButton_Login"
-    image_pressed="PushButton_Login_Pressed"
-    image_hover="PushButton_Login_Over"
-    label="Log In"
-    enabled="false"
-    label_color="White"
-    font="SansSerifMedium"
-    name="connect_location_btn"
-    left_pad="8"
-    width="80"
-    height="26"
+    font="SansSerifBold"
+    name="connect_btn"
+    enabled="true"    
+    width="120"
+    height="32"
+  	left_pad="15"
     bottom_delta="0" />
   <combo_box
     allow_text_entry="false"
@@ -186,14 +119,35 @@
     height="26"
     max_chars="128"
     label="Select grid"
-    left_pad="40"
+    left_pad="15"
     bottom_delta="0"
     layout="topleft"
-    top_pad="2"
     name="server_combo"
     width="128" />
-    </layout_panel>
-    <layout_panel
+  <check_box
+    control_name="RememberPassword"
+    follows="left|top"
+    font="SansSerifMedium"
+    left="185"
+    bottom_delta="21"  	
+    height="24"
+    label="Remember me"
+    check_button.bottom="3"
+    name="remember_check"
+    width="145" />
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    text_color="EmphasisColor"
+    height="16"
+    name="forgot_password_text"
+    left="419"    
+    bottom_delta="0"
+    width="200">
+    Forgotten password
+  </text> 
+  </layout_panel>
+  <layout_panel
       height="172"
       auto_resize="true"
       name="ui_elastic_pad_right"
-- 
cgit v1.2.3


From ef31cdef028c77201e502ccc9d30259c76cc4aaf Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 14 Jan 2015 13:03:15 +0200
Subject: MAINT-4790 WIP XML changes

---
 indra/newview/skins/default/xui/en/panel_login.xml | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index c69d5cdbca..2c0f6fdb03 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -19,7 +19,7 @@
   left="0"
   name="ui_stack"
   orientation="horizontal"
-  top="0"
+  top="10"
   width="1024">
     <layout_panel
       height="172"
@@ -65,7 +65,7 @@
   <line_editor
     follows="left|top"
     height="32"
-    left_pad="0"
+    left_pad="-11"
     max_length_bytes="16"
     text_pad_left="8"
     name="password_edit"
@@ -111,19 +111,7 @@
     width="120"
     height="32"
   	left_pad="15"
-    bottom_delta="0" />
-  <combo_box
-    allow_text_entry="false"
-    font="SansSerifTiny"
-    follows="left|top"
-    height="26"
-    max_chars="128"
-    label="Select grid"
-    left_pad="15"
-    bottom_delta="0"
-    layout="topleft"
-    name="server_combo"
-    width="128" />
+    bottom_delta="0" />  
   <check_box
     control_name="RememberPassword"
     follows="left|top"
@@ -141,11 +129,23 @@
     text_color="EmphasisColor"
     height="16"
     name="forgot_password_text"
-    left="419"    
+    left="408"    
     bottom_delta="0"
     width="200">
     Forgotten password
   </text> 
+  <combo_box
+    allow_text_entry="false"
+    font="SansSerifTiny"
+    follows="left|top"
+    height="26"
+  	left="588"
+  	bottom_delta="10"
+    max_chars="128"
+    label="Select grid"    
+    layout="topleft"
+    name="server_combo"
+    width="149" />	
   </layout_panel>
   <layout_panel
       height="172"
-- 
cgit v1.2.3


From 7bd45ab3622f27e0a424eb61f2682e82439ec9e6 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 19 Jan 2015 13:09:24 +0200
Subject: MAINT-4790 WIP Show focused background image for login text fields.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 2c0f6fdb03..4c1455574b 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -56,7 +56,8 @@
     name="username_combo"
     width="232">
     <combo_box.combo_editor
-      text_pad_left="8" />
+      text_pad_left="8" 
+      bg_image_always_focused="true"/>
     <combo_box.combo_button
       visible="false" />
     <combo_box.drop_down_button
@@ -70,6 +71,7 @@
     text_pad_left="8"
     name="password_edit"
     label="Password"
+  	bg_image_always_focused="true"
     font="SansSerifLarge"
     is_password="true"
     select_on_focus="true"
@@ -89,6 +91,8 @@
     name="start_location_combo"
     width="175"
     combo_button.scale_image="true">
+    <combo_box.combo_editor
+      bg_image_always_focused="true"/>
     <combo_box.item
       label="My last location"
       name="MyLastLocation"
-- 
cgit v1.2.3


From 20c2eda0e1bf563afb73af3112ccd3d825147916 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 22 Jan 2015 14:12:34 +0200
Subject: MAINT-4790 WIP Previously selected login location is correctly shown
 now. Font on the Log In button was changed back. Text offset was set for
 Locations combobox.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 4c1455574b..204d812250 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -80,7 +80,7 @@
     width="165" />
   <combo_box
     allow_text_entry="true"
-    control_name="NextLoginLocation"
+    control_name="NextLoginLocation"    
     follows="left|top"
     label="My favorite places"
     height="32"
@@ -92,7 +92,8 @@
     width="175"
     combo_button.scale_image="true">
     <combo_box.combo_editor
-      bg_image_always_focused="true"/>
+      bg_image_always_focused="true"
+      text_pad_left="8"/>
     <combo_box.item
       label="My last location"
       name="MyLastLocation"
@@ -109,7 +110,7 @@
     image_hover="PushButton_Login_Over"
     label="Log In"
     label_color="White"
-    font="SansSerifBold"
+    font="SansSerifMedium"
     name="connect_btn"
     enabled="true"    
     width="120"
-- 
cgit v1.2.3


From cccdd1fb397240fda99663b403e00b2582c202ba Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 30 Jan 2015 15:36:00 +0200
Subject: MAINT-4853 FIXED Pressing the ENTER key when entering a location into
 the Type a location field, doesn't log you in

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 204d812250..183ae2e824 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -85,7 +85,7 @@
     label="My favorite places"
     height="32"
     max_chars="128"
-    combo_editor.font="SansSerifMedium"
+    combo_editor.font="SansSerifLarge"
     left_pad="15"
     bottom_delta="0"
     name="start_location_combo"
-- 
cgit v1.2.3