From 8e5da5125de2bc9f8ce5ed2677556953e008c59d Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 10 Feb 2014 12:09:32 +0200
Subject: MAINT-3710 FIXED List of members is removed from General tab. Title
 column is added to the list in Members tab. Roles tab is renamed to Roles &
 Members and Roles sub-tab is default now.

---
 .../skins/default/xui/en/panel_group_general.xml   | 28 ++--------------------
 .../default/xui/en/panel_group_info_sidetray.xml   |  2 +-
 .../skins/default/xui/en/panel_group_roles.xml     |  8 +++++--
 3 files changed, 9 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 38b680ba86..26f54bacbc 100755
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  label="General"
- height="604"
+ height="420"
  width="304"
  class="panel_group_general"
  name="general_tab">
@@ -101,31 +101,7 @@ Hover your mouse over the options for more help.
     text_readonly_color="White"
      word_wrap="true">
      Group Charter
-    </text_editor>
-    <name_list
-     column_padding="0"
-     draw_heading="true"
-     follows="left|top|right"
-     heading_height="23"
-     height="160"
-     layout="topleft"
-     left="0"
-     name="visible_members"
-     short_names="false" 
-     top_pad="2">
-        <name_list.columns
-         label="Member"
-         name="name"
-         relative_width="0.4" />
-        <name_list.columns
-         label="Title"
-         name="title"
-         relative_width="0.4" />
-        <name_list.columns
-         label="Status"
-         name="status"
-         relative_width="0.2" />
-      </name_list>
+    </text_editor>   
          <text
          follows="left|top|right"
          type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 206496cc0e..b3326d8da6 100755
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -131,7 +131,7 @@ background_visible="true"
             expanded="false"
             layout="topleft"
             name="group_roles_tab"
-            title="Roles"
+            title="Roles &amp; Members"
             fit_panel="false">
                 <panel
                    border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index df91ad8b5e..9ac5b8800e 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -94,11 +94,15 @@ clicking on their names.
                 <name_list.columns
                  label="Donation"
                  name="donated"
-         relative_width="0.25" />
+         		 relative_width="0.2" />
                 <name_list.columns
                  label="Status"
                  name="online"
-                 relative_width="0.14" />
+                 relative_width="0.18" />
+                <name_list.columns
+                 label="Title"
+                 name="title"
+                 relative_width="0.18" />
             </name_list>
             <button
              height="23"
-- 
cgit v1.2.3