Bug 107642 -- XUL syntax changes/cleanup. Patch from blake, r=hyatt, sr=ben.

2024-10-10 20:05:49 +00:00 · 2001-11-05 00:00:02 +00:00 · 2001-11-05 00:00:02 +00:00 · 9d7a5cb5c5
commit 9d7a5cb5c5
parent 96514a49d9
37 changed files with 304 additions and 365 deletions
--- a/security/manager/pki/resources/content/CAOverlay.xul
+++ b/security/manager/pki/resources/content/CAOverlay.xul
@ -27,13 +27,12 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">

 <overlay id="CAOverlay" 
-         xmlns:html="http://www.w3.org/1999/xhtml" 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:cert="http://netscape.com/rdf-cert#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <vbox id="CACerts">
-    <html>&certmgr.cas;</html>
+    <description>&certmgr.cas;</description>
    <separator class="thin"/>
    <outliner id="ca-outliner" multiple="true" enableColumnDrag="true"
              onselect="ca_enableButtons()" flex="1">
@ -48,18 +47,18 @@
      <outlinerbody flex="1" ondblclick="viewCerts();"/>
    </outliner>
    <hbox>
-      <button id="ca_viewButton" class="normal" 
+      <button id="ca_viewButton"
              label="&certmgr.view.label;"
              disabled="true" oncommand="viewCerts();"/>
-      <button id="ca_editButton" class="normal" 
+      <button id="ca_editButton"
              label="&certmgr.edit.label;"
              disabled="true" oncommand="editCerts();"/>
 <!-- future - import a DER cert?
-      <button id="ca_addButton" class="normal" 
+      <button id="ca_addButton"
              label="&certmgr.add.label;"
              oncommand="addCerts();"/>
 -->
-      <button id="ca_deleteButton" class="normal" 
+      <button id="ca_deleteButton"
              label="&certmgr.delete.label;"
              disabled="true" oncommand="deleteCerts();"/>
    </hbox>
--- a/security/manager/pki/resources/content/MineOverlay.xul
+++ b/security/manager/pki/resources/content/MineOverlay.xul
@ -27,13 +27,12 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">

 <overlay id="MineOverlay" 
-         xmlns:html="http://www.w3.org/1999/xhtml" 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:cert="http://netscape.com/rdf-cert#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <vbox id="myCerts">
-    <html>&certmgr.mine;</html>
+    <description>&certmgr.mine;</description>
    <separator class="thin"/>
    <outliner id="user-outliner" multiple="true" enableColumnDrag="true"
              onselect="mine_enableButtons()" flex="1">
--- a/security/manager/pki/resources/content/OthersOverlay.xul
+++ b/security/manager/pki/resources/content/OthersOverlay.xul
@ -40,13 +40,12 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">

 <overlay id="WebSitesOverlay" 
-         xmlns:html="http://www.w3.org/1999/xhtml" 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:cert="http://netscape.com/rdf-cert#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <vbox id="othersCerts">
-    <html>&certmgr.others;</html>
+    <description>&certmgr.others;</description>
    <separator class="thin"/>
    <outliner id="email-outliner" multiple="true"
              onselect="email_enableButtons()" flex="1">
@ -65,18 +64,18 @@
      <outlinerbody flex="1" ondblclick="viewCerts();"/>
    </outliner>
    <hbox>
-      <button id="email_viewButton" class="normal" 
+      <button id="email_viewButton"
              label="&certmgr.view.label;"
              disabled="true" oncommand="viewCerts();"/>
-      <button id="email_editButton" class="normal" 
+      <button id="email_editButton"
              label="&certmgr.edit.label;"
              disabled="true" oncommand="editCerts();"/>
 <!-- future - import a DER cert?
-      <button id="email_addButton" class="normal" 
+      <button id="email_addButton"
              label="&certmgr.add.label;"
              oncommand="addCerts();"/>
 -->
-      <button id="email_deleteButton" class="normal" 
+      <button id="email_deleteButton"
              label="&certmgr.delete.label;"
              disabled="true" oncommand="deleteCerts();"/>
    </hbox>
--- a/security/manager/pki/resources/content/PageInfoOverlay.xul
+++ b/security/manager/pki/resources/content/PageInfoOverlay.xul
@ -188,15 +188,15 @@
  </tabs>
  <tabpanels id="tabpanels">
    <vbox id="securityPanel" flex="1">
-      <text id="security-identity" class="header label"/>
-      <html id="security-identity-text" flex="1"/>
+      <label id="security-identity" class="header"/>
+      <description id="security-identity-text" flex="1"/>
      <hbox>
-        <button id="security-view-cert" class="normal" label="&pageInfo.view.label;" 
+        <button id="security-view-cert" label="&pageInfo.view.label;" 
                oncommand="security.viewCert();"/>
-        <html id="security-view-text" flex="1"/>
+        <description id="security-view-text" flex="1"/>
      </hbox>
      <separator class="groove"/>
-      <text id="security-privacy" class="header label"/>
+      <label id="security-privacy" class="header"/>
      <vbox flex="1">
        <html id="security-privacy-msg1"/>
        <html id="security-privacy-msg2"/>
--- a/security/manager/pki/resources/content/WebSitesOverlay.xul
+++ b/security/manager/pki/resources/content/WebSitesOverlay.xul
@ -27,13 +27,12 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">

 <overlay id="WebSitesOverlay" 
-         xmlns:html="http://www.w3.org/1999/xhtml" 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:cert="http://netscape.com/rdf-cert#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <vbox id="webCerts">
-    <html>&certmgr.websites;</html>
+    <description>&certmgr.websites;</description>
    <separator class="thin"/>
    <outliner id="server-outliner" multiple="true" enableColumnDrag="true"
              onselect="websites_enableButtons()" flex="1">
@ -48,18 +47,18 @@
      <outlinerbody flex="1" ondblclick="viewCerts();"/>
    </outliner>
    <hbox>
-      <button id="websites_viewButton" class="normal" 
+      <button id="websites_viewButton"
              label="&certmgr.view.label;"
              disabled="true" oncommand="viewCerts();"/>
-      <button id="websites_editButton" class="normal" 
+      <button id="websites_editButton"
              label="&certmgr.edit.label;"
              disabled="true" oncommand="editCerts();"/>
 <!-- future - import a DER cert?
-      <button id="websites_addButton" class="normal" 
+      <button id="websites_addButton"
              label="&certmgr.add.label;"
              oncommand="addCerts();"/>
 -->
-      <button id="websites_deleteButton" class="normal" 
+      <button id="websites_deleteButton"
              label="&certmgr.delete.label;"
              disabled="true" oncommand="deleteCerts();"/>
    </hbox>
--- a/security/manager/pki/resources/content/cacertexists.xul
+++ b/security/manager/pki/resources/content/cacertexists.xul
@ -27,7 +27,6 @@

 <window id="cacertexists" 
  title="&caCertExists.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="setWindowName();">

@ -36,12 +35,12 @@


  <vbox flex="1">
-    <html>&caCertExists.message;</html>
+    <description>&caCertExists.message;</description>
    
    <separator/>

    <hbox align="center">
-      <button id="ok-button" class="dialog" label="&ok.label;"
+      <button id="ok-button" label="&ok.label;"
              oncommand="doOK();"/> 
    </hbox>
    
--- a/security/manager/pki/resources/content/certDump.xul
+++ b/security/manager/pki/resources/content/certDump.xul
@ -26,13 +26,12 @@
 <!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">

 <overlay id="certDumpOverlay" 
