From b90661d5e524a3052beb3e95744f82deb0e35ed0 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 9 Dec 2001 08:47:31 +0000
Subject: [PATCH] 114258 - pref panel header binding, dialogoverlay.css
 shouldn't have to be included in each panel. r=ben sr=hewitt

114268 - unnecessarily setting localname attribute on all pref-based elements when loading pref panels. r=ben sr=hewitt


git-svn-id: svn://10.0.0.236/trunk@110118 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/ui/composer/content/pref-composer.xul   |  6 ++----
 mozilla/editor/ui/composer/content/pref-editing.xul    |  6 ++----
 .../resources/content/pref-contentpacks.xul            |  6 ++----
 .../cookie/resources/content/pref-cookies.xul          |  5 ++---
 .../cookie/resources/content/pref-images.xul           |  6 ++----
 .../resources/content/prefs/pref-inspector.xul         |  8 +++-----
 .../wallet/resources/content/pref-passwords.xul        |  6 ++----
 .../wallet/resources/content/pref-wallet.xul           |  6 ++----
 .../base/prefs/resources/content/pref-mailnews.xul     |  6 +++---
 .../base/prefs/resources/content/pref-receipts.xul     | 10 +++-------
 .../prefs/resources/content/pref-viewing_messages.xul  | 10 +++-------
 .../resources/content/mail3PaneWindowVertLayout.xul    |  2 --
 .../mailnews/base/resources/content/messageWindow.xul  |  2 --
 mozilla/mailnews/base/resources/content/messenger.xul  |  2 --
 14 files changed, 26 insertions(+), 55 deletions(-)

diff --git a/mozilla/editor/ui/composer/content/pref-composer.xul b/mozilla/editor/ui/composer/content/pref-composer.xul
index 817e23f196f..14514420854 100644
--- a/mozilla/editor/ui/composer/content/pref-composer.xul
+++ b/mozilla/editor/ui/composer/content/pref-composer.xul
@@ -23,13 +23,13 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-composer.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
+      onload="parent.initPanel('chrome://editor/content/pref-composer.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented -->
@@ -38,8 +38,6 @@
   ]]>
   </script>        
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <!-- Recent files menu -->
   <groupbox>
     <caption label="&recentFiles.title;"/>
diff --git a/mozilla/editor/ui/composer/content/pref-editing.xul b/mozilla/editor/ui/composer/content/pref-editing.xul
index 08dc631d1f3..beafba6ce92 100644
--- a/mozilla/editor/ui/composer/content/pref-editing.xul
+++ b/mozilla/editor/ui/composer/content/pref-editing.xul
@@ -23,12 +23,12 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-editing.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://editor/content/pref-editing.xul');">
+      onload="parent.initPanel('chrome://editor/content/pref-editing.xul');"
+      headertitle="&lHeader;">
 
   <script lanugage="JavaScript">
   <![CDATA[
@@ -41,8 +41,6 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <vbox>
     <label value="&authorName.label;"/>
     <hbox>
diff --git a/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul b/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
index 157023fc6f5..3fb429346ef 100644
--- a/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
+++ b/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
@@ -15,9 +15,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -28,7 +25,8 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul');">
+      onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul');"
+      headertitle="&lHeader;">
 
   <stringbundle id="bundle_contentPack"
                 src="chrome://content-packs/locale/contentpacks.properties"/>
diff --git a/mozilla/extensions/cookie/resources/content/pref-cookies.xul b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
index 294f503757c..41df7077ff3 100644
--- a/mozilla/extensions/cookie/resources/content/pref-cookies.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
@@ -23,12 +23,12 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://cookie/locale/pref-cookies.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="init();">
+      onload="init();"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
@@ -87,7 +87,6 @@
   ]]>
   </script>
 
-  <hbox class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
     <description>&cookieDetails;</description>
     <radiogroup id="networkCookieBehaviour"
                 prefstring="network.cookie.cookieBehavior">
diff --git a/mozilla/extensions/cookie/resources/content/pref-images.xul b/mozilla/extensions/cookie/resources/content/pref-images.xul
index cf8ac46b31d..58aff5d9a22 100644
--- a/mozilla/extensions/cookie/resources/content/pref-images.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-images.xul
@@ -22,7 +22,6 @@
      Peter Annema <disttsc@bart.nl>
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -32,7 +31,8 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="init();">
+      onload="init();"
+      headertitle="&lHeader;">
           
   <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
