70751 - [XUL Syntax] XUL docs loaded in iframes should use <page>, r=blake, sr=hyatt

2001-10-21 04:16:03 +00:00 · 2001-10-21 04:16:03 +00:00 · 3f08911279
--- a/editor/ui/composer/content/pref-composer.xul
+++ b/editor/ui/composer/content/pref-composer.xul
@ -28,11 +28,10 @@

 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-composer.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical" 
-        onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical" 
+      onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">

  <script type="application/x-javascript">
  <!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented -->
@ -199,4 +198,4 @@

  </groupbox>
  -->
-</window>
+</page>
--- a/editor/ui/composer/content/pref-editing.xul
+++ b/editor/ui/composer/content/pref-editing.xul
@ -27,11 +27,10 @@

 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-editing.dtd">

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical" 
-        onload="parent.initPanel('chrome://editor/content/pref-editing.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical" 
+      onload="parent.initPanel('chrome://editor/content/pref-editing.xul');">

  <script lanugage="JavaScript">
  <![CDATA[
@ -137,4 +136,4 @@
      <data id="backgroundImageData" pref="true" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/>
    </hbox>
  </groupbox>
-</window>
+</page>
--- a/editor/ui/composer/content/pref-publish.xul
+++ b/editor/ui/composer/content/pref-publish.xul
@ -25,7 +25,7 @@
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-publish.dtd" >
-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
    		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        title="&window.title;"
  		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-publish' ); else parent.queuedTag = 'pref-publish';">
@ -77,4 +77,4 @@
  </html:tr>
 </html:table>
 </html:div>
-</window>
+</page>
--- a/extensions/inspector/resources/content/prefs/pref-inspector.xul
+++ b/extensions/inspector/resources/content/prefs/pref-inspector.xul
@ -5,8 +5,8 @@
 <?xml-stylesheet href="chrome://communicator/skin/"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<window id="winPref" orient="vertical"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winPref" orient="vertical"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <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"/>
@ -101,4 +101,4 @@
                pref="true" preftype="bool" prefstring="inspector.hooks.navigator" prefattribute="checked"/>
    </vbox>
  </vbox>
-</window>
+</page>
--- a/extensions/inspector/resources/content/prefs/pref-sidebar.xul
+++ b/extensions/inspector/resources/content/prefs/pref-sidebar.xul
@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://inspector/locale/prefs.dtd">
-
-<?xml-stylesheet href="chrome://communicator/skin/"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<window id="winPrefSidebar" orient="vertical"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script type="application/x-javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
-
-  <hbox class="box-smallheader" title="&Sidebar.label;"/>
-
-  <hbox id="bxSidebarPrefs">
-    <hbox id="bxSidebarInstalled" collapsed="true" flex="1">
-      <text value="The sidebar panel is currently installed."/>
-    </hbox>
-    <vbox id="bxSidebarNotInstalled" collapsed="true" flex="1">
-      <text value="The sidebar panel is not currently installed.  Click the 'Install' button to add it to your sidebar."/>
-      <button label="Install" onclick="gSidebarPrefs.installSidebar()"/>
-    </vbox>
-  </hbox>
-</window>
--- a/extensions/inspector/resources/content/viewers/boxModel/boxModel.xul
+++ b/extensions/inspector/resources/content/viewers/boxModel/boxModel.xul
@ -8,10 +8,10 @@
 <?xml-stylesheet href="chrome://inspector/skin/viewers/boxModel/boxModel.css"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>

-<window id="winBoxModel" class="color-dialog" 
-        orient="vertical"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winBoxModel"
+      orient="vertical"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <script type="application/x-javascript" src="chrome://inspector/content/viewers/boxModel/boxModel.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
@ -110,4 +110,4 @@
    </hbox>
  </vbox>

-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
+++ b/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
@ -7,10 +7,10 @@

 <?xml-stylesheet href="chrome://inspector/skin/"?>

-<window id="winComputedStyle" class="color-dialog" 
-        orient="vertical"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winComputedStyle"
+      orient="vertical"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inBaseOutlinerView.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/viewers/computedStyle/computedStyle.js"/>
@ -24,4 +24,4 @@
    <outlinercol id="olcStyleValue" label="Value" flex="1"/>
    <outlinerbody id="olbStyles" flex="1"/>
  </outliner>
-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/dom/dom.xul
+++ b/extensions/inspector/resources/content/viewers/dom/dom.xul
@ -8,9 +8,9 @@

 <?xml-stylesheet href="chrome://inspector/skin/viewers/dom/dom.css"?>

-<window id="winDOMViewer" class="color-dialog" 
-        orient="vertical"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winDOMViewer"
+      orient="vertical"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/dom.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
@ -73,4 +73,4 @@
      <template/>
    </outlinerbody>
  </outliner>
-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/domNode/domNode.xul
+++ b/extensions/inspector/resources/content/viewers/domNode/domNode.xul
@ -8,10 +8,10 @@

 <?xml-stylesheet href="chrome://inspector/skin/viewers/domNode/domNode.css"?>

-<window id="winNodeDefault" class="color-dialog" 
-        orient="vertical" style="padding: 10px"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winNodeDefault"
+      orient="vertical" style="padding: 10px"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <!--============================= SCRIPTS ============================= -->

@ -112,4 +112,4 @@
      <textbox id="txbTextNodeValue" multiline="true" readonly="true" flex="1"/>
    </vbox>
  </deck>
-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
+++ b/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
@ -7,10 +7,10 @@

 <?xml-stylesheet href="chrome://inspector/skin/"?>

-<window id="winJSObject" class="color-dialog" 
-        orient="vertical"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winJSObject"
+      orient="vertical"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <script type="application/x-javascript" src="chrome://inspector/content/viewers/jsObject/jsObject.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
@ -50,4 +50,4 @@
    <treechildren id="trchJSObject" flex="1"/>
  </tree>

-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
+++ b/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
@ -8,10 +8,10 @@

 <?xml-stylesheet href="chrome://inspector/skin/viewers/styleRules/styleRules.css"?>

-<window id="winStyleRules" class="color-dialog" 
-        orient="vertical"
-        xmlns:domi="http://www.mozilla.org/inspector"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winStyleRules"
+      orient="vertical"
+      xmlns:domi="http://www.mozilla.org/inspector"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <!--============================= SCRIPTS ============================= -->

@ -74,4 +74,4 @@
    <outlinerbody id="olbStyleProps" flex="1"/>
  </outliner>

-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
+++ b/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
@ -7,13 +7,13 @@

 <?xml-stylesheet href="chrome://inspector/skin/"?>

-<window id="winStylesheets" class="color-dialog" 
-        orient="vertical"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winStylesheets"
+      orient="vertical"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <script type="application/x-javascript" src="chrome://inspector/content/viewers/stylesheets/stylesheets.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/events/ObserverManager.js"/>  

-</window>
+</page>
--- a/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul
+++ b/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul
@ -7,9 +7,9 @@

 <?xml-stylesheet href="chrome://inspector/skin/viewers/xblBindings/xblBindings.css"?>

-<window id="winXBLBindings" class="color-dialog" 
-        orient="vertical"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="winXBLBindings"
+      orient="vertical"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  
  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inBaseOutlinerView.js"/>
  <script type="application/x-javascript" src="chrome://inspector/content/viewers/xblBindings/xblBindings.js"/>
@ -76,4 +76,4 @@
      <textbox id="txbFunction" class="plain" readonly="true" multiline="true" flex="1"/>
    </multipanel>
  </multipanelset>
-</window>
+</page>
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@ -4,11 +4,10 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd">

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="onLoad();"
-        class="color-dialog"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="onLoad();"
+      orient="vertical">

  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
  <script type="application/x-javascript">
@ -94,4 +93,4 @@
     </hbox>
     -->
   </groupbox>
-</window>
+</page>
--- a/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
@ -25,13 +25,12 @@ Rights Reserved.

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        class="color-dialog"
-        style="-moz-user-focus: ignore;"
-        title="&window.title;" orient="vertical"
-        onload="onInitEditDirectories();">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      style="-moz-user-focus: ignore;"
+      title="&window.title;" orient="vertical"
+      onload="onInitEditDirectories();">

  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>

@ -51,4 +50,4 @@ Rights Reserved.
      </vbox>
    </hbox>
    <hbox id="okCancelButtonsRight"/>
-</window>
+</page>
--- a/mailnews/addrbook/resources/content/addressbook-panel.xul
+++ b/mailnews/addrbook/resources/content/addressbook-panel.xul
@ -27,11 +27,11 @@

 <?xul-overlay href="chrome://messenger/content/addressbook/abDirTreeOverlay.xul"?>
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abResultsTreeOverlay.dtd" >
-<window id="addressbook-panel"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="InitCommonJS(); abPanelStartup();"
-        xmlns:nc="http://home.netscape.com/NC-rdf#"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<page id="addressbook-panel"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="InitCommonJS(); abPanelStartup();"
+      xmlns:nc="http://home.netscape.com/NC-rdf#"
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">

  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
@ -90,4 +90,4 @@
      </treehead>
    </tree>
  </vbox>
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-addressing.xul
+++ b/mailnews/base/prefs/resources/content/am-addressing.xul
@ -31,11 +31,10 @@ Contributors:

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-addressing.dtd" >

-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        class="color-dialog"
-        onload="onLoad();"
-        orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      onload="onLoad();"
+      orient="vertical">
  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
  <script type="application/x-javascript" src="chrome://messenger/content/am-addressing.js"/>
  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
@ -65,4 +64,4 @@ Contributors:
    </radiogroup>
      
  </vbox>
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-advanced.xul
@ -4,9 +4,9 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      orient="vertical">


-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@ -6,9 +6,8 @@
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      class="color-dialog"
      onload="parent.onPanelLoaded('am-copies.xul');"
      orient="vertical">

@ -175,4 +174,4 @@
    </hbox>
  </groupbox>

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-identity-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
@ -27,7 +27,7 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-identity-advanced.dtd">

-<window class="dialog"
+<page
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  title="&identityAdvanced.label;"
  orient="vertical"
@ -64,4 +64,4 @@
          
  <hbox id="okCancelButtonsRight"/>

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@ -6,8 +6,7 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-imap-advanced.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-      class="dialog"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      style="padding: 10px"
      title="&imapAdvanced.label;"
@ -73,4 +72,4 @@

 <hbox id="okCancelButtonsRight"/>

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@ -6,11 +6,11 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-     flex="1" class="color-dialog" 
-     onload="parent.onPanelLoaded('am-main.xul');"
-     orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      flex="1"
+      onload="parent.onPanelLoaded('am-main.xul');"
+      orient="vertical">

    <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
    <script type="application/x-javascript" src="chrome://messenger/content/am-main.js"/>
@ -101,4 +101,4 @@

    </groupbox>

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mailnews/base/prefs/resources/content/am-offline.xul
@ -29,11 +29,10 @@ Contributors:

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-offline.dtd">

-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        class="color-dialog"
-        onload="parent.onPanelLoaded('am-offline.xul');"
-        orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      onload="parent.onPanelLoaded('am-offline.xul');"
+      orient="vertical">
 
    <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/> 

@ -123,4 +122,4 @@ Contributors:
    </vbox>
    </groupbox>
   
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-server-top.xul
+++ b/mailnews/base/prefs/resources/content/am-server-top.xul
@ -4,8 +4,8 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      orient="vertical">

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@ -31,11 +31,10 @@ Contributors:

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >

-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        class="color-dialog"
-        onload="parent.onPanelLoaded('am-server.xul');"
-        orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      onload="parent.onPanelLoaded('am-server.xul');"
+      orient="vertical">

  <script type="application/x-javascript" src="chrome://messenger/content/am-server.js"/>
  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
@ -232,4 +231,4 @@ Contributors:
            pref="true" preftype="string" prefattribute="value"
            prefstring="mail.server.%serverkey%.directory"/>
    </vbox>
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@ -6,11 +6,10 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >

-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        class="color-dialog"
-        onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');"
-        orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');"
+      orient="vertical">

  <script src="chrome://messenger/content/am-serverwithnoidentities.js"/>

@ -38,4 +37,4 @@
             pref="true" preftype="string" prefattribute="value"
             prefstring="mail.server.%serverkey%.directory"/>
  </vbox>
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mailnews/base/prefs/resources/content/am-smtp.xul
@ -7,10 +7,9 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  flex="100%"
-  class="color-dialog"
  onload="onLoad();"
  orient="vertical">

@ -38,4 +37,4 @@
  
  </groupbox>
  
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-accname.xul
+++ b/mailnews/base/prefs/resources/content/aw-accname.xul
@ -26,11 +26,10 @@ Rights Reserved.


 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accname.dtd" >
-<window id="accnamepage" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.wizardManager.onPageLoad('accname');">
+<page id="accnamepage" 
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.wizardManager.onPageLoad('accname');">

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <script type="application/x-javascript" src="chrome://messenger/content/aw-accname.js"/>
@ -49,4 +48,4 @@ Rights Reserved.
    </hbox>
  </vbox>
    
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-accounttype.xul
+++ b/mailnews/base/prefs/resources/content/aw-accounttype.xul
@ -25,10 +25,9 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accounttype.dtd" >
-<window id="accounttype" 
+<page id="accounttype" 
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#"
-    class="color-dialog"
    onload="dump('** acctype onload\n'); parent.wizardManager.onPageLoad('accounttype');"
    orient="vertical"
    onunload="onUnload();">
@ -69,4 +68,4 @@ Rights Reserved.
    </radiogroup>
  </vbox>

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mailnews/base/prefs/resources/content/aw-done.xul
@ -24,11 +24,10 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-done.dtd" >
-<window id="done" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        class="color-dialog"
-        onload="parent.wizardManager.onPageLoad('done');">
+<page id="done" 
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.wizardManager.onPageLoad('done');">

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <script src="chrome://messenger/content/aw-done.js"/>
@ -89,4 +88,4 @@ Rights Reserved.
    -->
  </vbox>
  
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-identity.xul
+++ b/mailnews/base/prefs/resources/content/aw-identity.xul
@ -25,11 +25,10 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-identity.dtd" >
-<window id="identitypage" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        class="color-dialog"
-        onload="parent.wizardManager.onPageLoad('identity');">
+<page id="identitypage" 
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.wizardManager.onPageLoad('identity');">

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <script type="application/x-javascript" src="chrome://messenger/content/aw-identity.js"/> 
@ -68,4 +67,4 @@ Rights Reserved.
    </grid>
  </vbox>
  
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-login.xul
+++ b/mailnews/base/prefs/resources/content/aw-login.xul
@ -25,11 +25,10 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-login.dtd" >
-<window id="loginpage" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        class="color-dialog"
-        onload="parent.wizardManager.onPageLoad('login');">
+<page id="loginpage" 
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.wizardManager.onPageLoad('login');">

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <script type="application/x-javascript" src="chrome://messenger/content/aw-login.js"/>
@ -66,4 +65,4 @@ Rights Reserved.
 -->
  </vbox>
  
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-newsserver.xul
+++ b/mailnews/base/prefs/resources/content/aw-newsserver.xul
@ -25,11 +25,10 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
-<window id="serverpage" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        class="color-dialog"
-        onload="parent.wizardManager.onPageLoad('newsserver');">
+<page id="serverpage" 
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.wizardManager.onPageLoad('newsserver');">

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <script type="application/x-javascript" src="chrome://messenger/content/aw-server.js"/>
@ -50,4 +49,4 @@ Rights Reserved.
  
  </vbox>
  
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mailnews/base/prefs/resources/content/aw-server.xul
@ -25,11 +25,10 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
-<window id="serverpage" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        class="color-dialog"
-        onload="parent.wizardManager.onPageLoad('server');">
+<page id="serverpage" 
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.wizardManager.onPageLoad('server');">

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <script type="application/x-javascript" src="chrome://messenger/content/aw-server.js"/>
@ -76,6 +75,6 @@ Rights Reserved.
    </groupbox>
  </vbox>
  
-</window>
+</page>


--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@ -27,11 +27,10 @@ Contributor(s):

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="Init();"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="Init();"
+      orient="vertical">

  <script type="application/x-javascript">
  <![CDATA[
@ -106,4 +105,4 @@ Contributor(s):
          </hbox>              
        </groupbox>
  
-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@ -4,11 +4,10 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
+      orient="vertical">

  <script type="application/x-javascript">
  <![CDATA[
@ -24,4 +23,4 @@

  <hbox class="box-smallheader" title="&pane.title;"/>

-</window>
+</page>
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@ -8,11 +8,10 @@

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-viewing_messages.dtd">

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
+      orient="vertical">
  <popupset id="aTooltipSet"/>

  <script type="application/x-javascript">
@ -125,4 +124,4 @@
              prefattribute="checked"/>
  </groupbox>
    
-</window>
+</page>
--- a/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mailnews/base/resources/content/msgAccountCentral.xul
@ -30,7 +30,7 @@ Rights Reserved.
 ]>


-<window
+<page
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -147,4 +147,4 @@ Rights Reserved.

    </rows>
  </grid>
-</window>
+</page>
--- a/profile/resources/content/newProfile1_1.xul
+++ b/profile/resources/content/newProfile1_1.xul
@ -31,18 +31,12 @@
 %profileDTD;
 ]>

-<window 
+<page 
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-    class="color-dialog wizardPanel"
    orient="vertical"
 		onload="parent.wizardManager.onPageLoad('newProfile1_1');"> 

-    <html>&pnl1.p1.text;</html>
-    <html>&pnl1.p2.text;</html>
-    <html>&pnl1.p3.text;</html>
-    <spacer flex="1"/>
-    <html>&pnl1.p4.text;</html>

-</window>
+</page>

--- a/profile/resources/content/newProfile1_2.xul
+++ b/profile/resources/content/newProfile1_2.xul
@ -26,9 +26,9 @@
 <?xml-stylesheet href="chrome://communicator/skin/profile/newProfile1_2.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/profile/newProfile1_2.dtd" >
-<window 
+<page
  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="color-dialog wizardPanel"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  orient="vertical"
  onload="initFields();parent.wizardManager.onPageLoad('newProfile1_2');"> 

@ -69,4 +69,4 @@

  <data id="ProfileLanguage" />
  <data id="ProfileRegion" />
-</window>
+</page>
--- a/themes/classic/communicator/search/mac/internetresults.css
+++ b/themes/classic/communicator/search/mac/internetresults.css
@ -1,4 +1,4 @@
-window {
+page {
 	margin-top: 2px;
 }

--- a/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/xpfe/components/bookmarks/resources/bm-panel.xul
@ -34,7 +34,7 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">

-<window id="bookmarksPanel" orient="vertical"
+<page id="bookmarksPanel" orient="vertical"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="Startup();">
@ -150,4 +150,4 @@
                  onclick="gBookmarksShell.treeOpen(event);"/>
  </tree>

-</window>
+</page>
--- a/xpfe/components/bookmarks/resources/pref-bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/pref-bookmarks.xul
@ -30,11 +30,10 @@
 %prefBookmarkDTD;
 ]>

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/bookmarks/pref-bookmarks.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/bookmarks/pref-bookmarks.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -117,5 +116,5 @@
  </groupbox>              


-</window>
+</page>

--- a/xpfe/components/history/resources/history-panel.xul
+++ b/xpfe/components/history/resources/history-panel.xul
@ -27,9 +27,9 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/history/history.dtd" >

-<window id="history-panel"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="HistoryInit();">
+<page id="history-panel" orient="vertical"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="HistoryInit();">
  <commandset id="selectEditMenuItems">
    <command id="cmd_delete"/>
    <command id="cmd_copy"/>
@ -57,4 +57,4 @@
  </outliner>


-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@ -24,11 +24,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-advanced.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-advanced.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -171,6 +170,6 @@
    </vbox>
  </groupbox>
  
-</window>
+</page>


--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@ -31,11 +31,10 @@
 <!ENTITY % prefAppearanceDTD SYSTEM "chrome://communicator/locale/pref/pref-appearance.dtd" >
 %prefAppearanceDTD;
 ]>
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel(panel);">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel(panel);">

  <script type="application/x-javascript">
  <![CDATA[
@ -140,6 +139,5 @@
    </menulist>       
  </vbox>
  
-</window>
-
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.xul
@ -27,12 +27,11 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">

  <stringbundle id="bundle_prefApplications"
                src="chrome://communicator/locale/pref/pref-applications.properties"/>
@ -130,4 +129,4 @@
      <button label="&resetButton.label;" oncommand="clearRememberedSettings();"/>
    </hbox>
  </groupbox>
-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@ -24,11 +24,10 @@
 <?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -100,5 +99,5 @@

  </groupbox>

-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-charset.xul
@ -24,15 +24,14 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-charset.dtd" >

-<window
+<page
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  id="main-box"
+  orient="vertical"
  title="&charset.customize.title.label;"
-  class="dialog"
  windowtype="sidebar:customize"
  onload="Init();"
-  orient="vertical"
  persist="width height"
  width="500" height="394">

@ -96,5 +95,5 @@

  <hbox id="okCancelButtonsRight"/>
  
-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@ -28,11 +28,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -108,4 +107,4 @@
      </hbox>
  </groupbox>

-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug.xul
@ -25,11 +25,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -101,5 +100,5 @@

  </groupbox>

-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-debug1.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug1.xul
@ -25,11 +25,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug1.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -88,5 +87,5 @@
  </groupbox>


-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-debug2.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug2.xul
@ -25,11 +25,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug2.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');"
+      orient="vertical">

  <script type="application/x-javascript">
  <![CDATA[
@ -83,5 +82,5 @@
    </vbox>
  </groupbox>

-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@ -26,11 +26,10 @@

 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog"
-        orient="vertical"
-        onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';">

  <script type="application/x-javascript">
  // startup function called by the prefs architecture.
@ -140,5 +139,5 @@
    <spacer style="height: 30px;"/>
  </html:fieldset>

-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@ -24,12 +24,11 @@
 <?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
-<window id="fontPanel"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">
+<page id="fontPanel"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">

  <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
@ -269,4 +268,4 @@

  </hbox>

-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-history.xul
@ -27,11 +27,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">

  <script type="application/x-javascript">

@ -149,5 +148,5 @@
    </hbox>
  </groupbox>  

-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages.xul
@ -23,11 +23,11 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >

-<window id="langPanel"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  class="color-dialog"
-  onload="Init();" orient="vertical">
+<page id="langPanel"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="Init();">

  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
  <!-- XXX: Replace strres.js when pref-languages.js is converted -->
@ -102,4 +102,4 @@
        </template>
    </menulist>       
  </groupbox>
-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@ -27,11 +27,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">

  <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-navigator.js"/>
@ -135,5 +134,5 @@

      </vbox>
   </groupbox>
-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-policies.xul
@ -9,11 +9,10 @@
 %policiesDTD;
 ]>

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -88,4 +87,4 @@

  </groupbox>
  
-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@ -27,11 +27,10 @@
 <?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -169,5 +168,5 @@

  </groupbox>

-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-search.xul
@ -24,11 +24,10 @@
 <?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        class="color-dialog"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()">

  <script type="application/x-javascript">
  <![CDATA[
@ -83,4 +82,4 @@
    </radiogroup>
  </groupbox>

-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-security.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-security.xul
@ -24,12 +24,11 @@
 <?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        id="securityWindow"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      id="securityWindow"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');">

  <script type="application/x-javascript">
  <![CDATA[
@ -41,5 +40,5 @@
  <html> &rContent1;</html>
  <html> &rContent2;</html>
  <!-- Overlays add UI here -->
-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@ -4,11 +4,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');">
  
  <script type="application/x-javascript">
  <![CDATA[
@ -72,5 +71,5 @@
    <spacer style="height: 28px;"/>
  </html:fieldset>
 -->
-</window>
+</page>

--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@ -30,11 +30,10 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-themes.dtd" >

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="Startup()"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="Startup()">

  <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
@ -98,4 +97,4 @@
    </vbox>
  </hbox>
  
-</window>
+</page>
--- a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@ -34,11 +34,10 @@
 %prefWinhooksDTD;
 ]>

-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-winhooks.xul');"
-        orient="vertical">
+<page xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-winhooks.xul');">

    <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-winhooks.js"/>
    
@ -145,5 +144,5 @@
    </hbox>
    <spacer flex="1"/>
    
-</window>
+</page>

--- a/xpfe/components/related/resources/related-panel.xul
+++ b/xpfe/components/related/resources/related-panel.xul
@ -21,7 +21,7 @@

 -->

-<window
+<page
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -30,4 +30,4 @@
  <script type="application/x-javascript" src="chrome://communicator/content/related/related-panel.js" />

  <iframe id="daFrame" src="about:blank" flex="1" />
-</window>
+</page>
--- a/xpfe/components/search/resources/internetresults.xul
+++ b/xpfe/components/search/resources/internetresults.xul
@ -6,12 +6,12 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/search/internetresults.dtd">

-<window class="color-dialog" orient="vertical" onload="onLoadInternetResults();"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&internetresults.title;"
-        context="disallowcontext">
+<page orient="vertical" onload="onLoadInternetResults();"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      title="&internetresults.title;"
+      context="disallowcontext">

  <popupset>
    <popup id="disallowcontext" onpopupshowing="return false;" />
@ -163,4 +163,4 @@
    <iframe id="content" flex="1" src="chrome://communicator/locale/search/default.htm"/>
  </hbox>
  
-</window>
+</page>
--- a/xpfe/components/search/resources/search-panel.xul
+++ b/xpfe/components/search/resources/search-panel.xul
@ -26,12 +26,12 @@
 <?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/search/search-panel.dtd" >
-<window id="searchPanel" class="color-dialog"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical" onload="SearchPanelStartup();"
-        onunload="SearchPanelShutdown();">
+<page id="searchPanel"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      orient="vertical" onload="SearchPanelStartup();"
+      onunload="SearchPanelShutdown();">

  <script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
@ -216,4 +216,4 @@
      </vbox>
    </deck>
  </vbox>
-</window>
+</page>
--- a/xpfe/components/sidebar/resources/PageNotFound.xul
+++ b/xpfe/components/sidebar/resources/PageNotFound.xul
@ -3,12 +3,12 @@

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">

-<window xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<page xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml">


        <html class="header">&sidebar.pagenotfound.label;</html>
 

-</window>
+</page>