-         xmlns:html="http://www.w3.org/1999/xhtml" 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:cert="http://netscape.com/rdf-cert#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <vbox class="box-padded" id="certPrettyPrint" flex="1">
-  <text class="header" value="&certmgr.hierarchy.label;"/>
-  <tree class="inset" id="treesetDump" rows="4"
+  <label class="header" value="&certmgr.hierarchy.label;"/>
+  <tree id="treesetDump" rows="4"
        onselect="updateCertDump();">
    <treecolgroup>
      <treecol flex="1"/>
@ -45,7 +44,7 @@
    <splitter/>
    <outlinerbody flex="1" onselect="displaySelected();"/>
  </outliner>
-  <text class="header" value="&certmgr.fields.label;"/>
+  <label class="header" value="&certmgr.fields.label;"/>
  <textbox class="inset" id="certDumpVal"  multiline="true" rows="8"
           readonly="true" style="font-family: -moz-fixed;"/>
 </vbox>
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/security/manager/pki/resources/content/certManager.xul
@ -47,8 +47,8 @@
    <column flex="1"/>
    <rows>
      <row flex="1">
-        <tabbox flex="1" orient="vertical">
-          <tabs id="certMgrTabbox" orient="horizontal">
+        <tabbox flex="1">
+          <tabs id="certMgrTabbox">
            <tab id="mine_tab" label="&certmgr.tab.mine;"/>
            <tab id="others_tab" label="&certmgr.tab.others;"/>
            <tab id="websites_tab" label="&certmgr.tab.websites;"/>
@ -64,7 +64,7 @@
      </row>
      <row>
        <hbox flex="1">
-          <button id="HelpButton" class="normal" 
+          <button id="HelpButton"
                  label="&certmgr.help.label;" 
                  accesskey="&certmgr.helpButtonAccessKey;"
                  oncommand="doHelpButton();"/>
--- a/security/manager/pki/resources/content/certViewer.xul
+++ b/security/manager/pki/resources/content/certViewer.xul
@ -33,7 +33,6 @@

 <window id="certDetails" 
  title="&certmgr.certdetail.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="setWindowName();">

@ -48,10 +47,10 @@

  <grid flex="1">
    <column flex="1"/>
-    <rows autostretch="always">
+    <rows>
      <row flex="1">
-        <tabbox flex="1" orient="vertical">
-          <tabs orient="horizontal">
+        <tabbox flex="1">
+          <tabs>
            <tab id="general_tab" label="&certmgr.detail.general_tab.title;"/>
            <tab id="prettyprint_tab" label="&certmgr.detail.prettyprint_tab.title;"/>
          </tabs>
@ -66,11 +65,11 @@
      </row>
      <row>
        <hbox align="right" flex="1">
-          <button id="HelpButton" class="normal" 
+          <button id="HelpButton"
                  label="&certmgr.help.label;" 
                  accesskey="&certmgr.helpButtonAccessKey;"
                  oncommand="openHelp('chrome://help/content/help.xul?cert_details');"/>
-          <button id="closeButton" class="normal" 
+          <button id="closeButton"
                  label="&certmgr.close.label;" 
                  accesskey="&certmgr.closeWindowAccessKey;"
                  oncommand="window.close();"/>
--- a/security/manager/pki/resources/content/certpicker.xul
+++ b/security/manager/pki/resources/content/certpicker.xul
@ -44,7 +44,6 @@


 <window id="certPicker" title="&certPicker.defaultTitle;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  onload="onLoad();">

@ -58,8 +57,8 @@
 </keyset>

 <vbox style="margin: 5px;">
-    <groupbox orient="vertical">
-    <html id="pickerInfo" style="font-weight: bold;">&certPicker.defaultInfo;</html>
+    <groupbox>
+    <description id="pickerInfo" style="font-weight: bold;">&certPicker.defaultInfo;</description>
    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
    <!-- The items in this menulist must never be sorted,
         but remain in the order filled by the application
@ -67,15 +66,15 @@
    <menulist id="nicknames" observes="certSelected">
        <menupopup/>
    </menulist>
-    <html>&certPicker.detailsLabel;</html>
+    <label value="certPicker.detailsLabel;"/>
    <textbox readonly="true" id="details" multiline="true"
      style="height: 11em; width=80em;"/>
    </groupbox>
  <separator class="thin"/>
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;"
-          oncommand="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
          oncommand="doCancel();"/> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/security/manager/pki/resources/content/changepassword.xul
@ -27,7 +27,6 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">

 <window id="set_password" title="&setPassword.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  onload="onLoad();">

@ -39,8 +38,8 @@
 <vbox style="margin: 5px;" flex="1">

 <hbox align="center">
-  <text value="&setPassword.tokenName.label;: "/>
-  <text id="tokenName" />
+  <label value="&setPassword.tokenName.label;: "/>
+  <label id="tokenName" />
  <menulist id="tokenMenu" oncommand="onMenuChange()">
     <menupopup/>
  </menulist>
@ -57,7 +56,7 @@
 -->
 <separator/>

-<groupbox orient="vertical">
+<groupbox>
 <grid>
 <columns>
   <column/>
@ -65,7 +64,7 @@
 </columns>
 <rows>
   <row>
-     <text value="&setPassword.oldPassword.label;"/> 
+     <label value="&setPassword.oldPassword.label;"/> 
     <textbox id="oldpw" type="password"/>
     <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
          & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
@ -77,19 +76,19 @@
     <textbox id="message" disabled="true" />
   </row>
   <row>
-     <text value="&setPassword.newPassword.label;"/> 
+     <label value="&setPassword.newPassword.label;"/> 
     <textbox id="pw1" type="password" 
       onkeypress="setPasswordStrength(); checkPasswords();"/> 
   </row>
   <row>
-     <text value="&setPassword.reenterPassword.label;"/> 
+     <label value="&setPassword.reenterPassword.label;"/> 
     <textbox id="pw2" type="password" onkeypress="checkPasswords();"/>  
   </row>
 </rows>
 </grid>
 </groupbox>

-<groupbox orient="vertical">
+<groupbox>
 <caption label="&setPassword.meter.label;"/>
 <progressmeter id="pwmeter" mode="determined" 
                  value="0"/>
@ -104,11 +103,11 @@
 </keyset>

 <hbox>
-<button id="ok-button" class="dialog" label="&ok.label;"
+<button id="ok-button" label="&ok.label;"
        oncommand="setPassword();" disabled="true" default="true"/>
-<button id="cancel-button" class="dialog" label="&cancel.label;"
+<button id="cancel-button" label="&cancel.label;"
        oncommand="window.close();"/> 
-<button id="help-button" class="dialog" label="&help.label;"
+<button id="help-button" label="&help.label;"
        oncommand="openHelp('chrome://help/content/help.xul?change_pwd');"/> 
 </hbox>

--- a/security/manager/pki/resources/content/choosetoken.xul
+++ b/security/manager/pki/resources/content/choosetoken.xul
@ -30,7 +30,6 @@


 <window id="ssl_warning" title="&chooseToken.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  height="360"
  width="400"
@ -48,19 +47,19 @@
 </keyset>

 <vbox style="margin: 5px;" flex="1">
-    <groupbox orient="vertical">
-    <html>&chooseToken.message1;</html>
+    <groupbox>
+    <description>&chooseToken.message1;</description>
    <menulist id="tokens">
        <menupopup/>
    </menulist>
    </groupbox>
  <separator />
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;"
-          oncommand="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
          oncommand="doCancel();"/> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="help-button" label="&help.label;"
          oncommand="openHelp('chrome://help/content/help.xul?which_token');"/> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/security/manager/pki/resources/content/clientauthask.xul
@ -24,7 +24,6 @@


 <window id="ssl_warning" title="&clientAuthAsk.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  onload="onLoad();">

@ -40,14 +39,14 @@
 </keyset>

 <vbox style="margin: 5px;">
