summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-10-12 17:49:36 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-10-12 17:49:36 -0700
commit17a04f8231a0787a7e72c7b3ad5cf37b08a466d0 (patch)
tree1d8bd0b9a79a190b079447fb8f1090bd9d745ac4 /indra/newview/skins/default/xui/en
parentec57776a23f36a9df02ee614c4f0ef20fcea0c7c (diff)
EVE-47 - Event formatting should appear in "Profile" window
EVE-74 - Change in-viewer support for 'notify me' to be maintainable via app slurl EVE-72 - Modify viewer to make the event profile window be an html control This is basically a reworking of the event profile display to remove all in-viewer specific event display rendering, in preparation for richtext descriptions. Most was removal of code.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_event.xml330
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
2 files changed, 31 insertions, 307 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index 9864083442..1be9748711 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -1,311 +1,39 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
follows="all"
- height="350"
+ height="400"
+ can_resize="true"
help_topic="event_details"
label="Event"
layout="topleft"
name="Event"
+ save_rect="true"
+ save_visibility="false"
title="EVENT DETAILS"
- width="330">
- <floater.string
- name="none">
- none
- </floater.string>
- <floater.string
- name="notify">
- Notify
- </floater.string>
- <floater.string
- 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"
- follows="all"
- layout="topleft"
- left="0"
- top="0"
- height="350"
- width="330"
- border_size="0">
- <layout_panel
- name="profile_stack"
- follows="top|left"
- layout="topleft"
- top="0"
- left="0"
- height="305"
- width="330">
- <text
- follows="top|left|right"
- font="SansSerifLarge"
- text_color="white"
- height="17"
- layout="topleft"
- left="10"
- name="event_name"
- top="5"
- use_ellipses="true"
- width="310">
- Nameless Event...of Doom! De doom! Doom doom.
- </text>
- <text
- type="string"
- length="1"
- follows="top|left"
- height="13"
- text_color="LtGray_50"
- layout="topleft"
- left="25"
- name="event_category"
- width="300">
- (no category)
- </text>
-
- <text
- type="string"
- length="1"
- follows="top|left"
- layout="topleft"
- left="10"
- top_pad="7"
- name="event_runby_label"
- width="90">
- Run by:
- </text>
- <text
- follows="left|top"
- height="20"
- initial_value="(retrieving)"
- layout="topleft"
- left_pad="0"
- link="true"
- name="event_runby"
- top_delta="0"
- use_ellipses="true"
- 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_pad="0"
- height="17"
- top_delta="0"
- follows="top|left"
+ width="600">
+ <floater.string
+ name="loading_text">
+ Loading...
+ </floater.string>
+ <floater.string
+ name="done_text">
+ Done
+ </floater.string>
+ <web_browser
+ follows="left|right|top|bottom"
layout="topleft"
- name="event_date"
- width="240">
- 10/10/2010
- </text>
- <text
- type="string"
- 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"
- top_delta="0"
- width="240">
- 1 hour
- </text>
- <text
- 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_pad="0"
- name="event_cover"
- visible="true"
- width="240"
- top_delta="0">
- Free
- </text>
- <text
- type="string"
- length="1"
- follows="top|left"
- layout="topleft"
- left="10"
- top_pad="5"
- name="event_location_label"
- width="90">
- Location:
- </text>
- <text
- type="string"
- length="1"
- height="20"
- 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="240" />
- <icon
- 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"
- layout="topleft"
- left_pad="12"
- name="rating_label"
- top_delta="3"
- value="Rating:"
- width="90" />
- <text
- follows="left|right|top"
- height="16"
- layout="topleft"
- left_pad="2"
- name="rating_value"
- top_delta="0"
- value="unknown"
- width="240" />
- <expandable_text
- 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">
- <button
- follows="left|top"
- height="18"
- image_selected="AddItem_Press"
- image_unselected="AddItem_Off"
- image_disabled="AddItem_Disabled"
- layout="topleft"
- left="6"
- name="create_event_btn"
- tool_tip="Create Event"
- width="18" />
- <button
- follows="left|top"
- height="18"
- image_selected="MinusItem_Press"
- image_unselected="MinusItem_Off"
- image_disabled="MinusItem_Disabled"
- layout="topleft"
- visible="false"
- left="6"
- top_pad="-7"
- name="god_delete_event_btn"
- tool_tip="Delete Event"
- width="18" />
- <button
- follows="left|top"
- height="23"
- label="Notify Me"
- layout="topleft"
- left_pad="3"
- top_delta="-12"
- name="notify_btn"
- width="100" />
- <button
- follows="left|top"
- height="23"
- label="Teleport"
- layout="topleft"
- left_pad="5"
- name="teleport_btn"
- width="100" />
- <button
- follows="left|top"
- height="23"
- label="Map"
- layout="topleft"
- left_pad="5"
- name="map_btn"
- width="85" />
- </layout_panel>
- </layout_stack>
- </floater>
+ left="10"
+ name="browser"
+ height="365"
+ width="580"
+ top="0"/>
+ <text
+ follows="bottom|left"
+ height="16"
+ layout="topleft"
+ left_delta="0"
+ name="status_text"
+ top_pad="10"
+ width="150" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 609a9b09be..2473c2e424 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4858,14 +4858,10 @@ Event Notification:
<form name="form">
<button
index="0"
- name="Teleport"
- text="Teleport"/>
+ name="Details"
+ text="Details"/>
<button
index="1"
- name="Description"
- text="Description"/>
- <button
- index="2"
name="Cancel"
text="Cancel"/>
</form>