diff options
| author | Erica Olsen <erica@lindenlab.com> | 2009-10-14 23:46:48 +0000 | 
|---|---|---|
| committer | Erica Olsen <erica@lindenlab.com> | 2009-10-14 23:46:48 +0000 | 
| commit | 76a9e26ba7cf02077b80fd7635fef7bf1a0dae41 (patch) | |
| tree | 1bcadb9332054e4b7759af0957dcd82a59d2f406 /indra | |
| parent | 93983272bd6077226d8f0650d0e1c87782b589f9 (diff) | |
EXT-1561 Update People Profiles to match Style guide
EXT-1562 Improve design of Home panel in Sidetray
Diffstat (limited to 'indra')
5 files changed, 271 insertions, 228 deletions
| diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 4274a37497..5333dfa2f5 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,14 +1,14 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel - bevel_style="in" - follows="left|top|right|bottom" - height="460" + follows="all" + height="535"   label="Notes & Privacy"   layout="topleft"   left="0"   name="panel_notes"   top="0" - width="313"> + width="313" +>      <layout_stack       name="layout"       orientation="vertical" @@ -16,34 +16,28 @@       layout="topleft"       left="0"       top="0" -     height="430" -     width="313" +     height="517"       border_size="0">          <panel           name="notes_stack"           follows="all"           layout="topleft"           top="0" -         left="0" -         height="390" -         width="313"> +         left="0">              <scroll_container               color="DkGray2" -             follows="left|top|right|bottom" -             height="390" +             follows="all"               layout="topleft"               left="0"               name="profile_scroll"               opaque="true" -             top="0" -             width="313"> +             top="0">                <panel -                 height="350" -                 layout="topleft" -                 name="profile_scroll_panel" -                 top="0" -                 left="0" -                 width="293"> +               layout="topleft" +               name="profile_scroll_panel" +               top="0" +               left="0" +               width="303">                  <text                   follows="left|top"                   font="SansSerifBold" @@ -52,17 +46,17 @@                   left="10"                   name="status_message"                   text_color="white" -                 top="5" +                 top="20"                   value="My private notes:"                   width="293" />                  <text_editor                   follows="left|top" -                 height="200" +                 height="120"                   layout="topleft"                   left="10"                   max_length="1000"                   name="notes_edit" -                 text_color="black" +                 text_color="DkGray"                   top_pad="10"                   width="280"                   word_wrap="true" /> @@ -74,70 +68,91 @@                   left="10"                   name="status_message2"                   text_color="white" -                 top_pad="10" -                 value="Let this person:" +                 top_pad="30" +                 value="Allow this person to:"                   width="293" />                  <check_box                   enabled="false" -                 height="20" +                 height="16"                   label="See my online status"                   layout="topleft"                   left="20"                   name="status_check" -                 top_pad="0"                   width="293" />                  <check_box                   enabled="false" -                 height="20" +                 height="16"                   label="See me on the map"                   layout="topleft"                   left="20"                   name="map_check" -                 top_pad="0"                   width="293" />                  <check_box                   enabled="false" -                 height="20" +                 height="16"                   label="Edit, delete or take my objects"                   layout="topleft"                   left="20"                   name="objects_check" -                 top_pad="0"                   width="293" />                </panel>              </scroll_container>          </panel>          <panel -         follows="bottom" +         follows="bottom|left"           height="30"           layout="topleft" -         left="10" +         left="0"           name="notes_buttons_panel" -         top_pad="5" -         width="280"           auto_resize="false"> -            <button -             enabled="false" -             follows="bottom|left" -             font="SansSerifSmallBold" -             height="25" -             label="Teleport" -             layout="topleft" -             left="0" -             name="teleport_btn" -             top="0" -             width="75" /> -            <button -             enabled="false" -             follows="bottom|left" -             font="SansSerifSmallBold" -             height="25" -             label="Map" -             layout="topleft" -             name="show_on_map_btn" -             top="0" -             left_pad="5" -             width="85" /> +       <button +         follows="bottom|left" +         height="19" +         label="Add" +         layout="topleft" +         left="0" +         mouse_opaque="false" +         name="add_friend" +         top="5" +         width="55" /> +        <button +         follows="bottom|left" +         height="19" +         label="IM" +         layout="topleft" +         name="im" +         top="5" +         left_pad="5" +         width="40" /> +        <button +         enabled="false" +         follows="bottom|left" +         height="19" +         label="Call" +         layout="topleft" +         name="call" +         left_pad="5" +         top="5" +         width="55" /> +        <button +         enabled="false" +         follows="bottom|left" +         height="19" +         label="Map" +         layout="topleft" +         name="show_on_map_btn" +         top="5" +         left_pad="5" +         width="50" /> +        <button +         follows="bottom|left" +         height="19" +         label="Teleport" +         layout="topleft" +         name="teleport" +         left_pad="5" +         top="5" +         width="90" />          </panel>      </layout_stack>  </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 1bd1953397..2869ec78f4 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -1,16 +1,16 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel - follows="left|top|right|bottom" - height="555" + follows="all" + height="535"   label="Picks"   layout="topleft"   left="0"   name="panel_picks"   top="0"   width="313"> -        <flat_list_view + <flat_list_view           color="DkGray2" -         follows="left|top|right|bottom" +         follows="all"           height="465"           layout="topleft"           left="0" @@ -18,14 +18,14 @@           opaque="true"           top="0"           width="313" /> -        <panel +   <panel           background_visible="true"           bevel_style="none"           enabled="false"           auto_resize="false"           follows="bottom"           left="0" -         height="23" +         height="18"           label="bottom_panel"           layout="topleft"           name="edit_panel" @@ -34,26 +34,24 @@              <button               enabled="false"               follows="bottom|left" -             font="SansSerifBigBold"               height="18"               image_selected="OptionsMenu_Press"               image_unselected="OptionsMenu_Off"                image_disabled="OptionsMenu_Disabled"               layout="topleft" -             left="10" +             left="0"               name="gear_menu_btn"               picture_style="true"               top="5"               width="18" />              <button               follows="bottom|left" -             font="SansSerifBigBold"               height="18"               image_disabled="AddItem_Disabled"               image_selected="AddItem_Press"               image_unselected="AddItem_Off"               layout="topleft" -             left="35" +             left_pad="15"               name="new_btn"               picture_style="true"               tool_tip="Create New Pick at Current Location" @@ -61,7 +59,6 @@               width="18" />              <button               follows="bottom|right" -             font="SansSerifBigBold"               height="18"               image_disabled="TrashItem_Disabled"               image_selected="TrashItem_Press" @@ -77,17 +74,56 @@           follows="bottom"           auto_resize="false"           layout="topleft" -         height="30" +         height="19"           name="buttons_cucks"           width="313"> -            <button -             enabled="false" -             follows="bottom|left" -             font="SansSerifSmallBold" -             height="25" -             label="Map" -             layout="topleft" -             name="show_on_map_btn" -             width="85" /> +       <button +         follows="bottom|left" +         height="19" +         label="Add" +         layout="topleft" +         left="0" +         mouse_opaque="false" +         name="add_friend" +         top="5" +         width="55" /> +        <button +         follows="bottom|left" +         height="19" +         label="IM" +         layout="topleft" +         name="im" +         top="5" +         left_pad="5" +         width="40" /> +        <button +         enabled="false" +         follows="bottom|left" +         height="19" +         label="Call" +         layout="topleft" +         name="call" +         left_pad="5" +         top="5" +         width="55" /> +        <button +         enabled="false" +         follows="bottom|left" +         height="19" +         label="Map" +         layout="topleft" +         name="show_on_map_btn" +         top="5" +         left_pad="5" +         width="50" /> +        <button +         follows="bottom|left" +         height="19" +         label="Teleport" +         layout="topleft" +         name="teleport" +         left_pad="5" +         top="5" +         width="90" />          </panel>  </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index bdd1d80663..ba933683e3 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,7 +1,7 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel   follows="all" - height="560" + height="535"   label="Profile"   layout="topleft"   left="0" @@ -10,7 +10,7 @@   width="313">      <string       name="CaptionTextAcctInfo"> -        [ACCTTYPE]  +        [ACCTTYPE]  [PAYMENTINFO] [AGEVERIFICATION]      </string>      <string @@ -27,33 +27,31 @@      <string       name="no_partner_text"       value="None" /> -    <scroll_container + <scroll_container       color="DkGray2" -     follows="left|top|right|bottom" -     height="500" +     follows="all" +     height="485"       min_height="300"       layout="topleft"       name="profile_scroll"       reserve_scroll_corner="true"       opaque="true" -     top="0" -     width="313"> -	 <panel -            name="scroll_content_panel" -	    follows="left|top|right" -	    layout="topleft" -	    top="0" -	    left="0" -	    width="300" -	    height="700"> +     top="0"> +      <panel +         name="scroll_content_panel" +         follows="left|top|right" +         layout="topleft" +         top="0" +         left="0" +         width="313">  	 <panel -	    follows="left|top" -	    height="117" -	    layout="topleft" -	    left="10" -	    name="second_life_image_panel" -	    top="10" -	    width="285"> +         follows="left|top" +         height="117" +         layout="topleft" +         left="10" +         name="second_life_image_panel" +         top="0" +         width="285">              <texture_picker               allow_no_texture="true"               default_image_name="None" @@ -67,7 +65,6 @@               width="102" />              <text               follows="left|top|right" -             font="SansSerifSmall"  	     font.style="BOLD"               height="15"               layout="topleft" @@ -82,9 +79,9 @@               height="90"               layout="topleft"               name="sl_description_edit" -             width="170" +             width="173"               expanded_bg_visible="true" -             expanded_bg_color="black"> +             expanded_bg_color="DkGray">                  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.              </expandable_text>          </panel> @@ -108,7 +105,6 @@               width="102" />              <text               follows="left|top|right" -             font="SansSerifSmall"  	     font.style="BOLD"               height="15"               layout="topleft" @@ -117,7 +113,7 @@               text_color="white"               top_delta="0"               value="Real World:" -             width="175" /> +             width="173" />              <expandable_text               follows="left|top|right"               height="90" @@ -125,7 +121,7 @@               name="fl_description_edit"               width="170"               expanded_bg_visible="true" -             expanded_bg_color="black"> +             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.              </expandable_text>          </panel> @@ -139,7 +135,7 @@           left="10"           name="me_homepage_text"           text_color="white" -         top_pad="10" +         top_pad="0"           width="280">               Homepage:          </text> @@ -149,19 +145,21 @@           layout="topleft"           left="10"           name="homepage_edit" +         top_pad="0"           value="http://librarianavengers.org" -         width="280" -         word_wrap="false" /> +         width="290" +         word_wrap="false" +         use_elipsis="true" +         />          <text           follows="left|top" -         font="SansSerifSmall"  	 font.style="BOLD" -         height="15" +         height="10"           layout="topleft"           left="10"           name="title_member_text"           text_color="white" -         top_pad="20" +         top_pad="10"           value="Member Since:"           width="280" />          <text @@ -170,20 +168,18 @@           layout="topleft"           left="10"           name="register_date" -         top_pad="5"           value="05/31/1976"           width="280"           word_wrap="true" />          <text           follows="left|top" -         font="SansSerifSmall"  	 font.style="BOLD"           height="15"           layout="topleft"           left="10"           name="title_acc_status_text"           text_color="white" -         top_pad="15" +         top_pad="10"           value="Account Status:"           width="280" />         <!-- <text @@ -203,20 +199,19 @@           layout="topleft"           left="10"           name="acc_status_text" -         top_pad="5" +         top_pad="0"           value="Resident. No payment info on file." -         width="280" +         width="295"           word_wrap="true" />          <text           follows="left|top" -         font="SansSerifSmall"  	 font.style="BOLD"           height="15"           layout="topleft"           left="10"           name="title_partner_text"           text_color="white" -         top_pad="15" +         top_pad="10"           value="Partner:"           width="280" />          <panel @@ -225,11 +220,11 @@           layout="topleft"           left="10"           name="partner_data_panel" -         top_pad="5" +         top_pad="0"           width="280">              <text               follows="left|top" -             height="15" +             height="10"               layout="topleft"               left="0"               name="partner_text" @@ -240,14 +235,13 @@           </panel>          <text           follows="left|top" -         font="SansSerifSmall"  	 font.style="BOLD"           height="15"           layout="topleft"           left="10"           name="title_groups_text"           text_color="white" -         top_pad="15" +         top_pad="10"           value="Groups:"           width="280" />          <text @@ -256,91 +250,93 @@           layout="topleft"           left="10"           name="sl_groups" -         top_pad="5" -         width="280" -         word_wrap="true"> +         top_pad="0" +         width="290" +         word_wrap="true" +         use_elipsis="true">              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.          </text>        </panel> -      </scroll_container> - -   <panel + </scroll_container> + <panel       follows="bottom|left"       layout="topleft"       left="0"       name="profile_buttons_panel" -     top_pad="0" -     height="25" -     width="313"> +     top_pad="2" +     bottom="10" +     height="19">          <button           follows="bottom|left" -         font="SansSerifSmallBold" -         height="25" -         label="Add Friend" +         height="19" +         label="Add"           layout="topleft"           left="0"           mouse_opaque="false"           name="add_friend" -         top="0" -         width="90" /> +         top="5" +         width="55" />          <button           follows="bottom|left" -         font="SansSerifSmallBold" -         height="25" +         height="19"           label="IM"           layout="topleft"           name="im" -         top="0" -         left_pad="0" +         top="5" +         left_pad="5"           width="40" />          <button           enabled="false"           follows="bottom|left" -         font="SansSerifSmallBold" -         height="25" +         height="19"           label="Call"           layout="topleft"           name="call" -         left_pad="0" -         top="0" +         left_pad="5" +         top="5" +         width="55" /> +        <button +         enabled="false" +         follows="bottom|left" +         height="19" +         label="Map" +         layout="topleft" +         name="show_on_map_btn" +         top="5" +         left_pad="5"           width="50" />          <button           follows="bottom|left" -         font="SansSerifSmallBold" -         height="25" +         height="19"           label="Teleport"           layout="topleft"           name="teleport" -         left_pad="0" -         top="0" -         width="77" /> -    </panel> -    <panel +         left_pad="5" +         top="5" +         width="90" /> + </panel> + <panel       follows="bottom|left"       layout="topleft"       left="0"       name="profile_me_buttons_panel" -     top_pad="0" +     top_pad="-3"       visible="false" -     height="25" -     width="313"> +     height="19">          <button -         follows="bottom|left" -         height="23" +         follows="bottom|right" +         height="19" +         left="10"           label="Edit Profile" -         layout="topleft" -         left="0"           name="edit_profile_btn" -         top="0"           width="130" />          <button -         follows="bottom|left" -         height="23" +         follows="bottom|right" +         height="19"           label="Edit Appearance" -         layout="topleft" -         left_pad="5" +         left_pad="10"           name="edit_appearance_btn" -         top="0" +         right="-10"           width="130" /> -    </panel> + </panel>  </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 606535115d..cf9ac3a94b 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -5,7 +5,6 @@   height="570"   layout="topleft"   min_height="350" - min_width="240"   name="panel_target_profile"   width="333">      <string @@ -16,48 +15,49 @@       name="status_offline">          Offline      </string> +    <button +     follows="top|right" +     height="23" +     image_overlay="BackArrow_Off" +     layout="topleft" +     name="back" +     picture_style="true" +     left="10" +     tab_stop="false" +     top="2" +     width="23" />      <text       follows="top|left|right"       font="SansSerifHugeBold" -     height="20" +     height="26"       layout="topleft" -     left="10" +     left_pad="10"       name="user_name"       text_color="white"       top="0"       value="(Loading...)" -     width="250" /> +     use_elipsis="true" +     width="275" />      <text       follows="top|left" -     height="16" +     height="13"       layout="topleft" -     left="10" +     left="45"       name="status"       text_color="LtGray_50" -     top_pad="5"       value="Online" -     width="100" /> -    <button -     follows="top|right" -     height="25" -     image_overlay="BackArrow_Off" -     layout="topleft" -     name="back" -     picture_style="true" -     right="-10" -     tab_stop="false" -     top="0" -     width="25" /> +     width="150" />      <tab_container -     follows="left|top|right|bottom" -     height="560" +     follows="all" +     height="535"       layout="topleft"       left="10"       name="tabs" -     tab_min_width="75" +     tab_min_width="95" +     tab_height="30"       tab_position="top" -     top_pad="15" -     width="285"> +     top_pad="10" +     width="313">          <panel           class="panel_profile"           filename="panel_profile.xml" diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 88379a5ed3..e991861e94 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -1,9 +1,9 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel   background_visible="true" - bevel_style="in" - follows="left|top|right|bottom" - height="420" + bevel_style="out" + follows="all" + height="560"   label="home_tab"   layout="topleft"   name="home_tab" @@ -13,37 +13,36 @@       bg_alpha_color="DkGray2"       class="panel_sidetray_home_info"       follows="left|top|right" -     height="130" +     height="120"       layout="topleft" -     left="10" +     left="15" +     top="17"       name="sidebar_people" -     width="313"> +     width="303">          <text           follows="left|right|top"           font="SansSerifBigBold"           height="30"           layout="topleft" -         left="5" +         left="10"           mouse_opaque="false"           name="tab_name" -         text_color="white" +         text_color="EmphasisColor"           top="10"           value="People"           width="200"           word_wrap="true" />          <icon -         color="DkGray"           follows="top|right"           height="20"           layout="topleft"           name="tab_icon"           right="-10"           top="10" -         image_name="TabIcon_People_Off" +         image_name="TabIcon_People_Selected"           width="20" />          <text           follows="left|right|bottom" -         font="SansSerifBold"           height="120"           layout="topleft"           left="10" @@ -61,37 +60,36 @@       bg_alpha_color="DkGray2"       class="panel_sidetray_home_info"       follows="left|top|right" -     height="130" +     height="120"       layout="topleft" -     left="10" +     left="15" +     top_pad="15"       name="sidebar_places" -     width="313"> +     width="303">          <text           follows="left|right|top"           font="SansSerifBigBold"           height="30"           layout="topleft" -         left="5" +         left="10"           mouse_opaque="false"           name="tab_name" -         text_color="white" +         text_color="EmphasisColor"           top="10"           value="Places"           width="200"           word_wrap="true" />          <icon -         color="DkGray"           follows="top|right"           height="20"           layout="topleft"           name="tab_icon"           right="-10"           top="10" -         width="20"  +         width="20"           image_name="TabIcon_Places_Selected"/>          <text -         follows="left|right|bottom|top" -         font="SansSerifBold" +         follows="all"           height="120"           layout="topleft"           left="10" @@ -109,37 +107,36 @@       bg_alpha_color="DkGray2"       class="panel_sidetray_home_info"       follows="left|top|right" -     height="130" +     height="120"       layout="topleft" -     left="10" +     left="15" +     top_pad="15"       name="sidebar_me" -     width="313"> +     width="303">          <text           follows="left|right|top"           font="SansSerifBigBold"           height="30"           layout="topleft" -         left="5" +         left="10"           mouse_opaque="false"           name="tab_name" -         text_color="white" +         text_color="EmphasisColor"           top="10"           value="My Profile"           width="200"           word_wrap="true" />          <icon -         color="DkGray"           follows="top|right"           height="20"           layout="topleft"           name="tab_icon"           right="-10"           top="10" -         width="20"  +         width="20"           image_name="TabIcon_Me_Selected"/>          <text -         follows="left|right|bottom|top" -         font="SansSerifBold" +         follows="all"           height="120"           layout="topleft"           left="10" @@ -157,37 +154,36 @@       bg_alpha_color="DkGray2"       class="panel_sidetray_home_info"       follows="left|top|right" -     height="130" +     height="120"       layout="topleft" -     left="10" +     left="15" +     top_pad="15"       name="sidebar_appearance" -     width="313"> +     width="303">          <text           follows="left|right|top"           font="SansSerifBigBold"           height="30"           layout="topleft" -         left="5" +         left="10"           mouse_opaque="false"           name="tab_name" -         text_color="white" +         text_color="EmphasisColor"           top="10"           value="My Appearance"           width="200"           word_wrap="true" />          <icon -         color="DkGray"           follows="top|right"           height="20"           layout="topleft"           name="tab_icon"           right="-10"           top="10" -         width="20"  -         image_name="TabIcon_Appearance_Off"/> +         width="20" +         image_name="TabIcon_Appearance_Selected"/>          <text -         follows="left|right|bottom|top" -         font="SansSerifBold" +         follows="all"           height="120"           layout="topleft"           left="10" | 
