summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-10-03 12:59:44 -0700
committerdolphin <dolphin@lindenlab.com>2013-10-03 12:59:44 -0700
commite510fa3ee064ce03a48852fdea26be781e8fa8b6 (patch)
tree82b418df40a937cc8668380d2c80edf4501009f2 /indra/newview/skins/default
parentaed3cbce26a9e1e7ec70a43146fd405f3162f9d7 (diff)
First pass at functional experience list floater
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_experiences.xml20
-rw-r--r--indra/newview/skins/default/xui/en/panel_experiences.xml36
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml5
3 files changed, 25 insertions, 36 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index 57541c8b35..1258ce26ac 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<floater
- positioning="cascading"
can_close="true"
can_resize="true"
height="400"
- help_topic="sidebar_experiences"
+ width="300"
min_height="300"
min_width="300"
layout="topleft"
@@ -13,17 +12,16 @@
save_rect="false"
single_instance="true"
reuse_instance="false"
- title="EXPERIENCES"
- width="400">
- <panel
+ bg_opaque_color="0 0.5 0 0.3"
+ title="EXPERIENCES">
+ <tab_container
top="3"
left="3"
layout="topleft"
- right="-3"
+ width="294"
follows="all"
- height="300"
- class="experiences_panel"
- filename="panel_experiences.xml"
- >
- </panel>
+ height="394"
+ name="xp_tabs">
+ </tab_container>
+
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 47a3005aae..bc78d0813c 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -4,37 +4,23 @@
layout="topleft"
top="3"
left="3"
- right="-3"
- bottom="-3"
+ width="200"
+ height="300"
label="Experiences"
+ bg_opaque_color="0 0.5 0 0.3"
follows="all">
<string
name="no_experiences"
value="No experiences."/>
- <accordion
- fit_parent="true"
+ <flat_list_view
+ name="experiences_list"
layout="topleft"
top="0"
- left="3"
- right="-3"
- bottom="-3"
- single_expansion="true"
- follows="all">
- <accordion_tab
- name="tab_experiences"
- layout="topleft"
- top="0"
- left="0"
- right="-3"
- title="Experiences"
- follows="all">
- <flat_list_view
- name="experiences_list"
- layout="topleft"
- top="0"
- left="0"
- follows="all"/>
- </accordion_tab>
- </accordion>
+ left="0"
+ width="200"
+ height="300"
+ follows="all"
+ >
+ </flat_list_view>
</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fc189b5d62..70c990872e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3925,6 +3925,11 @@ Try enclosing path to the editor with double quotes.
<string name="experience_tools_experience">Experience</string>
<string name="ExperienceNameNull">(no experience)</string>
<string name="GRID_WIDE">Grid-wide</string>
+ <string name="Allowed_Experiences_Tab">Allowed</string>
+ <string name="Blocked_Experiences_Tab">Blocked</string>
+ <string name="Contrib_Experiences_Tab">Contributor</string>
+ <string name="Admin_Experiences_Tab">Admin</string>
+ <string name="Recent_Experiences_Tab">Recent</string>
<!-- Conversation log messages -->
<string name="logging_calls_disabled_log_empty">