diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 179 |
2 files changed, 118 insertions, 69 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 13f073a1c2..c0c04da2d0 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -896,8 +896,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? option="0" name="url" target = "_external"> - - http://join.secondlife.com/ + [create_account_url] </url> <usetemplate name="okcancelbuttons" @@ -2894,7 +2893,7 @@ You have been moved into a nearby region. name="AvatarMovedLast" type="alertmodal"> <tag>fail</tag> -Your last location is not currently available. +Your requested location is not currently available. You have been moved into a nearby region. </notification> @@ -2929,12 +2928,11 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. [APP_NAME] installation is complete. If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in. -Return to [http://join.secondlife.com secondlife.com] to create a new account? <tag>confirm</tag> <usetemplate name="okcancelbuttons" notext="Continue" - yestext="New Account..."/> + yestext="Create Account..."/> </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 44702c828f..9c96143aa3 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -7,11 +7,7 @@ name="panel_login" focus_root="true" top="600" - width="996"> - <panel.string - name="create_account_url"> - http://join.secondlife.com/ - </panel.string> + width="1130"> <string name="reg_in_client_url" translate="false"> http://secondlife.eniac15.lindenlab.com/reg-in-client/ </string> @@ -32,30 +28,43 @@ start_url="" top="0" height="600" - width="980"/> + width="996"/> <layout_stack + animate="false" follows="left|bottom|right" name="login_widgets" layout="topleft" orientation="horizontal" top="519" - width="996" + width="1130" height="80"> <layout_panel auto_resize="false" follows="left|bottom" name="login" layout="topleft" - width="705" - min_width="705" + width="310" + min_width="310" height="80"> <text follows="left|bottom" + font="SansSerif" + font.style="BOLD" + font.size="Large" + height="16" + name="log_in_text" + top="8" + left="15" + width="150"> + LOG IN + </text> + <text + follows="left|bottom" font="SansSerifSmall" height="16" name="username_text" - top="20" - left="20" + top="35" + left="15" width="150"> Username: </text> @@ -70,18 +79,20 @@ top_pad="0" name="username_combo" width="178"> +<!-- empirically, displayed width is 150 anyway?!? --> <combo_box.combo_button visible ="false"/> <combo_box.drop_down_button visible ="false"/> </combo_box> +<!-- left="175" based on actual "username_combo" width of 150 vs. 178 --> <text follows="left|bottom" font="SansSerifSmall" - height="15" - left_pad="-19" + height="16" name="password_text" - top="20" + top="35" + left="175" width="150"> Password: </text> @@ -94,34 +105,22 @@ select_on_focus="true" top_pad="0" width="135" /> - <check_box - control_name="RememberPassword" - follows="left|bottom" - font="SansSerifSmall" - height="16" - label="Remember password" - top_pad="3" - name="remember_check" - width="135" /> - <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="10" - name="connect_btn" - top="35" - width="90" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|bottom" + name="start_location_panel" + layout="topleft" + width="175" + min_width="175" + height="80"> <text follows="left|bottom" font="SansSerifSmall" - height="15" - left_pad="8" + height="16" + left="10" name="start_location_text" - top="20" + top="35" width="130"> Start at: </text> @@ -129,7 +128,7 @@ allow_text_entry="true" control_name="NextLoginLocation" follows="left|bottom" - height="23" + height="22" max_chars="128" top_pad="0" name="start_location_combo" @@ -146,60 +145,112 @@ label="<Type region name>" name="Typeregionname" value="" /> </combo_box> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|bottom" + name="grid_panel" + layout="topleft" + width="145" + height="80" + visible="false"> <combo_box allow_text_entry="false" font="SansSerifSmall" follows="left|right|bottom" height="23" max_chars="256" + left="10" + top="51" layout="topleft" top_pad="2" name="server_combo" - width="250" - visible="false" /> + width="135" /> </layout_panel> <layout_panel - tab_stop="false" - follows="right|bottom" - name="links" - width="205" - min_width="205" + auto_resize="false" + follows="left|bottom" + name="links_login_panel" + layout="topleft" + width="290" height="80"> <text - follows="right|bottom" + follows="left|bottom" font="SansSerifSmall" text_color="EmphasisColor" - halign="right" + left="10" height="16" - top="12" - right="-10" - name="create_new_account_text" - width="200"> - Sign up + name="login_help" + top="19" + width="280"> + Need help logging in? </text> <text - follows="right|bottom" + follows="left|bottom" font="SansSerifSmall" text_color="EmphasisColor" - halign="right" height="16" name="forgot_password_text" - top_pad="12" - right="-10" - width="200"> + top="35" + width="280"> Forgot your username or password? </text> + <button + follows="left|bottom" + top_pad="0" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Log In" + label_color="White" + layout="topleft" + name="connect_btn" + width="90" /> + <check_box + control_name="RememberPassword" + follows="left|bottom" + font="SansSerifSmall" + left="110" + top="56" + height="16" + label="Remember password" + top_pad="3" + name="remember_check" + width="145" /> + </layout_panel> + <layout_panel + tab_stop="false" + follows="right|bottom" + name="links" + width="210" + min_width="210" + height="80"> <text follows="right|bottom" - font="SansSerifSmall" - text_color="EmphasisColor" + font="SansSerif" + font.style="BOLD" + font.size="Large" halign="right" height="16" - name="login_help" - top_pad="2" - right="-10" + name="create_account_text" + top="8" + right="-15" width="200"> - Need help logging in? </text> + CREATE YOUR ACCOUNT + </text> + <button + follows="right|bottom" + top="35" + right="-15" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Start now" + label_color="White" + layout="topleft" + left_pad="10" + name="create_new_account_btn" + width="90" /> </layout_panel> </layout_stack> </panel> |