From 1f1261b8cadb15664ad0ceec9fe5088402a8ee1c Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 2 Dec 2009 11:45:33 -0800
Subject: EXT-3064 New layout for Login page, wider default window size

---
 indra/newview/skins/default/xui/en/panel_login.xml | 187 ++++++++++-----------
 1 file changed, 93 insertions(+), 94 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 a9a02e8fc7..d07d4ea25f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -6,7 +6,7 @@
  left="0"
  name="panel_login"
  top="600"
- width="800">
+ width="996">
     <panel.string
      name="create_account_url">
         http://join.secondlife.com/
@@ -27,128 +27,79 @@
      border_visible="false"
      bottom="600"
      follows="all"
-	 hide_loading="true"
+     hide_loading="true"
      left="0"
      name="login_html"
      start_url=""
      top="0"
      height="600"
-     width="800"/>
+     width="996" />
     <panel
      follows="left|bottom|right"
      name="login_widgets"
      layout="topleft"
-     left="0"
-     top="0">
+     top="519"
+     width="996"
+     height="80">
     <text
      follows="left|bottom"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="16"
-     left="32"
+     left="20"
      name="first_name_text"
-     top="530"
-     width="120">
-        First Name:
+     top="20"
+     width="135">
+        Name:
     </text>
     <line_editor
      follows="left|bottom"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
+     label="First"
      left_delta="0"
      max_length="31"
      name="first_name_edit"
      select_on_focus="true"
      tool_tip="[SECOND_LIFE] First Name"
-     top_pad="2"
-     width="120" />
-    <text
-     follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="164"
-     name="last_name_text"
-     top="530"
-     width="120">
-        Last Name:
-    </text>
+     top_pad="0"
+     width="135" />
     <line_editor
      follows="left|bottom"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
-     left_delta="0"
+     height="23"
+     label="Last"
+     left_pad="8"
      max_length="31"
      name="last_name_edit"
      select_on_focus="true"
      tool_tip="[SECOND_LIFE] Last Name"
-     top_pad="2"
-     width="120" />
-    <text
-     follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="296"
-     name="password_text"
-     top="530"
-     width="120">
-        Password:
-    </text>
-    <line_editor
-     follows="left|bottom"
-     font="SansSerif"
-     handle_edit_keys_directly="true"
-     height="20"
-     left_delta="0"
-     max_length="16"
-     name="password_edit"
-     select_on_focus="true"
-     top_pad="2"
-     width="120" />
-     <button
-     follows="left|bottom"
-     height="23"
-     label="Log In"
-     label_selected="Log In"
-     layout="topleft"
-     left="425"
-     name="connect_btn"
-     top="546"
-     width="100" />
-    <combo_box
-     allow_text_entry="true"
-     follows="left|bottom"
-     height="23"
-     layout="topleft"
-     left_pad="5"
-     name="server_combo"
-     width="100" />
+     top_delta="0"
+     width="135" />
     <text
      follows="left|bottom"
-     font="SansSerif"
-     height="16"
-     left="32"
+     font="SansSerifSmall"
+     height="15"
+     left_pad="8"
      name="start_location_text"
-     top="576"
-     width="95">
-        Start location:
+     top="20"
+     width="135">
+        Starting location:
     </text>
     <combo_box
      allow_text_entry="true"
      control_name="LoginLocation"
      follows="left|bottom"
      height="23"
-     left_pad="0"
      max_chars="128"
+     top_pad="0"
      name="start_location_combo"
-     top_delta="-2"
-     width="155">
+     width="135">
         <combo_box.item
-         label="My Last Location"
+         label="My last location"
          name="MyLastLocation"
          value="last" />
         <combo_box.item
-         label="My Home"
+         label="My home"
          name="MyHome"
          value="home" />
         <combo_box.item
@@ -156,43 +107,91 @@
          name="Typeregionname"
          value="" />
     </combo_box>
+      <combo_box
+     allow_text_entry="true"
+     font="SansSerifSmall"
+     follows="left|bottom"
+     height="23"
+     layout="topleft"
+     top="60"
+     name="server_combo"
+     width="135"
+     visible="false" />
+     <text
+     follows="left|bottom"
+     font="SansSerifSmall"
+     height="15"
+     left_pad="3"
+     name="password_text"
+     top="20"
+     width="135">
+        Password:
+    </text>
+    <line_editor
+     follows="left|bottom"
+     handle_edit_keys_directly="true"
+     height="23"
+     left_delta="0"
+     max_length="16"
+     name="password_edit"
+     select_on_focus="true"
+     top_pad="0"
+     width="135" />
     <check_box
      control_name="RememberPassword"
      follows="left|bottom"
+     font="SansSerifSmall"
      height="16"
-     label="Remember password"
-     left_pad="10"
+     label="Remember"
+     left_pad="5"
      name="remember_check"
-     top_delta="3"
-     width="138" />
+     top_delta="5"
+     width="90" />
+     <button
+     follows="left|bottom"
+     height="23"
+     image_unselected="PushButton_On"
+     image_selected="PushButton_On_Selected"
+     label="Log In"
+     label_color="White"
+     layout="topleft"
+     left_pad="20"
+     name="connect_btn"
+     top="35"
+     width="90" />
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
      halign="right"
      height="16"
-     left="-210"
+     top="17"
+     left_pad="10"
+     right="-10"
      name="create_new_account_text"
-     top="539"
-     width="200">
-        Create a new account
+     width="180">
+        Sign up for account
     </text>
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
      halign="right"
      height="16"
-     left_delta="0"
      name="forgot_password_text"
-     top_pad="4"
-     width="200">
+     top_pad="2"
+     width="180">
         Forgot your name or password?
     </text>
     <text
      follows="right|bottom"
+     font="SansSerifSmall"
      halign="right"
-     height="16"
-     left="-310"
+     height="28"
+     top_pad="2"
      name="channel_text"
-     top="579"
-     width="300">
+     width="180"
+     word_wrap="true">
         [VERSION]
     </text>
   </panel>
-- 
cgit v1.2.3