SL-1956 added support for temporary bans to parcel ban list

2 files changed, 125 insertions, 3 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 535af317d9..841b11e3bc 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -22,6 +22,14 @@
       "Parcel_R_Dark"
     </floater.string>
     <floater.string
+     name="Hours">
+        [HOURS] hrs.
+    </floater.string>
+    <floater.string
+     name="Hour">
+        hr.
+    </floater.string>
+    <floater.string
      name="Minutes">
         [MINUTES] min.
     </floater.string>
@@ -37,6 +45,10 @@
      name="Remaining">
         remaining
     </floater.string>
+    <floater.string
+     name="Always">
+        Always
+    </floater.string>
     <tab_container
      follows="all"
      halign="left"
@@ -2063,19 +2075,29 @@ Only large parcels can be listed in search.
              name="BanCheck"
              top="0"
              width="200">
-                Always banned ([COUNT], max [MAX])
+                Banned ([COUNT], max [MAX])
             </text>
             <name_list
              column_padding="0"
              follows="top|bottom"
-             heading_height="14"
+             heading_height="16"
              height="125"
              layout="topleft"
              left="0"
              multi_select="true"
+             draw_heading="true"
              name="BannedList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="230" />
+             width="230">
+             <columns
+              label="Name"
+              name="name"
+              width="160" />
+             <columns
+              label="Duration"
+              name="duration"
+              width="70" />
+            </name_list>
             <button
              follows="bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
new file mode 100644
index 0000000000..2d9e69f7c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_close="true"
+ height="150"
+ layout="topleft"
+ name="ban_duration"
+ title="Ban duration"
+ single_instance="true"
+ width="180">
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    layout="topleft"
+    left="15"
+    name="duration_textbox"
+    top="10"
+    width="75">
+        Ban duration:
+   </text>
+
+   <radio_group
+    draw_border="false"
+    enabled="true"
+    follows="left|top"
+    height="40"
+    left="20"
+    mouse_opaque="true"
+    name="ban_duration_radio"
+    tab_stop="true"
+    width="200">
+       <radio_item
+        type="string"
+        follows="left|top"
+        height="20"
+        width="200"
+        label="Always"
+        name="always_radio">
+            Always
+       </radio_item>
+       <radio_item
+        type="string"
+        follows="left|top"
+        height="20"
+        width="200"
+        label="Temporary"
+        name="temporary_radio">
+            Temporary
+       </radio_item>
+   </radio_group>
+
+   <spinner
+    allow_text_entry="true"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="1"
+    max_val="8766"
+    min_val="1"
+    initial_val="1"
+    name="ban_hours"
+    top_delta="50"
+    left="40"
+    width="40"/>
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    left_delta="50"
+    name="hours_textbox"
+    top_delta="5"
+    width="75">
+        hours.
+   </text>
+    
+   <button
+    follows="left|top"
+    height="23"
+    label="Ok"
+    left="15"
+    name="ok_btn"
+    top_delta="30"
+    width="75">
+   </button>
+   <button
+    follows="left|top"
+    height="23"
+    label="Cancel"
+    left_pad="0"
+    name="cancel_btn"
+    top_delta="0"
+    width="75">
+   </button>
+</floater>