From c4171544c44096b1c707798a474505f66dfdfd21 Mon Sep 17 00:00:00 2001
From: "andreww%netscape.com" <andreww%netscape.com>
Date: Thu, 14 Sep 2006 05:57:55 +0000
Subject: [PATCH] bugzilla 43797 abolish the taskbar sr=hewitt (s)r=hyatt

---
 suite/browser/navigator.xul                   | 20 +++++++++++--------
 suite/browser/navigatorOverlay.xul            |  2 +-
 .../en-US/chrome/browser/navigator.dtd        |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 03b552e2fe2..cdf1a290f72 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -328,18 +328,22 @@ Contributor(s): ______________________________________. -->
                  onclick="return contentAreaClick(event);"
                  ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"/>
       </hbox>
-      
+    </vbox>  
+   </hbox>
+     
       <statusbar id="status-bar" class="chromeclass-status">
+        <box id="component-bar" class="component-bar-box"/>
         <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
-        <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
         <statusbarpanel id="statusbar-display" label="&statusText.label;" crop="right" flex="1"/>
+        <statusbarpanel id="statusbar-empty-spacer" flex="2" />
+        
+        <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
+        
         <statusbarpanel class="statusbarpanel-icononly" id="security-button"/>
-      </statusbar>  
-    
-    </vbox>
+      </statusbar> 
+       
+      <resizer class="window-diagonal" />
+      
 
-  </hbox>
-
-  <hbox id="taskbar" class="chromeclass-extrachrome toolbox-bottom"/>
 
 </window>
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 8a316ead28d..8890926332a 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -157,7 +157,7 @@
     <broadcaster id="Communicator:WorkMode"/>
     <broadcaster id="cmd_viewnavbar" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
     <broadcaster id="cmd_viewpersonaltoolbar" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
-    <broadcaster id="cmd_viewtaskbar" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
+    <broadcaster id="cmd_viewtaskbar" oncommand="goToggleToolbar('status-bar','cmd_viewtaskbar');" checked="true"/>
   </broadcasterset>
 
   <!-- Menu -->
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index 561410a1d9d..2f9e4f8e8b5 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -46,8 +46,8 @@
 <!ENTITY navbarCmd.accesskey "n">
 <!ENTITY personalbarCmd.label "Personal Toolbar">
 <!ENTITY personalbarCmd.accesskey "p">
-<!ENTITY taskbarCmd.label "Taskbar">
-<!ENTITY taskbarCmd.accesskey "t">
+<!ENTITY taskbarCmd.label "Statusbar">
+<!ENTITY taskbarCmd.accesskey "s">
 
 <!ENTITY useStyleSheetMenu.label "Use Stylesheet">
 <!ENTITY useStyleSheetMenu.accesskey "u">