From 3bb1a40548d93be0cbf891950661a8a15d3de7a2 Mon Sep 17 00:00:00 2001
From: "sgehani%netscape.com" <sgehani%netscape.com>
Date: Thu, 27 Jul 2006 14:55:14 +0000
Subject: [PATCH] Add close button to sidebar. b=33420; r=morse; sr=alecf

---
 suite/common/sidebar/sidebarOverlay.xul                   | 8 ++++++--
 .../en-US/chrome/common/sidebar/sidebarOverlay.dtd        | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/suite/common/sidebar/sidebarOverlay.xul b/suite/common/sidebar/sidebarOverlay.xul
index a1e49bfd8e4b..2f559e05e427 100644
--- a/suite/common/sidebar/sidebarOverlay.xul
+++ b/suite/common/sidebar/sidebarOverlay.xul
@@ -20,6 +20,7 @@
 
  
 <?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/button.css" type="text/css"?> 
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -64,7 +65,7 @@
         <toolbarbutton type="menu" id="sidebar-panel-picker" menubuttontype="sidebar-panels"
           onpopupshowing="SidebarBuildPickerPopup();"
           label="&sidebar.picker.label;" >
-          <menupopup id="sidebar-panel-picker-popup" popupanchor="topright"
+          <menupopup id="sidebar-panel-picker-popup" popupanchor="bottomleft"
             datasources="rdf:null"
             ref="urn:sidebar:current-panel-list"
             oncommand="SidebarTogglePanel(event.target);" >
@@ -98,6 +99,8 @@
             <menuseparator />
           </menupopup>
         </toolbarbutton>
+        <toolbarbutton class="close-button" oncommand="SidebarShowHide();"
+                       tooltiptext="&sidebar.close.tooltip;"/>
       </sidebarheader>
   
       <vbox id="sidebar-panels"
@@ -125,7 +128,8 @@
             <action>
               <hbox uri="?panel" class="box-texttab texttab-sidebar"
                 oncommand="SidebarSelectPanel(this,false,false)"
-                hidden="true" label="?title" exclude="?exclude" context="sidebarPopup" />
+                hidden="true" label="?title" exclude="?exclude" 
+                context="sidebarPopup"/>
               <vbox uri="?panel" flex="1*" hidden="true"
                 loadstate="never loaded">
                 <vbox flex="1" class="iframe-panel loadarea">
diff --git a/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd b/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
index 4433a268b310..c2ef517f91f1 100644
--- a/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
@@ -41,4 +41,5 @@
 <!ENTITY sidebar.sbDirectory.label   "Sidebar Directory...">
 
 <!ENTITY sidebar.pagenotfound.label  "This tab is not available right now.">
+<!ENTITY sidebar.close.tooltip       "Close">