Adding profile username and display name labels and emphasis coloring

2 files changed, 151 insertions, 127 deletions

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 bb67d68c8e..caf5cb8817 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -88,40 +88,64 @@
          left="0"
          width="292">
       <text
+     top="5"
+     follows="top|left"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="user_label"
+     text_color="LtGray"
+     value="Display Name:"
+     width="80" />
+      <button
+         name="set_name"
+         layout="topleft"
+         follows="top|left"
+         image_overlay="Edit_Wrench"
+         top="21"
+         left="10"
+         height="23"
+         width="23"
+         tool_tip="Set Display Name"/>
+      <text
        follows="top|left"
        font="SansSerifBigBold"
        height="20"
        layout="topleft"
-       left="10"
+       left_pad="10"
        name="user_name"
        text_color="white"
-       top="4"
+       top_delta="3"
        value="Hamilton Hitchings"
-       width="280" />
+       use_ellipses="true" 
+       width="265" />
+      <text
+    follows="top|left"
+    height="13"
+    layout="topleft"
+    left="10"
+    name="user_label"
+    text_color="LtGray"
+    top_pad="4" 
+    value="Username:"
+    width="70" />
       <text
        follows="top|left"
        height="13"
        layout="topleft"
-       left="10"
+       left_pad="0"
        name="user_slid"
-       text_color="LtGray"
-       top_pad="5"
-       value="(hamilton.linden)"
+       text_color="EmphasisColor"
+        font="SansSerifBold"
+       top_delta="-2"
+       value="hamilton.linden"
        width="150" />
-      <button
-       follows="top|left"
-       height="20"
-       label="Set Display Name..."
-       left="165"
-       name="set_name"
-       top_delta="-4"
-       width="120" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
          height="244"
          layout="topleft"
-         top="37"
+         top="65"
          left="0"
          width="292">
 	 <panel
@@ -175,7 +199,7 @@
        height="102"
        layout="topleft"
        left="123"
-       top="62"
+       top="90"
        max_length="512"
        name="sl_description_edit"
        width="157"
@@ -232,7 +256,7 @@
        layout="topleft"
        left="123"
        max_length="512"
-       top="195"
+       top="223"
        name="fl_description_edit"
        width="157"
        word_wrap="true">
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 36b883e5f2..82e7eb4a47 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -8,36 +8,36 @@
  name="panel_target_profile"
  left="0"
  width="333">
-    <string
-     name="status_online">
-        Online
-    </string>
-    <string
-     name="status_offline">
-        Offline
-    </string>
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back"
-     left="10"
-     tab_stop="false"
-     top="2"
-     width="30" />
-    <text
-     top="10" 
-     follows="top|left"
-     height="13"
-     layout="topleft"
-     left="45"
-     name="user_label"
-     text_color="LtGray"
-     value="Display Name:"
-     width="80" />
+  <string
+   name="status_online">
+    Online
+  </string>
+  <string
+   name="status_offline">
+    Offline
+  </string>
+  <button
+   follows="top|left"
+   height="24"
+   image_hover_unselected="BackButton_Over"
+   image_pressed="BackButton_Press"
+   image_unselected="BackButton_Off"
+   layout="topleft"
+   name="back"
+   left="10"
+   tab_stop="false"
+   top="2"
+   width="30" />
+  <text
+   top="10"
+   follows="top|left"
+   height="13"
+   layout="topleft"
+   left="45"
+   name="user_label"
+   text_color="LtGray"
+   value="Display Name:"
+   width="80" />
   <text
    follows="top|left"
    halign="right"
@@ -49,86 +49,86 @@
    top_delta="0"
    value="Online"
    width="150" />