-    <groupbox orient="vertical">
-    <html style="font-weight: bold;">&clientAuthAsk.message1;</html>
-    <html id="hostname"/>
-    <html id="organization"/>
-    <html id="issuer"/>
+    <groupbox>
+    <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
+    <description id="hostname"/>
+    <description id="organization"/>
+    <description id="issuer"/>
    </groupbox>
-    <groupbox orient="vertical">
-    <html style="font-weight: bold;">&clientAuthAsk.message2;</html>
+    <groupbox>
+    <description style="font-weight: bold;">&clientAuthAsk.message2;</description>
    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
    <!-- The items in this menulist must never be sorted,
         but remain in the order filled by the application
@ -55,17 +54,17 @@
    <menulist id="nicknames" observes="certSelected">
        <menupopup/>
    </menulist>
-    <html>&clientAuthAsk.message3;</html>
+    <description>&clientAuthAsk.message3;</description>
    <textbox readonly="true" id="details" multiline="true"
      style="height: 11em; width=80em;"/>
    </groupbox>
  <separator/>
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;"
-          oncommand="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
          oncommand="doCancel();"/> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="help-button" label="&help.label;"
     style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?which_cert');" /> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/createCertInfo.xul
+++ b/security/manager/pki/resources/content/createCertInfo.xul
@ -17,9 +17,7 @@

 <window
  id="domainMismatch" title="&createCertInfo.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
  onload="onLoad();"
  onclose="onClose();"
 >
@ -28,11 +26,11 @@
 <script type="application/x-javascript" src="createCertInfo.js" />
 <script type="application/x-javascript" src="chrome://help/content/help.js" />

-<box orient="vertical" style="margin: 5px; max-width: 50em;">
+<vbox style="margin: 5px; max-width: 50em;">

-  <html>&createCertInfo.msg1;</html>
+  <description>&createCertInfo.msg1;</description>
  <separator/>
-  <html style="font-weight: bold; text-align: center; text-decoration: blink;">&createCertInfo.msg2;</html>
+  <description style="font-weight: bold; text-align: center; text-decoration: blink;">&createCertInfo.msg2;</description>
  <separator/>

 </box>
--- a/security/manager/pki/resources/content/crlManager.xul
+++ b/security/manager/pki/resources/content/crlManager.xul
@ -37,18 +37,16 @@
 <window id="crlviewer"
        class="dialog"
        title="&validation.crlmanager.label;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        style="width: 30em;"
-        orient="vertical"
        onload="onLoad();">

  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>

-  <text class="label" value="&validation.crlmanager.label;"/>
+  <description value="&validation.crlmanager.label;"/>
  <separator class="thin"/>
-  <tree id="crltree" class="inset" style="height: 10em;"
+  <tree id="crltree" style="height: 10em;"
   multiple="false" onclick="EnableCrlActions()" flex="1">
    <treecolgroup>
      <treecol flex="3" width="0"/>
@ -74,7 +72,7 @@
    <treechildren id="crlList" flex="1"/>
  </tree>
  <hbox>
-    <button id="deleteCrl" class="dialog push" disabled="true"
+    <button id="deleteCrl" disabled="true"
            label="&validation.deletecrl.label;"
            oncommand="DeleteCrlSelected();"/>
  </hbox>
--- a/security/manager/pki/resources/content/deletecert.xul
+++ b/security/manager/pki/resources/content/deletecert.xul
@ -27,7 +27,6 @@

 <window id="deleteCertificate" 
  title="&certmgr.deletecert.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="setWindowName();"
  style="width:8ex">
@ -44,18 +43,18 @@
  </keyset>

  <vbox flex="1">
-     <html id="confirm"/>
+     <description id="confirm"/>
     <separator />
     <vbox id="certlist" flex="100%"/>
-     <html id="impact"/>
+     <description id="impact"/>
     <separator />

    <hbox align="center">
-      <button id="ok-button" class="dialog" label="&certmgr.ok.label;"
+      <button id="ok-button" label="&certmgr.ok.label;"
              oncommand="doOK();"/> 
-      <button id="cancel-button" class="dialog" label="&certmgr.cancel.label;"
+      <button id="cancel-button" label="&certmgr.cancel.label;"
              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&certmgr.help.label;"
+      <button id="help-button" label="&certmgr.help.label;"
              oncommand="doHelp();"/> 
    </hbox>
  </vbox>
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@ -96,7 +96,7 @@
                oncommand="changePassword();" disabled="true"/> 
        <button id="load_button" 
                label="&devmgr.button.load.label;"
-                oncommand="doLoad();" disabled="false"/> 
+                oncommand="doLoad();"/> 
        <button id="unload_button" 
                label="&devmgr.button.unload.label;"
                oncommand="doUnload();" disabled="true"/> 
@ -109,11 +109,9 @@
      <hbox>
        <button id="help_button" 
                label="&help.label;" 
-                class="normal"
                oncommand="openHelp('chrome://help/content/help.xul?sec_devices');"/> 
        <button id="ok_button" 
                label="&ok.label;" 
-                class="normal" 
                oncommand="window.close();"/> 
      </hbox>
    </row>
--- a/security/manager/pki/resources/content/domainMismatch.xul
+++ b/security/manager/pki/resources/content/domainMismatch.xul
@ -21,9 +21,7 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">

 <window id="domainMismatch" title="&domainMismatch.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
  width="320"
  onload="onLoad();">

@ -41,12 +39,12 @@

 <vbox style="margin: 5px;" flex="1">

-  <html id="message1"/>
+  <description id="message1"/>
  <separator/>
-  <html id="message2" flex="100%"/>
+  <description id="message2" flex="100%"/>

  <hbox>
-  <button id="examineCert-button" class="dialog" label="&examineCert.label;"
+  <button id="examineCert-button" label="&examineCert.label;"
     oncommand="viewCert();"/> 
  </hbox>
  <separator/>
@ -58,11 +56,11 @@
  </keyset>
 
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;" primary="true"
-          oncommand="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
          oncommand="doCancel();"/> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="help-button" label="&help.label;"
          oncommand="openHelp('chrome://help/content/help.xul?bad_name_web_cert');"/> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/downloadcert.xul
+++ b/security/manager/pki/resources/content/downloadcert.xul
@ -26,7 +26,6 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">

 <window id="download_cert" title="&downloadCert.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  height="320"
  width="460"
@ -42,7 +41,7 @@

  <!--  Let 'em know what they're doing -->
  <vbox>
-    <html>&downloadCert.message1;</html>
+    <description>&downloadCert.message1;</description>
  </vbox>

  <separator/>
@ -54,12 +53,12 @@
     -  * trust for object signing
    -->
  <vbox>
-    <html id="message2"/>
-    <checkbox label="&downloadCert.trustSSL;" checked="false" 
+    <description id="message2"/>
+    <checkbox label="&downloadCert.trustSSL;"
              id="trustSSL"/>
-    <checkbox label="&downloadCert.trustEmail;" checked="false" 
+    <checkbox label="&downloadCert.trustEmail;"
              id="trustEmail"/>
-    <checkbox label="&downloadCert.trustObjSign;" checked="false" 
+    <checkbox label="&downloadCert.trustObjSign;"
              id="trustObjSign"/>
  </vbox>

@ -71,7 +70,7 @@
     -  <>  view policy
    -->
  <vbox>
-    <html>&downloadCert.message3;</html>
+    <description>&downloadCert.message3;</description>
    <separator/>
    <grid>
      <columns>
@ -80,10 +79,10 @@
      </columns>
      <rows>
        <row>
-          <button id="viewC-button" class="dialog" 
+          <button id="viewC-button"
                  label="&downloadCert.viewCert.label;"
                  oncommand="viewCert();"/> 
-          <html style="margin: 4px;">&downloadCert.viewCert.text;</html>
+          <description style="margin: 4px;">&downloadCert.viewCert.text;</description>
        </row>
      </rows>
    </grid>
