From 387011a1ff519d0e339b446ff5d02f0d009b7e5d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 16 Sep 2010 00:45:27 -0700
Subject: EXP-29 WIP Implement popup blocking added web popup notification
 overlay

---
 .../skins/default/xui/en/floater_media_browser.xml | 146 +++++++++++----------
 1 file changed, 74 insertions(+), 72 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 3b78da2a79..c220124f46 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -31,6 +31,7 @@
      width="800">
         <layout_panel
          auto_resize="false"
+         default_tab_group="1" 
          height="20"
          layout="topleft"
          left="0"
@@ -78,6 +79,7 @@
             <combo_box
              allow_text_entry="true"
              follows="left|top|right"
+             tab_group="1"
              height="20"
              layout="topleft"
              left_pad="5"
@@ -182,76 +184,6 @@
 				function="MediaBrowser.Assign" />
 			</button>
         </layout_panel>
-      <layout_panel
-       height="30"
-       layout="topleft"
-       name="notification_area"
-       visible="false" 
-       user_resize="false"
-       background_visible="true" 
-       bg_alpha_image="Yellow_Gradient" 
-       auto_resize="false" 
-       width="800">
-        <layout_stack
-              top="0"
-              height="30"
-              width="800"
-              left="0"
-              follows="all" 
-              orientation="horizontal"
-              >
-          <layout_panel
-            height="30">
-            <icon value="Popup_Caution"
-                  left="5"
-                  top="7"
-                  width="16"
-                  height="15"/>
-            <text left_pad="8"
-                  top="10"
-                  height="25"
-                  width="400"
-                  text_color="black"
-                  font="SansSerifSmall"
-                  font.style="BOLD"
-                  name="notification_text"
-                  value="Notification text here"
-                  />
-          </layout_panel>
-          <layout_panel
-            height="30"
-            width="270"
-            auto_resize="false"
-            name="form_elements">
-            <check_box name="enable_check"
-                      left="5"
-                      top="5"
-                      height="20"
-                      width="120"
-                      label="Enable all popups"
-                       text_enabled_color="black"
-                      />
-            <button left_pad="5"
-                    width="140"
-                    top="4"
-                    label="Open pop-up window"/>
-          </layout_panel>
-          <layout_panel
-            height="30"
-            width="25"
-            auto_resize="false"
-            name="close_panel">
-            <button left="5"
-                    name="close" 
-                    width="16"
-                    height="16" 
-                    top="8"
-                    image_color="DkGray_66" 
-                    image_unselected="Icon_Close_Foreground"
-                    image_selected="Icon_Close_Press"/>
-          </layout_panel>
-        </layout_stack>
-      </layout_panel>
         <layout_panel
          height="40"
          layout="topleft"
@@ -260,14 +192,84 @@
          top_delta="0"
          user_resize="false"
          width="540">
-            <web_browser
+          <web_browser
              bottom="-30"
-             follows="left|right|top|bottom"
+             follows="all"
              layout="topleft"
              left="0"
              name="browser"
              top="0"
              width="540" />
+          <layout_stack 
+            name="notification_stack"
+            left="0"
+            top="0"
+            width="540"
+            bottom="-30"
+            follows="all"
+            mouse_opaque="false"
+            orientation="vertical">
+            <layout_panel
+              height="30"
+              min_height="30" 
+              layout="topleft"
+              name="notification_area"
+              visible="false"
+              user_resize="false"
+              background_visible="true"
+              bg_alpha_image="Yellow_Gradient"
+              auto_resize="false"
+              width="800">
+              <layout_stack
+                top="0"
+                height="30"
+                width="800"
+                left="0"
+                follows="bottom|left|right"
+                orientation="horizontal">
+                <layout_panel
+                  height="30">
+                  <icon name="notification_icon"
+                        left="5"
+                        top="7"
+                        width="16"
+                        height="15"/>
+                  <text left_pad="8"
+                        top="10"
+                        height="25"
+                        width="400"
+                        text_color="black"
+                        font="SansSerifSmall"
+                        font.style="BOLD"
+                        name="notification_text"
+                        value="Notification text here"/>
+                </layout_panel>
+                <layout_panel
+                  height="30"
+                  width="130"
+                  auto_resize="false"
+                  user_resize="false"
+                  name="form_elements"/>
+                <layout_panel
+                  height="30"
+                  width="25"
+                  auto_resize="false"
+                  name="close_panel">
+                  <button left="5"
+                          name="close_notification"
+                          width="16"
+                          height="16"
+                          top="8"
+                          image_color="DkGray_66"
+                          image_unselected="Icon_Close_Foreground"
+                          image_selected="Icon_Close_Press"/>
+                </layout_panel>
+              </layout_stack>
+            </layout_panel>
+            <layout_panel
+              mouse_opaque="false" 
+              auto_resize="true"/>
+          </layout_stack>
             <button
              follows="bottom|left"
              height="20"
-- 
cgit v1.2.3