-     <text
-      follows="top|left|right"
-      font="SansSerifBigBold"
-      height="29"
-      layout="topleft"
-      left="47"
-      name="user_name_small"
-      text_color="LtGray"
-      top="22"
-      value="Jack oh look at me this is a super duper long name"
-      use_ellipses="true"
-      word_wrap="true" 
-      visible="false" 
-      width="275" />
-     <text
-      follows="top|left|right"
-      font="SansSerifHugeBold"
-      height="27"
-      layout="topleft"
-      left="47"
-      name="user_name"
-      text_color="LtGray"
-      top="25"
-      value="Jack Linden"
-      visible="true" 
-      use_ellipses="true"
-      width="275" />
-    <text
-     follows="top|left"
-     height="13"
+  <text
+   follows="top|left|right"
+   font="SansSerifBigBold"
+   height="29"
+   layout="topleft"
+   left="45"
+   name="user_name_small"
+   text_color="LtGray"
+   top="22"
+   value="Jack oh look at me this is a super duper long name"
+   use_ellipses="true"
+   word_wrap="true"
+   visible="false"
+   width="275" />
+  <text
+   follows="top|left|right"
+   font="SansSerifHugeBold"
+   height="27"
+   layout="topleft"
+   left="45"
+   name="user_name"
+   text_color="LtGray"
+   top="25"
+   value="Jack Linden"
+   visible="true"
+   use_ellipses="true"
+   width="275" />
+  <text
+   follows="top|left"
+   height="13"
+   layout="topleft"
+   left="45"
+   name="user_label"
+   text_color="LtGray"
+   value="Username:"
+   width="70" />
+  <text
+   follows="top|left"
+   height="17"
+   layout="topleft"
+   left_pad="0"
+   name="user_slid"
+   text_color="EmphasisColor"
+   font="SansSerifBold"
+   top_delta="-2"
+   value="Jack Linden"
+   width="120" />
+  <tab_container
+   follows="all"
+   height="491"
+   halign="center"
+   layout="topleft"
+   left="5"
+   min_width="333"
+   name="tabs"
+   tab_min_width="80"
+   tab_height="30"
+   tab_position="top"
+   top_pad="5"
+   width="317">
+    <panel
+     class="panel_profile"
+     filename="panel_profile.xml"
+     label="PROFILE"
      layout="topleft"
-     left="45"
-     name="user_label"
-     text_color="LtGray"
-     value="Username:"
-     width="70" />
-    <text
-     follows="top|left"
-     height="17"
+     help_topic="profile_profile_tab"
+     name="panel_profile" />
+    <panel
+     class="panel_picks"
+     filename="panel_picks.xml"
+     label="PICKS"
      layout="topleft"
-     left_pad="0"
-     name="user_slid"
-     text_color="EmphasisColor"
-     font="SansSerifBold"
-     top_delta="-2" 
-     value="Jack Linden"
-     width="120" />
-    <tab_container
-     follows="all"
-     height="515"
-     halign="center"
+     help_topic="profile_picks_tab"
+     name="panel_picks" />
+    <panel
+     class="panel_notes"
+     filename="panel_notes.xml"
+     label="NOTES &amp; PRIVACY"
      layout="topleft"
-     left="5"
-     min_width="333"
-     name="tabs"
-     tab_min_width="80"
-     tab_height="30"
-     tab_position="top"
-     top_pad="5"
-     width="317"> 
-        <panel
-         class="panel_profile"
-         filename="panel_profile.xml"
-         label="PROFILE"
-         layout="topleft"
-         help_topic="profile_profile_tab"
-         name="panel_profile" />
-        <panel
-         class="panel_picks"
-         filename="panel_picks.xml"
-         label="PICKS"
-         layout="topleft"
-         help_topic="profile_picks_tab"
-         name="panel_picks" />
-        <panel
-         class="panel_notes"
-         filename="panel_notes.xml"
-         label="NOTES &amp; PRIVACY"
-         layout="topleft"
-         help_topic="profile_notes_tab"
-         name="panel_notes" />
-    </tab_container>
+     help_topic="profile_notes_tab"
+     name="panel_notes" />
+  </tab_container>
 </panel>