@ -95,11 +94,11 @@
     -  <ok>  <cancel> <help>
    -->
  <hbox align="center">
-    <button id="ok-button" class="dialog" label="&ok.label;"
+    <button id="ok-button" label="&ok.label;"
            oncommand="doOK();"/> 
-    <button id="cancel-button" class="dialog" label="&cancel.label;"
+    <button id="cancel-button" label="&cancel.label;"
            oncommand="doCancel();"/> 
-    <button id="help-button" class="dialog" label="&help.label;"
+    <button id="help-button" label="&help.label;"
            oncommand="openHelp('chrome://help/content/help.xul?new_ca');"/> 
  </hbox>

--- a/security/manager/pki/resources/content/editcacert.xul
+++ b/security/manager/pki/resources/content/editcacert.xul
@ -28,7 +28,6 @@

 <window id="editCaCert" 
        title="&certmgr.editcacert.title;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="setWindowName();"
 >
@ -40,15 +39,15 @@


  <vbox flex="1">
-    <html id="certmsg"/>
+    <description id="certmsg"/>
    <separator />
-    <html flex="100%">&certmgr.editcert.edittrust;</html>
+    <description flex="100%">&certmgr.editcert.edittrust;</description>
    <vbox flex="100%">
-      <checkbox label="&certmgr.editcert.trustssl;" checked="false" 
+      <checkbox label="&certmgr.editcert.trustssl;"
                id="trustSSL"/>
-      <checkbox label="&certmgr.editcert.trustemail;" checked="false" 
+      <checkbox label="&certmgr.editcert.trustemail;"
                id="trustEmail"/>
-      <checkbox label="&certmgr.editcert.trustobjsign;" checked="false" 
+      <checkbox label="&certmgr.editcert.trustobjsign;"
                id="trustObjSign"/>
    </vbox>

@ -59,11 +58,11 @@
    </keyset>

    <hbox>
-      <button id="ok-button" class="dialog" label="&certmgr.ok.label;"
+      <button id="ok-button" label="&certmgr.ok.label;"
              oncommand="doOK();"/> 
-      <button id="cancel-button" class="dialog" label="&certmgr.cancel.label;"
+      <button id="cancel-button" label="&certmgr.cancel.label;"
              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&certmgr.help.label;"
+      <button id="help-button" label="&certmgr.help.label;"
              oncommand="openHelp('chrome://help/content/help.xul?edit_ca_certs');"/>
    </hbox>
  </vbox>
--- a/security/manager/pki/resources/content/editcerts.js
+++ b/security/manager/pki/resources/content/editcerts.js
@ -140,9 +140,9 @@ function doLoadForSSLCert()
  var notrustssl = document.getElementById("dontTrustSSLCert");
  if (certdb.getCertTrust(cert, nsIX509Cert.SERVER_CERT, 
                          nsIX509CertDB.TRUSTED_SSL)) {
-    trustssl.setAttribute("checked", "true");
+    trustssl.radioGroup.selectedItem = trustssl;
  } else {
-    notrustssl.setAttribute("checked", "true");
+    trustssl.radioGroup.selectedItem = notrustssl;
  }

  var xulWindow = document.getElementById("editWebsiteCert");
@ -159,8 +159,7 @@ function doSSLOK()
 {
  var ssl = document.getElementById("trustSSLCert");
  //var checked = ssl.getAttribute("value");
-  var checked = ssl.getAttribute("checked");
-  var trustssl = (checked == "true") ? nsIX509CertDB.TRUSTED_SSL : 0;
+  var trustssl = ssl.selected ? nsIX509CertDB.TRUSTED_SSL : 0;
  //
  //  Set the cert trust
  //
--- a/security/manager/pki/resources/content/editsslcert.xul
+++ b/security/manager/pki/resources/content/editsslcert.xul
@ -39,31 +39,31 @@


  <vbox flex="1">
-    <html id="certmsg"/>
-    <html id="issuer"/>
+    <description id="certmsg"/>
+    <description id="issuer"/>
    <separator/>
-    <html id="explainations"/>
+    <description id="explainations"/>
    <separator />
-    <html>&certmgr.editsslcert.edittrust;</html>
+    <description>&certmgr.editsslcert.edittrust;</description>
    <vbox>
-      <radiogroup id="sslTrustGroup" orient="vertical" flex="1">
+      <radiogroup id="sslTrustGroup" flex="1">
        <radio label="&certmgr.editsslcert.dotrust;"
-               id="trustSSLCert" group="sslTrustGroup"/>
+               id="trustSSLCert"/>
        <radio label="&certmgr.editsslcert.donttrust;"
-               id="dontTrustSSLCert" group="sslTrustGroup"/>
+               id="dontTrustSSLCert"/>
      </radiogroup>
    </vbox>
    <hbox>
-      <button id="editca-button" class="dialog" label="&certmgr.editca.label;"
+      <button id="editca-button" label="&certmgr.editca.label;"
            oncommand="editCaTrust();"/> 
    </hbox>

    <hbox> 
-      <button id="ok-button" class="dialog" label="&certmgr.ok.label;"
+      <button id="ok-button" label="&certmgr.ok.label;"
              oncommand="doSSLOK();"/> 
-      <button id="cancel-button" class="dialog" label="&certmgr.cancel.label;"
+      <button id="cancel-button" label="&certmgr.cancel.label;"
              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&certmgr.help.label;"
+      <button id="help-button" label="&certmgr.help.label;"
              oncommand="openHelp('chrome://help/content/help.xul?edit_web_certs');"/>
    </hbox>
  </vbox>
--- a/security/manager/pki/resources/content/escrowWarn.xul
+++ b/security/manager/pki/resources/content/escrowWarn.xul
@ -38,24 +38,24 @@

 <vbox style="margin: 5px;" flex="1">

-  <html>&escrowWarn.message1;</html>
+  <description>&escrowWarn.message1;</description>
  <separator/>
-  <html>&escrowWarn.benefit1;</html>
+  <description>&escrowWarn.benefit1;</description>
  <separator/>
-  <html>&escrowWarn.message2;</html>
+  <description>&escrowWarn.message2;</description>
  <separator/>
-  <html id="message1"/>
+  <description id="message1"/>
  <hbox>
-  <button id="examineCert-button" class="dialog" label="&examineCert.label;"
+  <button id="examineCert-button" label="&examineCert.label;"
          oncommand="viewCert();"/> 
  </hbox>
  <separator/>
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;"
-          oncommand="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
          oncommand="doCancel();"/> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="help-button" label="&help.label;"
          oncommand="openHelp('chrome://help/content/help.xul?priv_key_copy');"/> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/getp12password.xul
+++ b/security/manager/pki/resources/content/getp12password.xul
@ -28,7 +28,6 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">

 <window id="getp12password" title="&pkcs12.getpassword.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  height="200"
  width="300"
@ -44,24 +43,24 @@
  </keyset>

  <vbox style="margin: 5px;" flex="1">
-    <html>&pkcs12.getpassword.message;</html>
+    <description>&pkcs12.getpassword.message;</description>
    <separator />
    <grid>
      <columns> <column/> <column/> </columns>
      <rows>
        <row>
-          <text value="&getPassword.password.label;"/> 
+          <label value="&getPassword.password.label;"/> 
          <textbox id="pw1" type="password"/> 
        </row>
      </rows>
    </grid>
    <hbox>
-      <button id="ok-button" class="dialog" label="&ok.label;"
+      <button id="ok-button" label="&ok.label;"
              oncommand="getPassword();" 
              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
-      <button id="cancel-button" class="dialog" label="&cancel.label;"
+      <button id="cancel-button" label="&cancel.label;"
              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&help.label;"
+      <button id="help-button" label="&help.label;"
              oncommand="openHelp('chrome://help/content/help.xul?my_certs');"/> 
    </hbox>
  </vbox>
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@ -39,24 +39,22 @@
  <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>

  <vbox>
-    <html>&loaddevice.info;</html>
+    <description>&loaddevice.info;</description>
    <hbox>
-      <html>&loaddevice.modname;</html>
+      <label value="&loaddevice.modname;"/>
      <textbox id="device_name" flex="1" value="&loaddevice.modname.default;"/>
    </hbox>
    <hbox>
-      <html>&loaddevice.filename;</html>
+      <label value="&loaddevice.filename;"/>
      <textbox id="device_path" flex="1"/>
      <button label="&loaddevice.browse;" flex="1" oncommand="doBrowseFiles();"/>
    </hbox>
    <hbox>
      <button id="ok_button"
              label="&ok.label;" 
-              class="normal" 
              oncommand="doLoadDevice();"/> 
      <button id="cancel_button" 
              label="&cancel.label;" 
-              class="normal" 
              oncommand="window.close();"/> 
    </hbox>
  </vbox>
--- a/security/manager/pki/resources/content/newserver.xul
+++ b/security/manager/pki/resources/content/newserver.xul
@ -29,12 +29,10 @@
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <window id="ssl_warning" title="&newserver.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  style="width: 30em; height: 16em"
  class="dialog"
-  onload="onLoad();"
-  orient="vertical">
+  onload="onLoad();">

 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
@ -44,27 +42,27 @@
 <keyset id="dialogKeys"/>

 <vbox flex="1">
-  <hbox valign="top" autostretch="never">
+  <hbox valign="top" align="center">

    <image class="alert-icon" style="margin: 5px"/>
    <vbox flex="1" valign="middle">

-      <html id="message"/>
+      <description id="message"/>
      <separator class="thin"/>
-      <html id="notRecognized"/>
+      <description id="notRecognized"/>
      <separator/>

-      <vbox autostretch="never" flex="1" align="right">
+      <vbox flex="1" align="start">
        <button id="examineCert-button" label="&examineCert.label;"
                oncommand="viewCert();"/> 
      </vbox>

-      <checkbox checked="false" id="alwaysAccept" label="&alwaysAccept.label;"/>
+      <checkbox id="alwaysAccept" label="&alwaysAccept.label;"/>

    </vbox>
  </hbox>

-  <hbox id="okCancelHelpButtonsRight" flex="1" autostretch="never"/>
+  <hbox id="okCancelHelpButtonsRight" flex="1"/>
 </vbox>

 </window>
--- a/security/manager/pki/resources/content/pref-certs.xul
+++ b/security/manager/pki/resources/content/pref-certs.xul
@ -34,10 +34,8 @@
  %prefSslDTD;
 ]>

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

  <!-- List elements to manage for prefs -->
  <script type="application/x-javascript" src="chrome://pippki/content/pref-security.js"/>
