livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try reorganizing panel_login.xml per Leo's redesign. 

This includes replacing the small "Sign up" link with a "CREATE YOUR ACCOUNT:
Start now" button, requiring a small tweak to the C++ code to Do The Right
Thing when the button (vs. the link) is clicked.
meow-7.2.2
Nat Goodspeed 2012-07-13 12:38:26 -04:00
parent b62cb3249c
commit 8356cc1c4f
2 changed files with 105 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llpanellogin.cpp
View File

@ -175,8 +175,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
forgot_password_text->setClickedCallback(onClickForgotPassword, NULL);
LLTextBox* create_new_account_text = getChild<LLTextBox>("create_new_account_text");
create_new_account_text->setClickedCallback(onClickNewAccount, NULL);
childSetAction("create_new_account_btn", onClickNewAccount, NULL);
LLTextBox* need_help_text = getChild<LLTextBox>("login_help");
need_help_text->setClickedCallback(onClickHelp, NULL);
@ -1025,7 +1024,7 @@ void LLPanelLogin::updateLoginPanelLinks()
// need to call through sInstance, as it's called from onSelectServer, which
// is static.
sInstance->getChildView("create_new_account_text")->setVisible( system_grid);
sInstance->getChildView("create_new_account_btn")->setVisible( system_grid);
sInstance->getChildView("forgot_password_text")->setVisible( system_grid);
}

173
indra/newview/skins/default/xui/en/panel_login.xml
View File

@ -42,16 +42,28 @@ auto_resize="false"
follows="left|bottom"
name="login"
layout="topleft"
width="705"
min_width="705"
width="865"
min_width="865"
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>
@ -66,19 +78,21 @@ tool_tip="The username you chose when you registered, like bobsmith12 or Steller
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"
width="150">
top="35"
left="175"
width="150">
Password:
</text>
<line_editor
@ -86,46 +100,25 @@ follows="left|bottom"
height="22"
max_length_bytes="16"
name="password_edit"
is_password="true"
is_password="true"
select_on_focus="true"
top_pad="0"
width="135" />
<check_box
control_name="RememberPassword"
<text
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" />
<text
follows="left|bottom"
font="SansSerifSmall"
height="15"
left_pad="8"
name="start_location_text"
top="20"
width="130">
Start at:
</text>
left="320"
name="start_location_text"
top="35"
width="130">
Start at:
</text>
<combo_box
allow_text_entry="true"
control_name="NextLoginLocation"
follows="left|bottom"
height="23"
height="22"
max_chars="128"
top_pad="0"
name="start_location_combo"
@ -142,60 +135,100 @@ name="MyHome"
label="&lt;Type region name&gt;"
name="Typeregionname" value="" />
</combo_box>
<text
follows="left|bottom"
font="SansSerif"
font.style="BOLD"
font.size="Large"
text_color="EmphasisColor"
left="370"
name="login_help"
top="32"
width="16">
☠
</text>
<combo_box
allow_text_entry="true"
font="SansSerifSmall"
follows="left|right|bottom"
height="23"
max_chars="256"
left="490"
top="51"
layout="topleft"
top_pad="2"
name="server_combo"
width="135"
visible="false" />
<text
follows="left|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
height="16"
name="forgot_password_text"
top="35"
left="630"
width="200">
Forgot your username or password?
</text>
<button
follows="left|bottom"
top_pad="0"
left="630"
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"
width="90" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
font="SansSerifSmall"
left="730"
top="56"
height="16"
label="Remember password"
top_pad="3"
name="remember_check"
width="135" />
</layout_panel>
<layout_panel
tab_stop="false"
follows="right|bottom"
name="links"
width="205"
min_width="205"
width="210"
min_width="210"
height="80">
<text
follows="right|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
halign="right"
height="16"
top="12"
right="-10"
name="create_new_account_text"
width="200">
Sign up
</text>
<text
follows="right|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
font="SansSerif"
font.style="BOLD"
font.size="Large"
halign="right"
height="16"
name="forgot_password_text"
top_pad="12"
right="-10"
width="200">
Forgot your username or password?
name="create_account_text"
top="8"
right="-15"
width="200">
CREATE YOUR ACCOUNT
</text>
<text
follows="right|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
halign="right"
height="16"
name="login_help"
top_pad="2"
right="-10"
width="200">
Need help logging in? </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" />
<!-- <text
follows="right|bottom"
font="SansSerifSmall"