diff options
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 306 insertions, 149 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml index ff27113d53..3dfa0a58df 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml @@ -13,66 +13,130 @@ name="no_classifieds" value="No Classifieds" /> - <loading_indicator - name="progress_indicator" - top="20" - right="-10" - height="23" - width="23" - follows="top|right" - layout="topleft" - visible="false" - /> - <button - name="new_btn" - label="New..." - tool_tip="Create a new classified at the current location" - enabled="false" - top="25" - left="5" - height="20" - width="70" - follows="left|top" - layout="topleft" - visible="true" - /> - <button - name="delete_btn" - label="Delete..." - tool_tip="Delete currently selected classified" - enabled="false" - left_pad="5" - height="20" - width="70" - follows="left|top" - layout="topleft" - visible="true" - /> - <tab_container - name="tab_classifieds" - top="50" - bottom="-21" - left="4" - right="-4" + + <layout_stack + name="main_stack" + top="0" + left="0" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + name="buttons_header" follows="all" layout="topleft" - halign="left" - tab_position="left" - tab_width="85" - use_ellipses="true" - /> - <text - name="classifieds_panel_text" - top="300" - left="110" - right="-110" - height="25" - follows="left|top|right" + height="50" + auto_resize="false" + user_resize="false"> + <button + name="new_btn" + label="New..." + tool_tip="Create a new classified at the current location" + enabled="false" + top="25" + left="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="true" + /> + <button + name="delete_btn" + label="Delete..." + tool_tip="Delete currently selected classified" + enabled="false" + left_pad="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="true" + /> + </layout_panel> + <layout_panel + name="main_body" + follows="all" layout="topleft" - halign="center" - mouse_opaque="false" - wrap="true" - > - Loading... - </text> + height="430" + auto_resize="true" + user_resize="false"> + <tab_container + name="tab_classifieds" + top="0" + bottom="-21" + left="4" + right="-4" + follows="all" + layout="topleft" + halign="left" + tab_position="left" + tab_width="85" + use_ellipses="true" + /> + + <layout_stack + name="indicator_stack" + top="220" + left="0" + right="-1" + height="28" + follows="top|left|right" + layout="topleft" + animate="false" + orientation="horizontal"> + <layout_panel + name="indicator_spacer_left" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + <layout_panel + name="buttons_header" + follows="all" + layout="topleft" + width="25" + auto_resize="false" + user_resize="false"> + <loading_indicator + name="progress_indicator" + top="1" + left="1" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false" + /> + </layout_panel> + <layout_panel + name="indicator_spacer_right" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + </layout_stack> + <text + name="classifieds_panel_text" + top="250" + left="110" + right="-110" + height="25" + follows="left|top|right" + layout="topleft" + halign="center" + mouse_opaque="false" + wrap="true" + > + Loading... + </text> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml index 208441e7f7..44d5c448c0 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml @@ -13,78 +13,142 @@ name="no_picks" value="No Picks" /> - <loading_indicator - name="progress_indicator" - top="20" - right="-10" - height="23" - width="23" - follows="top|right" - layout="topleft" - visible="false" - /> - <text - name="Tell everyone about your favorite places in Second Life." - top="5" - left="5" - right="-5" - height="16" - follows="left|top|right" + + <layout_stack + name="main_stack" + top="0" + left="0" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + name="buttons_header" + follows="all" layout="topleft" - halign="center" + height="50" + auto_resize="false" + user_resize="false"> + <text + name="header_text" + top="5" + left="5" + right="-5" + height="16" + follows="left|top|right" + layout="topleft" + halign="center" > Tell everyone about your favorite places in Second Life. - </text> - <button - name="new_btn" - label="New..." - tool_tip="Create a new pick at the current location" - enabled="false" - top_pad="4" - left="5" - height="20" - width="70" - follows="left|top" - layout="topleft" - visible="false" + </text> + <button + name="new_btn" + label="New..." + tool_tip="Create a new pick at the current location" + enabled="false" + top_pad="4" + left="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="false" /> - <button - name="delete_btn" - label="Delete..." - tool_tip="Delete currently selected pick" - enabled="false" - left_pad="5" - height="20" - width="70" - follows="left|top" - layout="topleft" - visible="false" + <button + name="delete_btn" + label="Delete..." + tool_tip="Delete currently selected pick" + enabled="false" + left_pad="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="false" /> - <tab_container - name="tab_picks" - top="50" - bottom="-5" - left="4" - right="-4" - tab_width="150" + </layout_panel> + <layout_panel + name="main_body" follows="all" layout="topleft" - halign="left" - tab_position="left" - use_ellipses="true" + height="430" + auto_resize="true" + user_resize="false"> + <tab_container + name="tab_picks" + top="0" + bottom="-5" + left="4" + right="-4" + tab_width="150" + follows="all" + layout="topleft" + halign="left" + tab_position="left" + use_ellipses="true" /> - <text - name="picks_panel_text" - top="300" - left="110" - right="-110" - height="25" - follows="left|top|right" + + <layout_stack + name="indicator_stack" + top="220" + left="0" + right="-1" + height="28" + follows="top|left|right" layout="topleft" - halign="center" - mouse_opaque="false" - wrap="true" + animate="false" + orientation="horizontal"> + <layout_panel + name="indicator_spacer_left" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + <layout_panel + name="buttons_header" + follows="all" + layout="topleft" + width="25" + auto_resize="false" + user_resize="false"> + <loading_indicator + name="progress_indicator" + top="1" + left="1" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false" + /> + </layout_panel> + <layout_panel + name="indicator_spacer_right" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + </layout_stack> + <text + name="picks_panel_text" + top="250" + left="100" + right="-100" + height="25" + follows="left|top|right" + layout="topleft" + halign="center" + mouse_opaque="false" + wrap="true" > Loading... - </text> + </text> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index 68d8726dc9..e23da2b7fe 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -13,9 +13,6 @@ name="AgeFormat" value="[AGE]" /> <string - name="no_partner_text" - value="Partner: None" /> - <string name="partner_text" value="Partner: [LINK]" /> <string @@ -95,7 +92,7 @@ Account: [ACCTTYPE] value="(loading...)" font="SansSerifBigLarge" top="0" - left="2" + left="10" right="-1" height="20" follows="left|top|right" @@ -105,7 +102,7 @@ Account: [ACCTTYPE] name="user_name" value="(loading...)" top_pad="0" - left="2" + left_delta="0" right="-1" height="16" follows="left|top|right" @@ -115,34 +112,64 @@ Account: [ACCTTYPE] name="user_age" value="(loading...)" top_pad="0" - left="2" + left_delta="0" right="-1" height="16" follows="left|top|right" layout="topleft"/> - <text - type="string" - name="partner_link" - value="Partner: (loading...)" + <layout_stack + name="partner_stack" top_pad="0" - left="2" + left_delta="0" right="-1" - height="16" + height="64" follows="left|top|right" layout="topleft" - translate="false" - use_ellipses="true" /> + animate="false" + orientation="vertical"> + <layout_panel + name="partner_layout" + follows="all" + layout="topleft" + height="16" + auto_resize="false" + user_resize="false" + visible="false"> + <text + type="string" + name="partner_link" + value="Partner: (loading...)" + top="0" + left="0" + right="-1" + height="16" + follows="left|top|right" + layout="topleft" + translate="false" + use_ellipses="true" + visible="true"/> + </layout_panel> + + <layout_panel + name="account_layout" + follows="all" + layout="topleft" + height="48" + auto_resize="false" + user_resize="false"> + <text + name="account_info" + value="Account: (loading...)" + top="15" + left="0" + right="-1" + height="16" + follows="left|top|right" + layout="topleft"/> + </layout_panel> + </layout_stack> - <text - name="account_info" - value="Account: (loading...)" - top_pad="0" - left="2" - right="-1" - height="16" - follows="left|top|right" - layout="topleft"/> <loading_indicator name="progress_indicator" @@ -157,7 +184,7 @@ Account: [ACCTTYPE] <menu_button layout="topleft" follows="left|bottom" - left="2" + left="10" bottom="-1" height="25" width="140" @@ -373,7 +400,9 @@ Account: [ACCTTYPE] h_pad="2" max_length="1000" parse_urls="true" - word_wrap="true"/> + word_wrap="true" + use_ellipses="true" + allow_scroll="false"/> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 324f1466a8..285ea03f8a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2807,8 +2807,8 @@ If you continue to receive this message, please contact Second Life support for <string name="NoPicksText">You haven't created any Picks. Click the New button to create a Pick.</string> <string name="NoClassifiedsText">You haven't created any Classifieds. Click the New button to create a Classified.</string> <string name="NoAvatarPicksClassifiedsText">User has no picks or classifieds</string> - <string name="NoAvatarPicksText">User has no picks</string> - <string name="NoAvatarClassifiedsText">User has no classifieds</string> + <string name="NoAvatarPicksText">This person has no picks</string> + <string name="NoAvatarClassifiedsText">This person has no classifieds</string> <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> |