@ -50,41 +48,39 @@
  <!-- Fancy panel header -->
  <hbox class="box-smallheader" title="&certs.label;"/>

-  <groupbox orient="vertical" autostretch="never">
+  <groupbox align="start">
    <caption label="&SSLClientAuthMethod;"/>
-    <html> &certselect.description; </html>
+    <description> &certselect.description; </description>
    <!-- Prefs -->
-    <radiogroup id="certSelection" orient="horizontal" pref="true" preftype="string" 
-	        prefstring="security.default_personal_cert" prefattribute="value">
-    <radio group="certSelection" label="&certselect.auto;" value="Select Automatically"/>
-    <radio group="certSelection" label="&certselect.ask;" value="Ask Every Time"/>
+    <radiogroup id="certSelection" orient="horizontal" preftype="string" 
+	        prefstring="security.default_personal_cert">
+    <radio label="&certselect.auto;" value="Select Automatically"/>
+    <radio label="&certselect.ask;" value="Ask Every Time"/>
    </radiogroup>
  </groupbox>

  <!-- Certificate manager -->
-  <groupbox orient="vertical">
+  <groupbox>
    <caption label="&managecerts.label;"/>
-    <html>&managecerts.text;</html>
-    <hbox autostretch="never">
-      <button class="dialog" label="&managecerts.button;" disabled="false"
+    <description>&managecerts.text;</description>
+    <hbox align="center">
+      <button label="&managecerts.button;"
              oncommand="openCertManager();" 
              id="openCertManagerButton"
-              pref="true" preftype="bool" prefattribute="disabled"
              prefstring="security.disable_button.openCertManager"/>
    </hbox>
  </groupbox>

  <!-- Device manager -->
-  <groupbox orient="vertical">
+  <groupbox>
    <caption label="&managedevices.label;"/>
-    <html>&managedevices.text;</html>
-    <hbox autostretch="never">
-      <button class="dialog" label="&managedevices.button;" disabled="false"
+    <description>&managedevices.text;</description>
+    <hbox align="center">
+      <button label="&managedevices.button;"
              oncommand="openDeviceManager();"
              id="openDeviceManagerButton"
-              pref="true" preftype="bool" prefattribute="disabled"
              prefstring="security.disable_button.openDeviceManager"/>
    </hbox>
  </groupbox>

-</window>
+</page>
--- a/security/manager/pki/resources/content/pref-ciphers.xul
+++ b/security/manager/pki/resources/content/pref-ciphers.xul
@ -29,7 +29,7 @@

 <window id="pref-ciphers" title="&cipher.title;"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();" orient="vertical">
