From 1bb46c7384f6532da8f0315f61b8613bd0b9b717 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 16 Feb 2011 17:02:06 -0800
Subject: SOCIAL-544 PARTIAL move skylight skin to viewer repo

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 97 ++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml

(limited to 'indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml')

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
new file mode 100644
index 0000000000..729321675b
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_color="MouseGray"
+ follows="left|top|right"
+ height="26"
+ layout="topleft"
+ name="navigation_bar"
+ chrome="true"
+ width="600">
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG"
+	 mouse_opaque="false"
+	 name="bg_icon"
+	 scale_image="true"
+	 visible="true"
+	 left="0"
+	 top="0"
+	 height="26"
+	 width="600"/>
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG_NoFav_Bevel"
+	 mouse_opaque="false"
+	 name="bg_icon_no_fav_bevel"
+	 scale_image="true"
+	 visible="false"
+	 left="0"
+	 top="0"
+	 height="26"
+	 width="600"/>
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG_NoNav_Bevel"
+	 mouse_opaque="false"
+	 name="bg_icon_no_nav_bevel"
+	 scale_image="true"
+	 visible="false"
+	 left="0"
+	 top="0"
+	 height="26"
+	 width="600"/>
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 top="3"
+	 height="26"
+	 layout="topleft"
+	 name="navigation_panel"
+	 width="600">
+	    <location_input
+	     follows="left|right|top"
+	     halign="right"
+	     height="23"
+	     label="Location"
+	     layout="topleft"
+	     left="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+       enabled="false"
+	     top="0"
+	     width="550">
+        <combo_editor
+          text_color="White"
+          background_image=""/>
+        <maturity_button
+          width="0"
+          height="0"/>
+        <info_button
+          width="0"
+          image_unselected=""
+          image_disabled="" 
+          visible="false"/>
+        <add_landmark_button
+          visible="false"/>
+        <combo_button
+          width="0"
+          image_unselected=""
+          visible="false"/>
+        <combo_list
+         mouse_wheel_opaque="true"/>
+	    </location_input>
+      <button
+        right="-5" 
+        top="2"
+        width="16"
+        height="16" 
+        follows="top|right" 
+        name="skylight_help"
+        image_unselected="Icon_Help_Foreground"
+        image_selected="Icon_Help_Press"
+        />
+	</panel>
+</panel>
-- 
cgit v1.2.3


From 5e0305ce4ce4448a9d2251dd9691f37c7b7945e1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:23:18 -0800
Subject: SOCIAL-577 WIP create streamlined navigation bar made navigation bar
 appear in basic skin, with simplified UI

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 119 ++++++++++++---------
 1 file changed, 71 insertions(+), 48 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml')

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 729321675b..3ef5b9b0de 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -9,7 +9,7 @@
  name="navigation_bar"
  chrome="true"
  width="600">
-	<icon
+  <icon
 	 follows="all"
 	 image_name="NavBar_BG"
 	 mouse_opaque="false"
@@ -20,7 +20,7 @@
 	 top="0"
 	 height="26"
 	 width="600"/>
-	<icon
+  <icon
 	 follows="all"
 	 image_name="NavBar_BG_NoFav_Bevel"
 	 mouse_opaque="false"
@@ -31,7 +31,7 @@
 	 top="0"
 	 height="26"
 	 width="600"/>
-	<icon
+  <icon
 	 follows="all"
 	 image_name="NavBar_BG_NoNav_Bevel"
 	 mouse_opaque="false"
@@ -42,7 +42,7 @@
 	 top="0"
 	 height="26"
 	 width="600"/>
-	<panel
+  <panel
 	 background_visible="false"
 	 follows="left|top|right"
 	 top="3"
@@ -50,48 +50,71 @@
 	 layout="topleft"
 	 name="navigation_panel"
 	 width="600">
-	    <location_input
-	     follows="left|right|top"
-	     halign="right"
-	     height="23"
-	     label="Location"
-	     layout="topleft"
-	     left="7"
-	     max_chars="254"
-	     mouse_opaque="false"
-	     name="location_combo"
-       enabled="false"
-	     top="0"
-	     width="550">
-        <combo_editor
-          text_color="White"
-          background_image=""/>
-        <maturity_button
-          width="0"
-          height="0"/>
-        <info_button
-          width="0"
-          image_unselected=""
-          image_disabled="" 
-          visible="false"/>
-        <add_landmark_button
-          visible="false"/>
-        <combo_button
-          width="0"
-          image_unselected=""
-          visible="false"/>
-        <combo_list
-         mouse_wheel_opaque="true"/>
-	    </location_input>
-      <button
-        right="-5" 
-        top="2"
-        width="16"
-        height="16" 
-        follows="top|right" 
-        name="skylight_help"
-        image_unselected="Icon_Help_Foreground"
-        image_selected="Icon_Help_Press"
-        />
-	</panel>
+    <pull_button
+follows="left|top"
+direction="down"
+height="23"
+image_overlay="Arrow_Left_Off"
+image_bottom_pad="1"
+layout="topleft"
+left="10"
+name="back_btn"
+tool_tip="Go back to previous location"
+top="2"
+width="31" />
+    <pull_button
+     follows="left|top"
+     direction="down"
+     height="23"
+     image_overlay="Arrow_Right_Off"
+     image_bottom_pad="1"
+     layout="topleft"
+     left_pad="0"
+     name="forward_btn"
+     tool_tip="Go forward one location"
+     top_delta="0"
+     width="31" />
+    <location_input
+     follows="left|right|top"
+     halign="right"
+     height="23"
+     label="Location"
+     layout="topleft"
+     left_pad="7"
+     max_chars="254"
+     mouse_opaque="false"
+     name="location_combo"
+     top_delta="0"
+     width="360">
+      <maturity_button
+        width="0"
+        height="0"/>
+      <info_button
+        width="0"
+        image_unselected=""
+        image_disabled=""
+        visible="false"/>
+      <add_landmark_button
+        visible="false"/>
+    </location_input>
+    <icon follows="right"
+          height="20"
+          width="2"
+          left_pad="2"
+          image_name="Button_Separator"
+          name="separator"
+          top="2"/>
+    <button
+      right="-70"
+      top="2"
+      width="80"
+      height="22"
+      label="How To"
+      follows="top|right"
+      name="skylight_help">
+      <commit_callback
+        function="ShowHelp"
+        parameter="f1_help" />
+    </button>
+  </panel>
 </panel>
