From c8a9a80ed224cc86619e4cd0c897b1fff9f3fd96 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Thu, 30 Oct 2003 09:48:15 +0000
Subject: [PATCH] Bug 78446 MailNews xul files should not have any inline
 styles r=bienvenu sr=bz

---
 mailnews/base/resources/content/commandglue.js |  2 ++
 .../content/mail3PaneWindowVertLayout.xul      |  6 +-----
 mailnews/base/resources/content/mailWindow.js  |  2 ++
 .../resources/content/mailWindowOverlay.xul    | 18 ++++++++----------
 mailnews/base/resources/content/messenger.xul  |  5 +----
 .../resources/content/msgReadSMIMEOverlay.xul  |  4 ++--
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index c16a2bdd6e46..1b96a835a430 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -448,6 +448,8 @@ function UpdateStatusMessageCounts(folder)
 
     unreadElement.setAttribute("label", numUnread);
     totalElement.setAttribute("label", numTotal);
+    unreadElement.hidden = false;
+    totalElement.hidden = false;
 
   }
 
diff --git a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index 9d786dada39e..73ba5dec841e 100644
--- a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -190,10 +190,6 @@ Rights Reserved.
 
   </hbox>
 
-	<statusbar id="status-bar" class="mailwindow-statusbar">
-		<statusbarpanel id="unreadMessageCount" style="min-width: 5px"/>
-		<statusbarpanel id="totalMessageCount" style="min-width: 5px"/>
-	</statusbar>
-	
+  <statusbar id="status-bar" class="chromeclass-status mailwindow-statusbar"/>
 	
 </window>
diff --git a/mailnews/base/resources/content/mailWindow.js b/mailnews/base/resources/content/mailWindow.js
index 0013a5cf4ece..cf04a7ee98b9 100644
--- a/mailnews/base/resources/content/mailWindow.js
+++ b/mailnews/base/resources/content/mailWindow.js
@@ -525,6 +525,8 @@ function ShowAccountCentral()
     {
         var acctCentralPage = pref.getComplexValue("mailnews.account_central_page.url",
                                                    Components.interfaces.nsIPrefLocalizedString).data;
+        GetUnreadCountElement().hidden = true;
+        GetTotalCountElement().hidden = true;
         switch (gPaneConfig)
         {
             case 0:
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 5c78ac46a043..14c897d02d84 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1773,16 +1773,14 @@ Rights Reserved.
 </hbox>
 
 <statusbar class="chromeclass-status" id="status-bar"> 
-  <hbox insertbefore="unreadMessageCount" flex="1">
-    <statusbarpanel id="component-bar"/>
-    <statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
-    <statusbarpanel class="statusbarpanel-progress">
-      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/>
-    </statusbarpanel>
-  </hbox>
-  <hbox insertafter="totalMessageCount" id="status-bar-end-box">
-    <statusbarpanel checkfunc="MailCheckBeforeOfflineChange()" id="offline-status" class="statusbarpanel-iconic"/> 
-  </hbox>
+  <statusbarpanel id="component-bar"/>
+  <statusbarpanel id="statusText" label="&statusText.label;" crop="right" flex="1"/>
+  <statusbarpanel class="statusbarpanel-progress">
+    <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/>
+  </statusbarpanel>
+  <statusbarpanel id="unreadMessageCount" hidden="true"/>
+  <statusbarpanel id="totalMessageCount" hidden="true"/>
+  <statusbarpanel checkfunc="MailCheckBeforeOfflineChange()" id="offline-status" class="statusbarpanel-iconic"/> 
 </statusbar> 
 
 
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index 547d839c74e5..d43901d8c774 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -183,8 +183,5 @@ Rights Reserved.
    </vbox>             
   </hbox>
 
-  <statusbar id="status-bar" class="chromeclass-status mailwindow-statusbar">
-    <statusbarpanel id="unreadMessageCount" style="min-width: 5px"/>
-    <statusbarpanel id="totalMessageCount" style="min-width: 5px"/>
-  </statusbar>
+  <statusbar id="status-bar" class="chromeclass-status mailwindow-statusbar"/>
 </window>
diff --git a/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul b/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
index 246d6c2f987c..ff18d41ff309 100644
--- a/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
+++ b/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
@@ -52,7 +52,7 @@
       accesskey="&menu_securityStatus.accesskey;" observes="cmd_viewSecurityStatus"/>
   </menupopup>
 
-  <hbox id="status-bar-end-box">
+  <statusbar id="status-bar">
     <statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
       id="signed-status" collapsed="true" oncommand="showMessageReadSecurityInfo();"/>
     <statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
@@ -60,6 +60,6 @@
 
     <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
     <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
-  </hbox>
+  </statusbar>
 
 </overlay>