From f9cb13709f9a224e5600788220cad5ef5a666ddc Mon Sep 17 00:00:00 2001
From: "hewitt%netscape.com" <hewitt%netscape.com>
Date: Thu, 14 Sep 2006 06:02:17 +0000
Subject: [PATCH] XUL/theme simplification changes - removing unnecessary boxes
 and re-writing large portions of the themes to use new -moz-border-colors and
 -moz-image-region css features. Also cleans up the classic skin quite a bit
 for both mac and win. Fixes bugs 113024, 113043, 113585, 113586, 115943,
 113643, 114475, 99787, 110214, 113977, 113966, 114802, 64894, 90724, 103173,
 103199, 103298, 110442, 111472, 111989, 113027, 113041, 109180, 109204,
 81581, 81903, 103324, 110108, 114540, and probably more I forgot to mention.
 r=ben, sr=hyatt

---
 suite/browser/navigator.css      |  3 +-
 suite/browser/navigator.xul      | 75 +++++++++++++++-----------------
 suite/browser/turboDialog.xul    |  3 +-
 suite/browser/urlbarBindings.xml | 11 +++--
 4 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/suite/browser/navigator.css b/suite/browser/navigator.css
index 2310bfaf8028..de37a793c6eb 100644
--- a/suite/browser/navigator.css
+++ b/suite/browser/navigator.css
@@ -1,7 +1,6 @@
 /* ::::: Hide the link toolbar if it is set to autohide and has no items. ::::: */
 
-#linktoolbar[hidden="maybe"][hasitems="false"]
-{
+#linktoolbar[hidden="maybe"][hasitems="false"] {
   display: none;
 }
 
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 330f701474be..89ff03a903ee 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -22,8 +22,6 @@ Contributor(s): ______________________________________. -->
 
 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
-<!-- XXX - the placement of this include could be temporary -->
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksToolbar.css" type="text/css"?> 
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?>
@@ -89,8 +87,6 @@ Contributor(s): ______________________________________. -->
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
   </stringbundleset>
 
-<resourcebundle id="resource_bundle_navigator" />
-
   <commandset id="commands">    
     <commandset id="globalEditMenuItems"/>
     <commandset id="selectEditMenuItems"/>
@@ -160,40 +156,41 @@ Contributor(s): ______________________________________. -->
  
       <hbox id="fullscreen-extra-buttons" hidden="true">
         <toolbarbutton id="fullscreen-exit-button" class="toolbarbutton-1"
-                       label="&exitFullScreenButton.label;" crop="right"
+                       label="&exitFullScreenButton.label;"
                        oncommand="BrowserFullScreenExit();"  
                        tooltiptext="&exitFullScreenButton.tooltip;"/>
       </hbox>
                 
       <hbox id="nav-bar-inner" flex="1">
-        <hbox id="urlbar-group" class="box-toolbar-group chromeclass-location" flex="1">
-          <hbox flex="1" id="urlbar-container">
-            <textbox id="urlbar" class="plain" flex="1"
-                     type="autocomplete" searchSessions="history" 
-                     timeout="50" maxrows="6" alwaysOpenPopup="true"
-                     defaultSearchEngine="true" tabScrolling="true"
-                     showCommentColumn="true"
-                     tooltiptext="&locationBar.tooltip;"
-                     oninput="window.XULBrowserWindow.userTyped.value=true;"
-                     ontextcommand="return handleURLBarCommand(userAction);"
-                     ontextrevert="return handleURLBarRevert();"
-                     onfocus="URLBarFocusHandler(event);"
-                     onblur="URLBarBlurHandler(event);">
-              <deck id="page-proxy-deck">
-                <image id="page-proxy-button"
-                       ondraggesture="PageProxyDragGesture(event);"/>
-                <image id="page-proxy-favicon" validate="never"
-                       ondraggesture="PageProxyDragGesture(event);"
-                       onload="this.parentNode.selectedIndex = 1; event.stopPropagation(); event.preventBubble(); HandleBookmarkIcon(this.src, true);"
-                       onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);"/>
-              </deck>
-              <menupopup id="ubhist-popup" class="autocomplete-history-popup"
-                         popupalign="topleft" popupanchor="bottomleft"
-                         onpopupshowing="createUBHistoryMenu(event.target);" 
-                         oncommand="executeUrlBarHistoryCommand(event.target);"/>
-            </textbox>
-          </hbox>
-        </hbox>
+        <textbox id="urlbar" class="chromeclass-location" flex="1"
+                 type="autocomplete" searchSessions="history" 
+                 timeout="50" maxrows="6" alwaysopenpopup="true"
+                 disablehistory="false"
+                 defaultSearchEngine="true" tabScrolling="true"
+                 showCommentColumn="true"
+                 tooltiptext="&locationBar.tooltip;"
+                 oninput="window.XULBrowserWindow.userTyped.value=true;"
+                 ontextcommand="return handleURLBarCommand(eventParam);"
+                 ontextrevert="return handleURLBarRevert();"
+                 onfocus="URLBarFocusHandler(event);"
+                 onblur="URLBarBlurHandler(event);">
+          <deck id="page-proxy-deck">
+            <image id="page-proxy-button"
+                   ondraggesture="PageProxyDragGesture(event);"/>
+            <image id="page-proxy-favicon" validate="never"
+                   ondraggesture="PageProxyDragGesture(event);"
+                   onload="this.parentNode.selectedIndex = 1;
+                           event.stopPropagation();
+                           event.preventBubble();
+                           HandleBookmarkIcon(this.src, true);"
+                   onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);"/>
+          </deck>
+
+          <menupopup id="ubhist-popup" class="autocomplete-history-popup"
+                     popupalign="topleft" popupanchor="bottomleft"
+                     onpopupshowing="createUBHistoryMenu(event.target);" 
+                     oncommand="executeUrlBarHistoryCommand(event.target);"/>
+        </textbox>
 
         <button id="go-button" class="button-toolbar chromeclass-location"
                 label="&goButton.label;" hidden="true" persist="hidden"