-- 
cgit v1.2.3


From 318842b15871cbee47a944ed243352258211321d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:35:15 -0800
Subject: SOCIAL-552 FIX removed badges from address field in navigation bar

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 44 +++++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml')

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 3ef5b9b0de..e5548cce5e 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -86,15 +86,49 @@ width="31" />
      name="location_combo"
      top_delta="0"
      width="360">
+      <add_landmark_button
+        width="0"
+        height="0"
+        visible="false"/>
       <maturity_button
         width="0"
-        height="0"/>
-      <info_button
+        height="0"
+        visible="false"/>
+      <for_sale_button
         width="0"
-        image_unselected=""
-        image_disabled=""
+        height="0"
         visible="false"/>
-      <add_landmark_button
+      <voice_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <fly_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <push_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <build_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <scripts_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <damage_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <damage_text 
+        width="0"
+        max_length="0"
+        visible="false"/>
+      <info_button
+        width="0"
+        height="0"
         visible="false"/>
     </location_input>
     <icon follows="right"
-- 
cgit v1.2.3


From d6259a3032631a886214b765299a4932973128fb Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:42:28 -0800
Subject: SOCIAL-552 FIX removed badges from address field in navigation bar
 modified widget template instead of instance

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 44 ----------------------
 1 file changed, 44 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml')

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index e5548cce5e..65d9e8a2ab 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -86,50 +86,6 @@ width="31" />
      name="location_combo"
      top_delta="0"
      width="360">
-      <add_landmark_button
-        width="0"
-        height="0"
-        visible="false"/>
-      <maturity_button
-        width="0"
-        height="0"
-        visible="false"/>
-      <for_sale_button
-        width="0"
-        height="0"
-        visible="false"/>
-      <voice_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <fly_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <push_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <build_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <scripts_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <damage_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <damage_text 
-        width="0"
-        max_length="0"
-        visible="false"/>
-      <info_button
-        width="0"
-        height="0"
-        visible="false"/>
     </location_input>
     <icon follows="right"
           height="20"
-- 
cgit v1.2.3


From 4619a1e58bd53307bf5b2e326d814eddad73fbb1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 15:13:21 -0800
Subject: SOCIAL-550 FIX Add back media volume and play/pause buttons to top
 bar SOCIAL-577 FIX create streamlined navigation bar

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 24 +---------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml')

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 65d9e8a2ab..cd21242edc 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -9,35 +9,13 @@
  name="navigation_bar"
  chrome="true"
  width="600">
-  <icon
-	 follows="all"
-	 image_name="NavBar_BG"
-	 mouse_opaque="false"
-	 name="bg_icon"
-	 scale_image="true"
-	 visible="true"
-	 left="0"
-	 top="0"
-	 height="26"
-	 width="600"/>
   <icon
 	 follows="all"
 	 image_name="NavBar_BG_NoFav_Bevel"
 	 mouse_opaque="false"
 	 name="bg_icon_no_fav_bevel"
 	 scale_image="true"
-	 visible="false"
-	 left="0"
-	 top="0"
-	 height="26"
-	 width="600"/>
-  <icon
-	 follows="all"
-	 image_name="NavBar_BG_NoNav_Bevel"
-	 mouse_opaque="false"
-	 name="bg_icon_no_nav_bevel"
-	 scale_image="true"
-	 visible="false"
+	 visible="true"
 	 left="0"
 	 top="0"
 	 height="26"
-- 
cgit v1.2.3


From 25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 4 Mar 2011 00:40:38 -0800
Subject: SOCIAL-603 FIX Move how to button to bottom bar moves scrollbar up
 from bottom of screen to leave room for resize thumb

---
 .../newview/skins/minimal/xui/en/panel_navigation_bar.xml  | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml')

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index cd21242edc..6dc1a1c9b0 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -63,7 +63,7 @@ width="31" />
      mouse_opaque="false"
      name="location_combo"
      top_delta="0"
-     width="360">
+     width="440">
     </location_input>
     <icon follows="right"
           height="20"
@@ -72,17 +72,5 @@ width="31" />
           image_name="Button_Separator"
           name="separator"
           top="2"/>
-    <button
-      right="-70"
-      top="2"
-      width="80"
-      height="22"
-      label="How To"
-      follows="top|right"
-      name="skylight_help">
-      <commit_callback
-        function="ShowHelp"
-        parameter="f1_help" />
-    </button>
   </panel>
 </panel>
-- 
cgit v1.2.3