@@ -72,8 +72,6 @@
 
   <broadcaster id="haveImageBlocking" hidden="true"/>
 
-  <hbox class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
-
   <groupbox id="imagesArea">
     <caption label="&imageBlocking.label;"/>
 
diff --git a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
index b5c6de0ac14..ca44a849cfb 100644
--- a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
@@ -3,10 +3,10 @@
 <!DOCTYPE overlay SYSTEM "chrome://inspector/locale/prefs.dtd">
 
 <?xml-stylesheet href="chrome://inspector/skin/"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<page id="winPref" orient="vertical"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winPref"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      headertitle="&Inspector.label;">
 
   <script type="application/x-javascript" src="chrome://inspector/content/extensions/wsm-colorpicker.js"/>
   <script type="application/x-javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
@@ -50,8 +50,6 @@
     
   ]]></script>
 
-  <hbox class="box-smallheader" title="&Inspector.label;"/>
-
   <vbox id="bxGeneralPrefs">
     <groupbox id="tbxBlink" flex="1">
       <caption label="Element Blinking"/>
diff --git a/mozilla/extensions/wallet/resources/content/pref-passwords.xul b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
index ebc03f9d947..472cda430a6 100644
--- a/mozilla/extensions/wallet/resources/content/pref-passwords.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
@@ -20,7 +20,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -29,7 +28,8 @@
 %prefWalletDTD;
 ]>
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');">
+      onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -63,8 +63,6 @@
   ]]>
   </script>
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox>
     <caption label="&signonHeader.label;"/>
     <description flex="1">&signonDescription.label;</description>
diff --git a/mozilla/extensions/wallet/resources/content/pref-wallet.xul b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
index ce763aedfb1..2c43f0135cc 100644
--- a/mozilla/extensions/wallet/resources/content/pref-wallet.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
@@ -20,7 +20,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -29,7 +28,8 @@
 %prefWalletDTD;
 ]>
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');">
+      onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
@@ -51,8 +51,6 @@
   ]]>
   </script>
         
-  <hbox class="box-smallheader" title="&lHeader;"/>
-
   <groupbox>
     <caption label="&walletHeader.label;"/>
     <description>&walletDescription.label;</description>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 2f9c4b4a855..cc6759a6fa3 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -24,11 +24,13 @@ Contributor(s):
 -->
 
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="Init();">
+      onload="Init();"
+      headertitle="&pane.title;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -39,8 +41,6 @@ Contributor(s):
   </script>
   <script type="application/x-javascript" src="chrome://messenger/content/pref-mailnews.js"/>
   
-  <hbox class="box-smallheader" title="&pane.title;"/>
-
   <groupbox>
     <caption label="&windowSettings.label;"/>
     
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
index d484f5773ab..57f1cc5c42a 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 
-<?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
-
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');">
+      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
+      headertitle="&pane.title;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -17,8 +17,4 @@
     }
   ]]>  
   </script>
-
-
-  <hbox class="box-smallheader" title="&pane.title;"/>
-
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 2c7d481ca1f..1116bc83c8e 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -1,15 +1,13 @@
 <?xml version="1.0"?>
 
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-viewing_messages.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');">
+      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
+      headertitle="&pane.title;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -39,8 +37,6 @@
   ]]>
   </script>
 
-  <hbox class="box-smallheader" title="&pane.title;"/>
-
   <groupbox>
     <caption label="&displayWidth.label;"/>
 
diff --git a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index 659cf715bba..0651a1ea1ee 100644
--- a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -75,8 +75,6 @@ Rights Reserved.
 <script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/searchBar.js"/>
diff --git a/mozilla/mailnews/base/resources/content/messageWindow.xul b/mozilla/mailnews/base/resources/content/messageWindow.xul
index aafe789934a..9b979577973 100644
--- a/mozilla/mailnews/base/resources/content/messageWindow.xul
+++ b/mozilla/mailnews/base/resources/content/messageWindow.xul
@@ -68,8 +68,6 @@ Rights Reserved.
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index d9821b0f7f7..a144643f89b 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -77,8 +77,6 @@ Rights Reserved.
 <script type="application/x-javascript" src="chrome://messenger/content/searchBar.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>