@@ -318,7 +315,7 @@ Contributor(s): ______________________________________. -->
                            status="rdf:http://home.netscape.com/WEB-rdf#status"
                            rdf:type="http://home.netscape.com/NC-rdf#Bookmark"
                            tooltiptext="rdf:http://home.netscape.com/NC-rdf#URL"
-                           label="rdf:http://home.netscape.com/NC-rdf#Name" crop="right"/>
+                           label="rdf:http://home.netscape.com/NC-rdf#Name"/>
           </rule>
 
           <rule iscontainer="true" isempty="true"
@@ -390,11 +387,11 @@ Contributor(s): ______________________________________. -->
   <statusbar id="status-bar" class="chromeclass-status"
              ondragover="nsDragAndDrop.dragOver(event, contentAreaDNDObserver);"
              ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
-    <hbox id="component-bar"/>
-    <statusbarpanel id="statusbar-display" label="&statusText.label;" crop="right" flex="1"/>
-    <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
-    <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
-    <statusbarpanel class="statusbarpanel-icononly" id="security-button"/>
+    <statusbarpanel id="component-bar"/>
+    <statusbarpanel id="statusbar-display" label="&statusText.label;" flex="1"/>
+    <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
+    <statusbarpanel class="statusbarpanel-iconic" id="offline-status"/>
+    <statusbarpanel class="statusbarpanel-iconic" id="security-button"/>
   </statusbar> 
 
   <data id="fullScreenElementChanges">
diff --git a/suite/browser/turboDialog.xul b/suite/browser/turboDialog.xul
index cc48cf7e7c9f..f336dd8aa5a9 100644
--- a/suite/browser/turboDialog.xul
+++ b/suite/browser/turboDialog.xul
@@ -22,8 +22,7 @@
      - Blake Ross <blake@netscape.com> (Original Author)
 -->
 
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://navigator/skin/turbo.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogs.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % turboDialogDTD SYSTEM "chrome://navigator/locale/turboDialog.dtd" >
diff --git a/suite/browser/urlbarBindings.xml b/suite/browser/urlbarBindings.xml
index 1e8badb95358..e4d15ab272d3 100644
--- a/suite/browser/urlbarBindings.xml
+++ b/suite/browser/urlbarBindings.xml
@@ -53,12 +53,11 @@
   </binding>
   
   <binding id="autocomplete-result-popup" extends="chrome://global/content/autocomplete.xml#autocomplete-result-popup">
-    <content menugenerated="true" orient="vertical">
-      <xul:box class="autocomplete-result-box" flex="1">
-        <xul:outliner anonid="outliner" class="autocomplete-outliner" flex="1">
-          <xul:outlinerbody anonid="outlinerbody" class="autocomplete-outlinerbody" flex="1"/>
-        </xul:outliner>
-      </xul:box>
+    <content>
+      <xul:outliner anonid="outliner" class="autocomplete-outliner" flex="1">
+        <xul:outlinercols anonid="outlinercols"/>
+        <xul:outlinerbody anonid="outlinerbody" class="autocomplete-outlinerbody" flex="1"/>
+      </xul:outliner>
       <xul:box role="search-box" class="autocomplete-search-box"/>
     </content>