From 3a5ecfc9979912e53ca56f9d9d3898dba0d3de54 Mon Sep 17 00:00:00 2001
From: "matt%netscape.com"
 <matt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Sep 2006 05:44:21 +0000
Subject: [PATCH] fix for bug 11870 26458 r=ben

git-svn-id: svn://10.0.0.236/trunk@210160 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/navigator.xul | 35 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 6dd8ad47d3a..97504c8714a 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -351,33 +351,36 @@ Contributor(s): ______________________________________. -->
   
              <!-- this is the little page proxy icon --> 
              <!-- display should be turned off right now until functionality is implemented --> 
-              <titledbutton id="page-proxy-button" ondraggesture="DragProxyIcon(event);"/> 
-  
-               <!-- this is the urlbar --> 
+             <!-- This is the smart search pop-up -->
+			 <!-- <titledbutton id="action-popup" align="right"/> -->
+
+			 <titledbutton id="page-proxy-button" ondraggesture="DragProxyIcon(event);"/> 
+
+             <!-- this is the urlbar --> 
              <html:input id="urlbar" type="text" chromeclass="location" 
                 onkeyup="if (event.which == 13) { BrowserLoadURL(); }" 
                 flex = "100%" /> 
   
-                <!-- this is the urlbar session history popup --> 
-                <!-- display should be turned off right now until functionality is implemented --> 
-                <titledbutton id="sessionhist-popup"/> 
-  
-                <!-- this is the search/go button --> 
-                <titledbutton id="search-button" value="&searchButton.label;"
-                  onclick="OpenSearch('internet',false, document.getElementById('urlbar').value);" 
-                /> 
-  
-             <!-- this is for other functionality --> 
-             <titledbutton id="action-popup" align="right"/> 
+             <!-- this is the urlbar session history popup --> 
+             <!-- display should be turned off right now until functionality is implemented --> 
+             <!-- <titledbutton id="sessionhist-popup"/> -->
   
              <!-- end url bar box -->
             </box>
             
             <!-- used for vertically positioning the url field contraption w/i the nav toolbar   -->
           </box>
-				
+		<!--  this is the search/go button -->
+         <box align="vertical" flex="1%">
+           <spring style="height: 4px;"/>
+			<box id="searchbutton" align="horizontal" style="width: 100%;"> 
+			<titledbutton id="search-button" value="&searchButton.label;"
+                  onclick="OpenSearch('internet',false, document.getElementById('urlbar').value);" 
+                /> 
+            </box>
+		 </box>
       <!-- FIX ME - remove this
-      <box align="vertical" flex="9999999">
+      <box align="vertical" flex="100%">
         <spring flex="1"/>
         <html:input id="urlbar" type="text" chromeclass="location"
                     onkeyup="if (event.which == 13) { BrowserLoadURL(); }"/>