+  onload="onLoad();">

  <script type="application/x-javascript"><![CDATA[
    var prefs = null;
@ -43,7 +43,7 @@
      prefs = Components.classes["@mozilla.org/preferences;1"].getService(nsIPref);

      // Enumerate each checkbox on this page and set value
-      var prefElements = document.getElementsByAttribute("pref", "true");
+      var prefElements = document.getElementsByAttribute("prefstring", "*");
      for (var i = 0; i < prefElements.length; i++) {
        var element = prefElements[i];
        var prefString = element.getAttribute("prefstring");
@ -65,7 +65,7 @@
     // Save the prefs
     try {
      // Enumerate each checkbox on this page and save the value
-      var prefElements = document.getElementsByAttribute("pref", "true");
+      var prefElements = document.getElementsByAttribute("prefstring", "true");
      for (var i = 0; i < prefElements.length; i++) {
        var element = prefElements[i];
        var prefString = element.getAttribute("prefstring");
@ -90,46 +90,46 @@

  <vbox style="overflow: hidden;" flex="1">

-  <groupbox orient="vertical" autostretch="never">
+  <groupbox align="start">
    <caption label="&cipher.ssl2.label;"/>

-    <checkbox label="&cipher.ssl2.rc4_128;" pref="true"
+    <checkbox label="&cipher.ssl2.rc4_128;"
              prefstring="security.ssl2.rc4_128"/>
-    <checkbox label="&cipher.ssl2.rc2_128;" pref="true"
+    <checkbox label="&cipher.ssl2.rc2_128;"
              prefstring="security.ssl2.rc2_128"/>
-    <checkbox label="&cipher.ssl2.des_ede3_192;" pref="true"
+    <checkbox label="&cipher.ssl2.des_ede3_192;"
              prefstring="security.ssl2.des_ede3_192"/>
-    <checkbox label="&cipher.ssl2.des_64;" pref="true"
+    <checkbox label="&cipher.ssl2.des_64;"
              prefstring="security.ssl2.des_64"/>
-    <checkbox label="&cipher.ssl2.rc4_40;" pref="true"
+    <checkbox label="&cipher.ssl2.rc4_40;"
              prefstring="security.ssl2.rc4_40"/>
-    <checkbox label="&cipher.ssl2.rc2_40;" pref="true"
+    <checkbox label="&cipher.ssl2.rc2_40;"
              prefstring="security.ssl2.rc2_40"/>

  </groupbox>

-  <groupbox orient="vertical" autostretch="never">
+  <groupbox align="start">
    <caption label="&cipher.ssl3.label;"/>

-    <checkbox label="&cipher.ssl3.rsa_rc4_128_md5;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_rc4_128_md5;"
              prefstring="security.ssl3.rsa_rc4_128_md5"/>
-    <checkbox label="&cipher.ssl3.rsa_fips_des_ede3_sha;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_fips_des_ede3_sha;"
              prefstring="security.ssl3.rsa_fips_des_ede3_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_des_ede3_sha;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_des_ede3_sha;"
              prefstring="security.ssl3.rsa_des_ede3_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_fips_des_sha;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_fips_des_sha;"
              prefstring="security.ssl3.rsa_fips_des_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_des_sha;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_des_sha;"
              prefstring="security.ssl3.rsa_des_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_1024_rc4_56_sha;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_1024_rc4_56_sha;"
              prefstring="security.ssl3.rsa_1024_rc4_56_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_1024_des_cbc_sha;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_1024_des_cbc_sha;"
              prefstring="security.ssl3.rsa_1024_des_cbc_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_rc4_40_md5;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_rc4_40_md5;"
              prefstring="security.ssl3.rsa_rc4_40_md5"/>
-    <checkbox label="&cipher.ssl3.rsa_rc2_40_md5;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_rc2_40_md5;"
              prefstring="security.ssl3.rsa_rc2_40_md5"/>
-    <checkbox label="&cipher.ssl3.rsa_null_md5;" pref="true"
+    <checkbox label="&cipher.ssl3.rsa_null_md5;"
              prefstring="security.ssl3.rsa_null_md5"/>
  </groupbox>

--- a/security/manager/pki/resources/content/pref-masterpass.xul
+++ b/security/manager/pki/resources/content/pref-masterpass.xul
@ -31,10 +31,8 @@
  %prefPass;
 ]>

-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical" title="certs.title;"
-        onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();">

  <script type="application/x-javascript" src="chrome://pippki/content/pref-masterpass.js"/>

@ -53,64 +51,60 @@
  <hbox class="box-smallheader" title="&lheader;"/>

  <!-- Change Password -->
-  <groupbox orient="vertical">
+  <groupbox>
    <caption label="&changepassword.label;"/>
-    <html>&changepassword.text;</html>
-    <hbox autostretch="never">
-      <button class="dialog" label="&changepassword.button;" disabled="false"
+    <description>&changepassword.text;</description>
+    <hbox align="center">
+      <button label="&changepassword.button;"
              oncommand="ChangePW();"
              id="changePasswordButton"
-              pref="true" preftype="bool" prefattribute="disabled"
              prefstring="security.disable_button.changePassword"/>
    </hbox>
  </groupbox>

  <!-- Password Prefs -->
-  <groupbox orient="vertical">
+  <groupbox>

    <checkbox id="askEveryTimeHidden"
-              pref="true" preftype="bool" prefstring="signon.expireMasterPassword"
-              prefattribute="checked" hidden="true"/>
+              prefstring="signon.expireMasterPassword"
+              hidden="true"/>

    <caption label="&managepassword.label;"/>
-    <html>&managepassword.text;</html>
-    <hbox autostretch="never">
-      <radiogroup id="passwordAskTimes" orient="vertical" 
-                  pref="true" preftype="int" 
-                  prefstring="security.ask_for_password" prefattribute="value"
+    <description>&managepassword.text;</description>
+    <hbox align="center">
+      <radiogroup id="passwordAskTimes"
+                  prefstring="security.ask_for_password"
                  flex="1">
        <!-- note that these values are different than what NSS uses, which
             are (0, -1, 1) respectively -->
-        <radio value="0" label="&managepassword.askfirsttime;" id="askFirstTime" group="passwordAskTimes" 
+        <radio value="0" label="&managepassword.askfirsttime;" id="askFirstTime"
               style="margin: 0px;" oncommand="changePasswordSettings();"/>
-        <radio value="1" label="&managepassword.askeverytime;" id="askEveryTime" group="passwordAskTimes"
+        <radio value="1" label="&managepassword.askeverytime;" id="askEveryTime"
               style="margin: 0px;" oncommand="changePasswordSettings();"/>
        <hbox align="center">
-          <radio value="2" label="&managepassword.asktimeout;" id="askTimeout" group="passwordAskTimes"
+          <radio value="2" label="&managepassword.asktimeout;" id="askTimeout"
                 style="margin: 0px;" oncommand="changePasswordSettings();"/>
          <textbox id="passwordTimeout" size="4"
-                   pref="true" preftype="int"
+                   preftype="int"
                   prefstring="security.password_lifetime"
-                   prefattribute="value"
                   oninput="changePasswordSettings();"/>
-          <text value="&managepassword.timeout.unit;" style="margin: 4px;"/>
+          <label value="&managepassword.timeout.unit;" style="margin: 4px;"/>
        </hbox>
      </radiogroup>
    </hbox>
  </groupbox>

  <!-- Reset Password -->
-  <groupbox orient="vertical">
+  <groupbox>
    <caption label="&resetpassword.label;"/>
-    <html>&resetpassword.text1;</html>
-    <html>&resetpassword.text2;</html>
-    <hbox autostretch="never">
-      <button class="dialog" label="&resetpassword.button;" disabled="false"
+    <description>&resetpassword.text1;</description>
+    <description>&resetpassword.text2;</description>
+    <hbox align="center">
+      <button label="&resetpassword.button;"
              oncommand="ResetPW();"
              id="resetPasswordButton"
-              pref="true" preftype="bool" prefattribute="disabled"
              prefstring="security.disable_button.resetPassword"/>
    </hbox>
  </groupbox>

-</window>
+</page>
--- a/security/manager/pki/resources/content/pref-ssl.xul
+++ b/security/manager/pki/resources/content/pref-ssl.xul
@ -32,10 +32,8 @@
  %prefSslDTD;
 ]>

-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical" title="Security Preferences"
-        onload="parent.initPanel('chrome://pippki/content/pref-ssl.xul');">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://pippki/content/pref-ssl.xul');">

  <!-- List elements to manage for prefs -->
  <script type="application/x-javascript">
@ -54,48 +52,40 @@
    <caption label="&SSLProtocolVersions;"/>

    <!-- Prefs -->
-    <vbox flex="1" autostretch="never" >
+    <vbox flex="1" align="start">
      <checkbox id="enableSSL2" label="&enable.ssl2;"
-                pref="true" preftype="bool" prefstring="security.enable_ssl2"
-                prefattribute="checked"/>
+                prefstring="security.enable_ssl2"/>
      <checkbox id="enableSSL3" label="&enable.ssl3;"
-                pref="true" preftype="bool" prefstring="security.enable_ssl3"
-                prefattribute="checked"/>
+                prefstring="security.enable_ssl3"/>
      <checkbox id="enableTLS" label="&enable.tls;"
-                pref="true" preftype="bool" prefstring="security.enable_tls"
-                prefattribute="checked"/>
+                prefstring="security.enable_tls"/>
    </vbox>

    <vbox halign="right">
-      <button class="dialog" label="&edit.sslciphers;"
+      <button label="&edit.sslciphers;"
              oncommand="window.openDialog('chrome://pippki/content/pref-ciphers.xul', '',
                             'modal=yes,resizable,chrome');"
              id="editSSLCiphersButton"
-              pref="true" preftype="bool" prefattribute="disabled"
              prefstring="security.disable_button.editSSLCiphers"/>
    </vbox>

  </groupbox>

-  <groupbox orient="vertical" autostretch="never">
+  <groupbox align="start">
    <caption label="&SSLWarnings;"/>
-    <html>&warn.description;</html>
+    <description>&warn.description;</description>
    <!-- Prefs -->
    <checkbox id="warnEnteringSecure" label="&warn.enteringsecure;"
-              pref="true" preftype="bool" prefstring="security.warn_entering_secure"
-              prefattribute="checked"/>
+              prefstring="security.warn_entering_secure"/>
    <checkbox id="warnEnteringWeak" label="&warn.enteringweak;"
-              pref="true" preftype="bool" prefstring="security.warn_entering_weak"
-              prefattribute="checked"/>
+              prefstring="security.warn_entering_weak"/>
    <checkbox id="warnLeavingSecure" label="&warn.leavingsecure;"
-              pref="true" preftype="bool" prefstring="security.warn_leaving_secure"
-              prefattribute="checked"/>
+              prefstring="security.warn_leaving_secure"/>
    <checkbox id="warnInsecurePost" label="&warn.insecurepost;"
-              pref="true" preftype="bool" prefstring="security.warn_submit_insecure"
-              prefattribute="checked"/>
+              prefstring="security.warn_submit_insecure"/>
    <checkbox id="warnViewMixed" label="&warn.viewmixed;"
-              pref="true" preftype="bool" prefstring="security.warn_viewing_mixed"
-              prefattribute="checked" checked="true"/>
+              prefstring="security.warn_viewing_mixed"
+              checked="true"/>
  </groupbox>

-</window>
+</page>
--- a/security/manager/pki/resources/content/pref-validation.xul
+++ b/security/manager/pki/resources/content/pref-validation.xul
@ -31,10 +31,8 @@
  %prefValidationDTD;
 ]>

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

  <!-- List elements to manage for prefs -->
  <script type="application/x-javascript">
@ -48,28 +46,26 @@
  <!-- Fancy panel header -->
  <hbox class="box-smallheader" title="&validation.title;"/>

-  <groupbox orient="vertical">
+  <groupbox>
    <caption label="&validation.crl.label;"/>
-    <html>&validation.crl.description;</html>
-    <hbox autostretch="never">
-      <button class="dialog" label="&validation.managecrls.button;"
+    <description>&validation.crl.description;</description>
+    <hbox align="center">
+      <button label="&validation.managecrls.button;"
              oncommand="openCrlManager();"
              id="managecrlbutton"
-              pref="true" preftype="bool" prefattribute="disabled"
              prefstring="security.OCSP.disable_button.managecrl"/>
    </hbox>
  </groupbox>

-  <groupbox orient="vertical" autostretch="never" >
+  <groupbox align="start">
    <caption label="&validation.ocsp.label;"/>
-    <html>&validation.ocsp.description;</html>
+    <description>&validation.ocsp.description;</description>
    <!-- Prefs -->
-    <radiogroup id="securityOCSPEnabled" orient="vertical" autostretch="never"
-                pref="true" preftype="int" prefstring="security.OCSP.enabled"
-                prefattribute="value">
-        <radio group="securityOCSPEnabled" value="0" label="&disableOCSP.label;" oncommand="doEnabling();"/>
-        <radio group="securityOCSPEnabled" value="1" label="&certOCSP.label;" oncommand="doEnabling();"/>
-        <radio group="securityOCSPEnabled" value="2" label="&proxyOCSP.label;" oncommand="doEnabling();"/>
+    <radiogroup id="securityOCSPEnabled"
+                prefstring="security.OCSP.enabled">
+        <radio value="0" label="&disableOCSP.label;" oncommand="doEnabling();"/>
+        <radio value="1" label="&certOCSP.label;" oncommand="doEnabling();"/>
+        <radio value="2" label="&proxyOCSP.label;" oncommand="doEnabling();"/>

        <grid class="indent" flex="1">
          <columns>
@ -79,19 +75,18 @@
          
          <rows>
            <row align="center">
-              <text class="label" value="&signingCA.label;" for="signingCA"/>
-              <menulist id="signingCA" pref="true" preftype="string" prefstring="security.OCSP.signingCA"
-                        prefattribute="value" flex="1" oncommand="changeURL()">
+              <label value="&signingCA.label;" control="signingCA"/>
+              <menulist id="signingCA" preftype="string" prefstring="security.OCSP.signingCA"
+                        flex="1" oncommand="changeURL()">
                <menupopup/>
              </menulist>
            </row>
            <row align="center">
-              <text class="label" value="&serviceURL.label;" for="serviceURL"/>
-              <textbox id="serviceURL" pref="true" preftype="string" prefstring="security.OCSP.URL"
-                       prefattribute="value" flex="1"/>
+              <label value="&serviceURL.label;" control="serviceURL"/>
+              <textbox id="serviceURL" prefstring="security.OCSP.URL"/>
            </row>
         </rows>
       </grid>
    </radiogroup>
  </groupbox>
-</window>
+</page>
--- a/security/manager/pki/resources/content/resetpassword.xul
+++ b/security/manager/pki/resources/content/resetpassword.xul
@ -25,7 +25,6 @@
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <window id="reset_password" title="&resetPassword.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  style="width: 40em;" onload="onLoad();">

@ -46,7 +45,7 @@
    <vbox style="margin: 5px;" flex="1">
      <hbox flex="1">
        <vbox flex="1">
-          <html>&resetPassword.text;</html>
+          <description>&resetPassword.text;</description>
        </vbox>
      </hbox>
      <separator class="thin"/>
--- a/security/manager/pki/resources/content/serverCertExpired.xul
+++ b/security/manager/pki/resources/content/serverCertExpired.xul
@ -21,7 +21,6 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">

 <window id="serverCertExpired"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  width="300"
  onload="onLoad();">
@ -39,23 +38,23 @@

 <vbox style="margin: 5px;" flex="100%">

-  <html id="message1" flex="100%"/>
+  <description id="message1" flex="100%"/>
  <separator/>
-  <html id="message2" flex="100%"/>
+  <description id="message2" flex="100%"/>
  <separator/>
-  <text value="&serverCertExpired.continue;" flex="100%"/>
+  <label value="&serverCertExpired.continue;" flex="100%"/>
  <separator/>
  <hbox>
-  <button id="examineCert-button" class="dialog" label="&examineCert.label;"
+  <button id="examineCert-button" label="&examineCert.label;"
          oncommand="viewCert();"/> 
  </hbox>
  <separator/>
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;" primary="true"
-          oncommand="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
          oncommand="doCancel();"/> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="help-button" label="&help.label;"
          oncommand="openHelp('chrome://help/content/help.xul?exp_web_cert');"/> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/serverCrlExpired.xul
+++ b/security/manager/pki/resources/content/serverCrlExpired.xul
@ -28,9 +28,7 @@
 <window
  id="serverCrlExpired"
  title="&serverCrlExpired.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
  style="width: 30em; height: 16em"
  onload="onLoad();"
 >
@ -47,7 +45,7 @@

 <vbox style="margin: 5px;" flex="100%">

-  <html> &serverCrlExpired.message1; </html>
+  <description> &serverCrlExpired.message1; </description>
  <separator/>
  <grid> 
      <columns>
@ -56,31 +54,31 @@
      </columns>
      <rows>
        <row>
-          <text class="label" value="&certmgr.certdetail.o;" /> 
-          <text id="organization"/>
+          <label value="&certmgr.certdetail.o;" /> 
+          <label id="organization"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.ou;" /> 
-          <text id="orgunit"/>
+          <label value="&certmgr.certdetail.ou;" /> 
+          <label id="orgunit"/>
        </row>
      </rows>
  </grid>
  <separator/>
-  <html> &serverCrlExpired.message2; </html>
+  <description> &serverCrlExpired.message2; </description>
  <separator/>
-  <html> &serverCrlExpired.continue; </html>
+  <description> &serverCrlExpired.continue; </description>
  <separator/>
  <hbox>
-  <button id="manageCrlCert-button" class="dialog" label="&serverCrlExpired.manageCrls.label;"
-     onclick="managerCrls();"/> 
+  <button id="manageCrlCert-button" label="&serverCrlExpired.manageCrls.label;"
+          oncommand="managerCrls();"/> 
  </hbox>
  <separator/>
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;" primary="true"
-     onclick="doOK();" disabled="false"/> 
-  <button id="cancel-button" class="dialog" label="&cancel.label;"
+  <button id="ok-button" label="&ok.label;"
+     onclick="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
     onclick="doCancel();" /> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="help-button" label="&help.label;"
    oncommand="openHelp('chrome://help/content/help.xul?exp_web_cert_crl');" /> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/serverCrlNextupdate.xul
+++ b/security/manager/pki/resources/content/serverCrlNextupdate.xul
@ -25,9 +25,7 @@

 <window
  id="serverCrlNextupdate"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
  style="width: 30em; height: 16em"
  onload="onLoad();"
 >
@ -43,16 +41,16 @@

 <vbox style="margin: 5px;" flex="100%">

-  <html id="message1" flex="100%"/>
+  <description id="message1" flex="100%"/>
  <separator/>
-  <html id="message2" flex="100%"/>
+  <description id="message2" flex="100%"/>
  <separator/>
-  <text value="&serverCrlNextupdate.message;" flex="100%"/>
+  <label value="&serverCrlNextupdate.message;" flex="100%"/>
  <separator/>
  <hbox>
-  <button id="ok-button" class="dialog" label="&ok.label;" primary="true"
-     onclick="doOK();" /> 
-  <button id="help-button" class="dialog" label="&help.label;"
+  <button id="ok-button" label="&ok.label;"
+     oncommand="doOK();" /> 
+  <button id="help-button" label="&help.label;"
    oncommand="openHelp('chrome://help/content/help.xul?exp_crl');" /> 
  </hbox>
 </vbox>
--- a/security/manager/pki/resources/content/setp12password.xul
+++ b/security/manager/pki/resources/content/setp12password.xul
@ -28,7 +28,6 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">

 <window id="setp12password" title="&pkcs12.setpassword.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  height="480"
  width="360"
@ -39,27 +38,27 @@


  <vbox style="margin: 5px;" flex="1">
-    <html>&pkcs12.setpassword.message;</html>
+    <description>&pkcs12.setpassword.message;</description>
    <separator />
    <grid>
      <columns> <column/> <column/> </columns>
      <rows>
        <row>
-          <text value="&pkcs12.setpassword.label1;"/> 
+          <label value="&pkcs12.setpassword.label1;"/> 
          <textbox id="pw1" type="password" 
                   onkeypress="setPasswordStrength(); checkPasswords();"/> 
        </row>
        <row>
-          <text value="&pkcs12.setpassword.label2;"/> 
+          <label value="&pkcs12.setpassword.label2;"/> 
          <textbox id="pw2" type="password" 
                   onkeypress="checkPasswords();"/>  
        </row>
      </rows>
    </grid>
    <separator/>
-    <html>&pkcs12.setpassword.reminder;</html>
+    <description>&pkcs12.setpassword.reminder;</description>
    <separator/>
-    <text value="&setPassword.meter.label;"/>
+    <label value="&setPassword.meter.label;"/>
    <grid style="margin: 4px;">
      <rows> <row/> </rows>
      <columns>
@ -76,11 +75,11 @@
      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
    </keyset>
    <hbox>
-      <button id="ok-button" class="dialog" label="&ok.label;"
+      <button id="ok-button" label="&ok.label;"
              oncommand="setP12Password();" disabled="true"/> 
-      <button id="cancel-button" class="dialog" label="&cancel.label;"
+      <button id="cancel-button" label="&cancel.label;"
              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&help.label;"
+      <button id="help-button" label="&help.label;"
              oncommand="openHelp('chrome://help/content/help.xul?cert_backup_pwd');"/> 
    </hbox>
  </vbox>
--- a/security/manager/pki/resources/content/viewCertDetails.xul
+++ b/security/manager/pki/resources/content/viewCertDetails.xul
@ -24,13 +24,12 @@
 <!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">

 <overlay id="certViewerOverlay" 
-         xmlns:html="http://www.w3.org/1999/xhtml" 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:cert="http://netscape.com/rdf-cert#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <vbox class="box-padded" id="general_info">
  <vbox id="verify_info_box">
-    <text class="header" id="verified"/>
+    <label class="header" id="verified"/>
  </vbox>
  <separator class="groove"/>
  <vbox flex="1">
@ -41,77 +40,77 @@
      </columns>
      <rows>
        <row>
-          <text class="header" value="&certmgr.subjectinfo.label;"/>
+          <label class="header" value="&certmgr.subjectinfo.label;"/>
          <spacer/>
          <spacer/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.cn;"/> 
-          <text id="commonname"/>
+          <label value="&certmgr.certdetail.cn;"/> 
+          <label id="commonname"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.o;"/> 
-          <text id="organization"/>
+          <label value="&certmgr.certdetail.o;"/> 
+          <label id="organization"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.ou;"/> 
-          <text id="orgunit"/>
+          <label value="&certmgr.certdetail.ou;"/> 
+          <label id="orgunit"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.serialnumber;"/> 
-          <text id="serialnumber"/>
+          <label value="&certmgr.certdetail.serialnumber;"/> 
+          <label id="serialnumber"/>
        </row>
        <row>
          <separator class="thin"/>
          <spacer/>
        </row>
        <row>
-          <text class="header" value="&certmgr.issuerinfo.label;"/>
+          <label class="header" value="&certmgr.issuerinfo.label;"/>
          <spacer/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.cn;"/> 
-          <text id="issuercommonname"/>
+          <label value="&certmgr.certdetail.cn;"/> 
+          <label id="issuercommonname"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.o;"/> 
-          <text id="issuerorganization"/>
+          <label value="&certmgr.certdetail.o;"/> 
+          <label id="issuerorganization"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.ou;"/> 
-          <text id="issuerorgunit"/>
+          <label value="&certmgr.certdetail.ou;"/> 
+          <label id="issuerorgunit"/>
        </row>
        <row>
          <separator class="thin"/>
          <spacer/>
        </row>
        <row>
-          <text class ="header" value="&certmgr.validity.label;"/>
+          <label class ="header" value="&certmgr.validity.label;"/>
          <spacer/>
        </row>
        <row>
-          <text class="label" value="&certmgr.issued;"/>
-          <text id="validitystart"/>
+          <label value="&certmgr.issued;"/>
+          <label id="validitystart"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.expires;"/>
-          <text id="validityend"/>
+          <label value="&certmgr.expires;"/>
+          <label id="validityend"/>
        </row>
        <row>
          <separator class="thin"/>
          <spacer/>
        </row>
        <row>
-          <text class="header" value="&certmgr.fingerprints.label;"/>
+          <label class="header" value="&certmgr.fingerprints.label;"/>
          <spacer/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.sha1fingerprint;"/> 
-          <text id="sha1fingerprint"/>
+          <label value="&certmgr.certdetail.sha1fingerprint;"/> 
+          <label id="sha1fingerprint"/>
        </row>
        <row>
-          <text class="label" value="&certmgr.certdetail.md5fingerprint;"/> 
-          <text id="md5fingerprint"/>
+          <label value="&certmgr.certdetail.md5fingerprint;"/> 
+          <label id="md5fingerprint"/>
        </row>
      </rows>
    </grid>