summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorErica Olsen <erica@lindenlab.com>2009-10-16 20:49:37 +0000
committerErica Olsen <erica@lindenlab.com>2009-10-16 20:49:37 +0000
commitc781844bb394647153aa9f2219cf2b594fdfbaaa (patch)
tree7fb55e3c7fe1181f9691bf803226dfd06f05125f /indra/newview/skins/default/xui
parent477c2acffab2796cebd4d9b2985c6990564e3eb7 (diff)
EXT-770 Update Me Profile and Me Edit Profile to match updated style guide
EXT-805 Update Me Pick Info and Me Edit Pick Info to match updated style guide
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_pick.xml87
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml87
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml22
3 files changed, 106 insertions, 90 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index ae8391d01e..736a60cfe7 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -6,37 +6,39 @@
label="Edit Pick"
layout="topleft"
left="0"
+ min_height="350"
name="panel_edit_pick"
top="0"
width="333">
+ <button
+ follows="top|right"
+ height="23"
+ image_overlay="BackArrow_Off"
+ layout="topleft"
+ name="back_btn"
+ picture_style="true"
+ left="10"
+ tab_stop="false"
+ top="2"
+ width="23" />
<text
type="string"
length="1"
follows="top"
- font="SansSerifHugeBold"
+ font="SansSerifHuge"
height="15"
layout="topleft"
- left="10"
+ left_pad="10"
name="title"
text_color="white"
top="5"
width="250">
Edit Pick
</text>
- <button
- follows="top|right"
- height="20"
- image_overlay="BackArrow_Off"
- layout="topleft"
- name="back_btn"
- picture_style="true"
- right="-20"
- top="7"
- width="20" />
<scroll_container
color="DkGray2"
- follows="left|top|right|bottom"
- height="470"
+ follows="all"
+ height="510"
layout="topleft"
left="10"
top_pad="10"
@@ -46,29 +48,32 @@
width="313">
<panel
name="scroll_content_panel"
- follows="left|top|right"
+ follows="left|top"
+ min_height="300"
layout="topleft"
top="0"
+ background_visible="false"
+ height="470"
left="0"
- width="298"
- height="555">
+ width="295">
<texture_picker
follows="left|top|right"
height="197"
- width="280"
+ width="290"
layout="topleft"
top="20"
left="10"
name="pick_snapshot" />
- <icon
- height="16"
- image_name="image_edit_icon.tga"
- layout="topleft"
- name="edit_icon"
- left="245"
- top="35"
- visible="true"
- width="16" />
+ <button
+ height="18"
+ image_overlay="AddItem_Off"
+ layout="topleft"
+ right="-5"
+ name="edit_icon"
+ label=""
+ tool_tip="Click to select an image"
+ top="27"
+ width="18" />
<text
type="string"
length="1"
@@ -80,8 +85,9 @@
left="10"
top="215"
name="Name:"
- text_color="white">
- Name:
+ text_color="white"
+ width="290">
+ Title:
</text>
<line_editor
follows="left|top|right"
@@ -93,7 +99,7 @@
max_length="63"
name="pick_name"
text_color="black"
- width="280" />
+ width="290" />
<text
type="string"
length="1"
@@ -105,13 +111,14 @@
left="10"
top_pad="20"
name="description_label"
- text_color="white">
+ text_color="white"
+ width="290">
Description:
</text>
<text_editor
follows="left|top|right"
height="100"
- width="280"
+ width="290"
hide_scrollbar="false"
layout="topleft"
left="10"
@@ -131,7 +138,8 @@
left="10"
name="location_label"
text_color="white"
- top_pad="20">
+ top_pad="20"
+ width="290">
Location:
</text>
<text
@@ -144,8 +152,7 @@
name="pick_location"
right="-10"
top_pad="2"
- text_color="white"
- width="280"
+ width="290"
word_wrap="true">
loading...
</text>
@@ -154,19 +161,21 @@
height="20"
label="Set to Current Location"
layout="topleft"
- left="10"
+ left="8"
+ top_pad="0"
name="set_to_curr_location_btn"
width="200" />
</panel>
</scroll_container>
<panel
follows="left|right|bottom"
- height="25"
+ height="20"
label="bottom_panel"
layout="topleft"
left="10"
name="bottom_panel"
- top_pad="2">
+ top_pad="5"
+ width="303">
<button
follows="bottom|left"
height="19"
@@ -183,7 +192,7 @@
layout="topleft"
name="cancel_btn"
left_pad="5"
- top_delta="0"
+ right="-1"
width="130" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 7aa2fa2632..d268258f6f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -93,6 +93,16 @@
name="second_life_image_panel"
top="0"
width="285">
+ <text
+ follows="left|top|right"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="0"
+ name="second_life_photo_title_text"
+ text_color="white"
+ value="[SECOND_LIFE]:"
+ width="170" />
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -102,39 +112,29 @@
layout="topleft"
left="0"
name="2nd_life_pic"
- top="10"
+ top_pad="0"
width="102" />
- <text
- follows="left|top|right"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left_pad="10"
- name="second_life_photo_title_text"
- text_color="white"
- top_delta="0"
- value="[SECOND_LIFE]:"
- width="170" />
</panel>
- <icon
- height="16"
- image_name="AddItem_Off"
+ <button
+ height="18"
+ image_overlay="AddItem_Off"
layout="topleft"
- left="90"
name="2nd_life_edit_icon"
+ label=""
+ left="87"
tool_tip="Click to select an image"
- top="10"
- width="16" />
+ top="25"
+ width="18" />
</panel>
<text_editor
type="string"
length="1"
follows="left|top|right"
font="SansSerifSmall"
- height="90"
+ height="100"
layout="topleft"
left="120"
- top="28"
+ top="18"
name="sl_description_edit"
width="173"
word_wrap="true">
@@ -143,10 +143,20 @@
follows="left|top"
height="117"
layout="topleft"
- top_pad="10"
+ top_pad="5"
left="10"
name="first_life_image_panel"
width="285">
+ <text
+ follows="left|top|right"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="0"
+ name="real_world_photo_title_text"
+ text_color="white"
+ value="Real World:"
+ width="173" />
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -156,37 +166,28 @@
layout="topleft"
left="0"
name="real_world_pic"
+ top_pad="0"
width="102" />
- <text
- follows="left|top|right"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left_pad="10"
- name="real_world_photo_title_text"
- text_color="white"
- top_delta="0"
- value="Real World:"
- width="173" />
</panel>
- <icon
- height="16"
- image_name="AddItem_Off"
+ <button
+ height="18"
+ image_overlay="AddItem_Off"
layout="topleft"
- left="90"
name="real_world_edit_icon"
+ label=""
+ left="87"
tool_tip="Click to select an image"
- top="130"
- width="16" />
+ top="148"
+ width="18" />
<text_editor
type="string"
length="1"
follows="left|top|right"
font="SansSerifSmall"
- height="90"
+ height="100"
layout="topleft"
left="120"
- top="150"
+ top="142"
name="fl_description_edit"
width="173"
word_wrap="true">
@@ -202,7 +203,7 @@
left="10"
name="title_homepage_text"
text_color="white"
- top_pad="5"
+ top_pad="10"
width="285">
Homepage:
</text>
@@ -269,7 +270,7 @@
left="10"
name="title_partner_text"
text_color="white"
- top_pad="5"
+ top_pad="0"
value="My Partner:"
width="150" />
<text
@@ -311,7 +312,7 @@
left="10"
name="title_afk_text"
text_color="white"
- top_pad="5"
+ top_pad="0"
width="190">
Away Timeout:
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 9f22f8a5ed..a32be90a33 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -36,10 +36,12 @@
name="profile_scroll"
reserve_scroll_corner="true"
opaque="true"
- top="0">
+ top="0"
+ width="313">
<panel
name="scroll_content_panel"
follows="left|top|right"
+ height="485"
layout="topleft"
top="0"
left="0"
@@ -51,7 +53,7 @@
left="10"
name="second_life_image_panel"
top="0"
- width="285">
+ width="290">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -76,8 +78,9 @@
width="170" />
<expandable_text
follows="left|top|right"
- height="90"
+ height="95"
layout="topleft"
+ left="107"
name="sl_description_edit"
width="173"
expanded_bg_visible="true"
@@ -92,7 +95,7 @@
top_pad="10"
left="10"
name="first_life_image_panel"
- width="285">
+ width="290">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -116,10 +119,11 @@
width="173" />
<expandable_text
follows="left|top|right"
- height="90"
+ height="95"
layout="topleft"
+ left="107"
name="fl_description_edit"
- width="170"
+ width="173"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -265,7 +269,8 @@
name="profile_buttons_panel"
top_pad="2"
bottom="10"
- height="19">
+ height="19"
+ width="313">
<button
follows="bottom|left"
height="19"
@@ -322,7 +327,8 @@
top_pad="-17"
name="profile_me_buttons_panel"
visible="false"
- height="19">
+ height="19"
+ width="313">
<button
follows="bottom|right"
font="SansSerifSmall"