From 7ffc9b06c820d70724af2aef361ff9964e584e73 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 8 Oct 2010 16:56:02 -0700
Subject: Created a floater for setting display name

---
 .../skins/default/xui/en/floater_display_name.xml  | 83 ++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_display_name.xml

(limited to 'indra/newview/skins/default/xui/en/floater_display_name.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
new file mode 100644
index 0000000000..ecf2e524aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ can_close="false" 
+ height="280"
+ layout="topleft"
+ name="Display Name"
+ help_topic="display_name"
+ save_rect="false"
+ width="440">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="40"
+     layout="topleft"
+     left="25"
+     name="info_text"
+     top="40"
+     use_ellipses="true"
+     width="400"
+     wrap="true">
+      The name you give your avatar is called your Display Name. You can change it once a week.
+    </text>
+    <text
+      top_pad="15"
+      width="150"
+      height="20"
+      font="SansSerif"
+      name="set_name_label">
+      New display name:
+    </text>
+    <line_editor
+      width="330"
+      name="display_name_editor"
+      max_length_chars="31"
+      height="20"
+      top_pad="5"
+      left="50" />
+    <text
+       top_pad="15"
+       left="25" 
+       width="300"
+       height="20"
+      font="SansSerif"
+    name="set_name_label">
+      Type your new name again to confirm:
+    </text>
+    <line_editor
+      width="330"
+      name="display_name_confirm"
+      max_length_chars="31"
+      height="20"
+      top_pad="5"
+      left="50" />
+    <button
+     height="23"
+     label="Save"
+     layout="topleft"
+     font="SansSerif"
+     left="35"
+     name="save_btn"
+     top_pad="40"
+     width="120" />
+    <button
+     height="23"
+     label="Reset"
+     layout="topleft"
+     font="SansSerif"
+     left_pad="5"
+     name="reset_btn"
+     width="120" />
+    <button
+     height="23"
+     label="Cancel"
+     font="SansSerif"
+     layout="topleft"
+     left_pad="5"
+     name="cancel_btn"
+     width="120" />
+</floater>
-- 
cgit v1.2.3


From 84f06e40e1e12723228e31d1a329c899cec99751 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 13 Oct 2010 14:36:01 -0700
Subject: DN-165 User cannot reset name to default if they are throttled
 because they receive the Sorry you cannot change your display name until
 [time] message. They cannot access the change display name dialog to hit
 reset when throttled.

---
 .../skins/default/xui/en/floater_display_name.xml  | 34 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_display_name.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index ecf2e524aa..7a3fb9334a 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -3,12 +3,13 @@
  legacy_header_height="18"
  can_minimize="false"
  can_close="false" 
- height="280"
+ height="300"
  layout="topleft"
  name="Display Name"
  help_topic="display_name"
  save_rect="false"
- width="440">
+ title="CHANGE DISPLAY NAME" 
+ width="445">
     <text
      type="string"
      length="1"
@@ -20,17 +21,34 @@
      name="info_text"
      top="40"
      use_ellipses="true"
-     width="400"
+     width="380"
      wrap="true">
       The name you give your avatar is called your Display Name. You can change it once a week.
     </text>
+	<text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="25"
+     layout="topleft"
+     left="25"
+	 text_color="EmphasisColor" 
+     name="lockout_text"
+     top="80"
+     use_ellipses="true"
+	 visible="false" 
+     width="410"
+     wrap="true">
+		You cannot change your Display Name until: [TIME].
+	</text>
     <text
-      top_pad="15"
+      top_pad="10"
       width="150"
       height="20"
       font="SansSerif"
       name="set_name_label">
-      New display name:
+      New Display Name:
     </text>
     <line_editor
       width="330"
@@ -39,9 +57,9 @@
       height="20"
       top_pad="5"
       left="50" />
-    <text
+	<text
        top_pad="15"
-       left="25" 
+       left="25"
        width="300"
        height="20"
       font="SansSerif"
@@ -62,6 +80,7 @@
      font="SansSerif"
      left="35"
      name="save_btn"
+     tool_tip="Save your new Display Name" 
      top_pad="40"
      width="120" />
     <button
@@ -71,6 +90,7 @@
      font="SansSerif"
      left_pad="5"
      name="reset_btn"
+     tool_tip="Make Display Name the same as Username"
      width="120" />
     <button
      height="23"
-- 
cgit v1.2.3


From ea2406b6a50a6f14c253b26a17777ef92115eca8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 1 Nov 2010 14:29:54 -0700
Subject: changing duplicate line editor name

---
 indra/newview/skins/default/xui/en/floater_display_name.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_display_name.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index 7a3fb9334a..9a9fd32a77 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -63,7 +63,7 @@
        width="300"
        height="20"
       font="SansSerif"
-    name="set_name_label">
+    name="name_confirm_label">
       Type your new name again to confirm:
     </text>
     <line_editor
-- 
cgit v1.2.3