summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_event.xml
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-01 18:09:04 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-03-01 18:09:04 -0800
commit1147cb1afbc21e1251614895844e95bca9b6b5bc (patch)
treeda01f6c0e6b61a7c0637a371c946ea69b46f9dff /indra/newview/skins/default/xui/en/floater_event.xml
parentb11a625e6ff89470d25273fa426ed13f7abc4a6a (diff)
parent0600083891ab5b2c6a79097f65945bcb2d049bed (diff)
Automated merge from trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_event.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_event.xml154
1 files changed, 111 insertions, 43 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index 50f0f0454c..bcf15d7193 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -20,6 +20,22 @@
name="dont_notify">
Don&apos;t Notify
</floater.string>
+ <floater.string
+ name="moderate">
+ Moderate
+ </floater.string>
+ <floater.string
+ name="adult">
+ Adult
+ </floater.string>
+ <floater.string
+ name="general">
+ General
+ </floater.string>
+ <floater.string
+ name="unknown">
+ Unknown
+ </floater.string>
<layout_stack
name="layout"
orientation="vertical"
@@ -32,7 +48,7 @@
border_size="0">
<layout_panel
name="profile_stack"
- follows="all"
+ follows="top|left"
layout="topleft"
top="0"
left="0"
@@ -72,7 +88,7 @@
left="10"
top_pad="7"
name="event_runby_label"
- width="310">
+ width="90">
Run by:
</text>
<text
@@ -80,48 +96,79 @@
height="20"
initial_value="(retrieving)"
layout="topleft"
- left="10"
+ left_pad="0"
link="true"
name="event_runby"
- top_pad="2"
+ top_delta="0"
use_ellipses="true"
- width="310" />
+ width="240" />
+ <text
+ type="string"
+ length="1"
+ follows="top|left"
+ layout="topleft"
+ left="10"
+ top_pad="5"
+ name="event_date_label"
+ width="90">
+ Date:
+ </text>
<text
type="string"
length="1"
- left="10"
+ left_pad="0"
height="17"
- font="SansSerifMedium"
- text_color="EmphasisColor"
- top_pad="5"
+ top_delta="0"
follows="top|left"
layout="topleft"
name="event_date"
- width="310">
+ width="240">
10/10/2010
</text>
<text
type="string"
- height="14"
length="1"
+ follows="top|left"
+ layout="topleft"
left="10"
+ top_pad="5"
+ name="event_duration_label"
+ width="90">
+ Duration:
+ </text>
+ <text
+ type="string"
+ height="14"
+ length="1"
+ left_pad="0"
follows="top|left"
layout="topleft"
name="event_duration"
- width="310">
+ top_delta="0"
+ width="240">
1 hour
</text>
<text
- font="SansSerifMedium"
- text_color="EmphasisColor"
+ type="string"
+ length="1"
+ follows="top|left"
+ layout="topleft"
+ left="10"
+ top_pad="5"
+ name="event_covercharge_label"
+ width="90">
+ Cover charge:
+ </text>
+ <text
type="string"
follows="left|top"
height="16"
layout="topleft"
- left="10"
+ left_pad="0"
name="event_cover"
visible="true"
- width="310">
+ width="240"
+ top_delta="0">
Free
</text>
<text
@@ -131,28 +178,48 @@
layout="topleft"
left="10"
top_pad="5"
- name="event_location_label">
+ name="event_location_label"
+ width="90">
Location:
</text>
<text
type="string"
length="1"
height="20"
- left="10"
+ left_pad="0"
follows="top|left"
layout="topleft"
name="event_location"
use_ellipses="true"
+ top_delta="0"
value="SampleParcel, Name Long (145, 228, 26)"
- width="310" />
+ width="240" />
<icon
- follows="top|left"
- height="16"
- image_name="Parcel_PG_Dark"
- layout="topleft"
- left="10"
- name="rating_icon"
- width="18" />
+ follows="top|left"
+ height="16"
+ image_name="Parcel_PG_Dark"
+ layout="topleft"
+ left="10"
+ name="rating_icon_pg"
+ width="18" />
+ <icon
+ follows="top|left"
+ height="16"
+ image_name="Parcel_M_Dark"
+ layout="topleft"
+ left="10"
+ name="rating_icon_m"
+ top_delta="0"
+ width="18" />
+ <icon
+ follows="top|left"
+ height="16"
+ image_name="Parcel_R_Dark"
+ layout="topleft"
+ left="10"
+ name="rating_icon_r"
+ top_delta="0"
+ width="18" />
<text
follows="left|top"
height="16"
@@ -161,33 +228,34 @@
name="rating_label"
top_delta="3"
value="Rating:"
- width="60" />
+ width="58" />
<text
follows="left|right|top"
height="16"
layout="topleft"
- left_pad="0"
+ left_pad="2"
name="rating_value"
top_delta="0"
value="unknown"
- width="200" />
+ width="240" />
<expandable_text
- follows="left|top|right"
- height="106"
- layout="topleft"
- left="6"
- name="event_desc"
- width="313" />
+ follows="left|top|right"
+ height="65"
+ layout="topleft"
+ left="6"
+ name="event_desc"
+ width="322">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
</layout_panel>
<layout_panel
- follows="left|right"
- height="24"
- layout="topleft"
- mouse_opaque="false"
- name="button_panel"
- top="0"
- left="0"
- user_resize="false">
+ follows="left|right"
+ height="24"
+ layout="topleft"
+ mouse_opaque="false"
+ name="button_panel"
+ top="0"
+ left="0"
+ user_resize="false">
<button
follows="left|top"
height="18"