From 8a821da6c1dd6f40cdcfb5ae7527eef6dbc1b5b3 Mon Sep 17 00:00:00 2001
From: "brade%netscape.com"
 <brade%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 2 Mar 1999 15:26:37 +0000
Subject: [PATCH] add dtd; cleanup

git-svn-id: svn://10.0.0.236/trunk@22562 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/dialogs/removelinkdlog.xml |   8 +-
 mozilla/editor/dialogs/tablecelldlog.xml  |  94 ++++++++-------
 mozilla/editor/dialogs/tabletabledlog.xml | 132 ++++++++++++----------
 mozilla/editor/dialogs/targetdlog.xml     |   6 +-
 4 files changed, 136 insertions(+), 104 deletions(-)

diff --git a/mozilla/editor/dialogs/removelinkdlog.xml b/mozilla/editor/dialogs/removelinkdlog.xml
index 9375741f891..22132fed06e 100644
--- a/mozilla/editor/dialogs/removelinkdlog.xml
+++ b/mozilla/editor/dialogs/removelinkdlog.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "removelinkdlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
-  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing=20>
+  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing="20">
     <tr>
       <td>
         image
       </td>
 
       <td>
-        <xul:label>The selected text contains one or more links.</xul:label>
+        <p>The selected text contains one or more links.</p>
         <br/>
-        <xul:label>Removing all text styles will also erase the links.</xul:label>
+        <p>Removing all text styles will also erase the links.</p>
         <p/>
       </td>
     </tr>
diff --git a/mozilla/editor/dialogs/tablecelldlog.xml b/mozilla/editor/dialogs/tablecelldlog.xml
index 7cb3bc1f9ef..34623140096 100644
--- a/mozilla/editor/dialogs/tablecelldlog.xml
+++ b/mozilla/editor/dialogs/tablecelldlog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "tablecelldlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
   <table xmlns="http://www.w3.org/TR/REC-html40">
     <tr>
-      <td width=500>
+      <td width="500">
         <fieldset><legend> Selection </legend>
           <select size="1" name="tablecell.selection">
             <optgroup label="selection">
@@ -16,16 +16,18 @@
               <option label="Mixed" value="Mixed">Mixed (?)</option>
             </optgroup>
           </select>
-          <input type="button" class=genericbutton value=" Previous " />
-          <input type="button" class=genericbutton value=" Next " />
+          <input type="button" class="genericbutton" value=" Previous " />
+          <input type="button" class="genericbutton" value=" Next " />
         </fieldset>
 
         <fieldset><legend> Cell Size </legend>
           <table>
             <tr>
               <td>
-                <xul:checkbox value="Width:" />
-                <xul:label>Width:</xul:label>
+                <p>
+                  <xul:checkbox value="Width:" />
+                  Width:
+                </p>
               </td>
               <td>
                 <input type="text" size="4" length="4" maxlength="4" name="cell.width" />
@@ -38,18 +40,22 @@
               </td>
               <td width="20px"/>
               <td>
-                <xul:label>Spans:</xul:label>
+                <p>Spans:</p>
               </td>
               <td>
-                <input type="text" size="4" length="4" maxlength="4" name="table.spannumrows" />
-                <xul:label>rows</xul:label>
+                <p>
+                  <input type="text" size="4" length="4" maxlength="4" name="table.spannumrows" />
+                  rows
+                </p>
               </td>
             </tr>
 
             <tr>
               <td>
-                <xul:checkbox value="Height:" />
-                <xul:label>Height:</xul:label>
+                <p>
+                  <xul:checkbox value="Height:" />
+                  Height:
+                </p>
               </td>
               <td>
                 <input type="text" size="4" length="4" maxlength="4" name="cell.height" />
@@ -63,22 +69,24 @@
               <td width="20px"/>
               <td/>
               <td>
-                <input type="text" size="4" length="4" maxlength="4" name="table.spannumcols" />
-                <xul:label>columns</xul:label>
+                <p>
+                  <input type="text" size="4" length="4" maxlength="4" name="table.spannumcols" />
+                  columns
+                </p>
               </td>
             </tr>
           </table>
         </fieldset>
 
-        <table cellspacing=0 cellpadding=0 width="100%">
+        <table cellspacing="0" cellpadding="0" width="100%">
           <tr>
-            <td width="60%" valign=top>
+            <td width="60%" valign="top">
 
               <fieldset><legend> Content Alignment </legend>
-                <table cellspacing=0 cellpadding=2>
+                <table cellspacing="0" cellpadding="2">
                   <tr>
-                    <td valign=middle align=right>
-                      <xul:label>Horizontal</xul:label>
+                    <td valign="middle" align="right">
+                      <p>Horizontal</p>
                     </td>
                     <td>
                       <select size="1" name="cell.horizontalalignment">
@@ -92,8 +100,8 @@
                   </tr>
 
                   <tr>
-                    <td valign=middle align=right>
-                      <xul:label>Vertical</xul:label>
+                    <td valign="middle" align="right">
+                      <p>Vertical</p>
                     </td>
                     <td>
                       <select size="1" name="cell.verticalalignment">
@@ -111,7 +119,7 @@
 
             </td>
 
-            <td width="40%" align=right>
+            <td width="40%" align="right">
               <table>
                 <tr>
                   <td>
@@ -119,13 +127,17 @@
                       <table>
                         <tr>
                           <td>
-                            <xul:checkbox value="Header" />
-                            <xul:label> Header </xul:label>
+                            <p>
+                              <xul:checkbox value="Header" />
+                              Header
+                            </p>
                           </td>
-                          <td width=20 />
+                          <td width="20" />
                           <td>
-                            <xul:checkbox value="Nonbreaking" />
-                            <xul:label> Nonbreaking </xul:label>
+                            <p>
+                              <xul:checkbox value="Nonbreaking" />
+                              Nonbreaking
+                            </p>
                           </td>
                         </tr>
                       </table>
@@ -134,9 +146,9 @@
                 </tr>
 
                 <tr>
-                  <td align=right>
+                  <td align="right">
                     <p/>
-                    <input type="button" class=genericbutton value=" Extra HTML... " disabled />
+                    <input type="button" class="genericbutton" value=" Extra HTML... " disabled />
                   </td>
                 </tr>
               </table>
@@ -146,21 +158,23 @@
         </table>
 
         <fieldset><legend> Cell Background </legend>
-          <table cellspacing=0 cellpadding=2 width="100%">
+          <table cellspacing="0" cellpadding="2" width="100%">
             <tr>
-              <td valign=middle>
-                <xul:checkbox value="Color:" />
-                <xul:label>Color:</xul:label>
+              <td valign="middle">
+                <p>
+                  <xul:checkbox value="Color:" />
+                  Color:
+                </p>
               </td>
-              <td valign=middle>
-                <xul:label>[Color Picker Here]</xul:label>
+              <td valign="middle">
+                <p>[Color Picker Here]</p>
               </td>
             </tr>
 
-            <tr valign=middle>
+            <tr valign="middle">
               <td>
                 <xul:checkbox value="Image:" />
-                <xul:label>Image:</xul:label>
+                <p>Image:</p>
               </td>
               <td>
                 <input type="file" value=" Choose Image... " size="50" length="50" maxlength="255" name="table.imageurl" />
@@ -169,9 +183,11 @@
 
             <tr>
               <td/>
-              <td valign=middle>
-                <xul:checkbox value="Leave image at the original location" />
-                <xul:label>Leave image at the original location</xul:label>
+              <td valign="middle">
+                <p>
+                  <xul:checkbox value="Leave image at the original location" />
+                  Leave image at the original location
+                </p>
               </td>
             </tr>
           </table>
diff --git a/mozilla/editor/dialogs/tabletabledlog.xml b/mozilla/editor/dialogs/tabletabledlog.xml
index 1ea88dbd198..434fd477151 100644
--- a/mozilla/editor/dialogs/tabletabledlog.xml
+++ b/mozilla/editor/dialogs/tabletabledlog.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "tabletabledlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
   <table xmlns="http://www.w3.org/TR/REC-html40">
     <tr>
-      <td width=500>
+      <td width="500">
         <fieldset><legend> Table Size </legend>
           <table>
             <tr>
               <td>
-                <xul:label>Rows:</xul:label>
+                <p>Rows:</p>
               </td>
               <td>
                 <input type="text" size="4" length="4" maxlength="4" name="table.numrows" />
               </td>
               <td width="30px"/>
               <td>
-                <xul:checkbox value="Height:" />
-                <xul:label>Height:</xul:label>
+                <p>
+                  <xul:checkbox value="Height:" />
+                  Height:
+                </p>
               </td>
               <td>
                 <input type="text" size="4" length="4" maxlength="4" name="table.rowheight" />
@@ -34,15 +36,17 @@
 
             <tr>
               <td>
-                <xul:label>Columns:</xul:label>
+                <p>Columns:</p>
               </td>
               <td>
                 <input type="text" size="4" length="4" maxlength="4" name="table.numrows" />
               </td>
               <td width="30px"/>
               <td>
-                <xul:checkbox value="Width:" />
-                <xul:label>Width:</xul:label>
+                <p>
+                  <xul:checkbox value="Width:" />
+                  Width:
+                </p>
               </td>
               <td>
                 <input type="text" size="4" length="4" maxlength="4" name="table.colwidth" />
@@ -57,46 +61,48 @@
           </table>
         </fieldset>
 
-        <table cellspacing=0 cellpadding=0 width="100%">
+        <table cellspacing="0" cellpadding="0" width="100%">
           <tr>
-            <td width="60%" valign=top>
+            <td width="60%" valign="top">
 
               <fieldset><legend> Borders and Spacing </legend>
-                <table cellspacing=0 cellpadding=2>
+                <table cellspacing="0" cellpadding="2">
                   <tr>
-                    <td valign=middle align=right>
-                      <xul:checkbox value="Border Width:" />
-                      <xul:label>Border Width:</xul:label>
+                    <td valign="middle" align="right">
+                      <p>
+                        <xul:checkbox value="Border Width:" />
+                        Border Width:
+                      </p>
                     </td>
-                    <td valign=middle>
+                    <td valign="middle">
                       <input type="text" size="4" length="4" maxlength="4" name="table.borderwidth" />
                     </td>
-                    <td valign=middle>
-                      <xul:label> pixels </xul:label>
+                    <td valign="middle">
+                      <p>pixels</p>
                     </td>
                   </tr>
 
                   <tr>
-                    <td valign=middle align=right>
-                      <xul:label>Spacing:</xul:label>
+                    <td valign="middle" align="right">
+                      <p>Spacing:</p>
                     </td>
-                    <td valign=middle>
+                    <td valign="middle">
                       <input type="text" size="4" length="4" maxlength="4" name="table.cellspacing" />
                     </td>
-                    <td valign=middle>
-                      <xul:label> pixels between cells </xul:label>
+                    <td valign="middle">
+                      <p>pixels between cells</p>
                     </td>
                   </tr>
 
                   <tr>
-                    <td valign=middle align=right>
-                      <xul:label>Padding:</xul:label>
+                    <td valign="middle" align="right">
+                      <p>Padding:</p>
                     </td>
-                    <td valign=middle>
+                    <td valign="middle">
                       <input type="text" size="4" length="4" maxlength="4" name="table.cellpadding" />
                     </td>
-                    <td valign=middle>
-                      <xul:label> pixels between border and cell contents </xul:label>
+                    <td valign="middle">
+                      <p>pixels between border and cell contents</p>
                     </td>
                   </tr>
                 </table>
@@ -104,51 +110,59 @@
 
             </td>
 
-            <td width="40%" align=right>
+            <td width="40%" align="right">
               <p/>&nbsp;
               <p/>
-              <xul:label> Table Alignment </xul:label>
-              <select size="1" name="table.alignType">
-                <optgroup label="alignment">
-                  <option label="left alignment" value="left alignment">left alignment</option>
-                  <option label="center alignment" value="center alignment">center alignment</option>
-                  <option label="right alignment" value="right alignment">right alignment</option>
-                </optgroup>
-              </select>
+              <p>
+                Table Alignment
+                <select size="1" name="table.alignType">
+                  <optgroup label="alignment">
+                    <option label="left alignment" value="left alignment">left alignment</option>
+                    <option label="center alignment" value="center alignment">center alignment</option>
+                    <option label="right alignment" value="right alignment">right alignment</option>
+                  </optgroup>
+                </select>
+              </p>
 
               <p/>&nbsp;
               <p/>
-              <xul:label> Caption </xul:label>
-              <select size="1" name="table.caption">
-                <optgroup label="caption">
-                  <option label="None" value="None">None</option>
-                  <option label="Above Table" value="Above Table">Above Table</option>
-                  <option label="Below Table" value="Below Table">Below Table</option>
-                </optgroup>
-              </select>
+              <p>
+                Caption
+                <select size="1" name="table.caption">
+                  <optgroup label="caption">
+                    <option label="None" value="None">None</option>
+                    <option label="Above Table" value="Above Table">Above Table</option>
+                    <option label="Below Table" value="Below Table">Below Table</option>
+                  </optgroup>
+                </select>
+              </p>
 
               <p/>
-              <input type="button" class=genericbutton value=" Extra HTML... " style="align:right" disabled />
+              <input type="button" class="genericbutton" value=" Extra HTML... " style="align:right" disabled />
             </td>
           </tr>
         </table>
 
-        <fieldset><legend> Background </legend>
-          <table cellspacing=0 cellpadding=2 width="100%">
+        <fieldset><legend> Table Background </legend>
+          <table cellspacing="0" cellpadding="2" width="100%">
             <tr>
-              <td valign=middle>
-                <xul:checkbox value="Color:" />
-                <xul:label>Color:</xul:label>
+              <td valign="middle">
+                <p>
+                  <xul:checkbox value="Color:" />
+                  Color:
+                </p>
               </td>
-              <td valign=middle>
-                <xul:label>[Color Picker Here]</xul:label>
+              <td valign="middle">
+                <p>[Color Picker Here]</p>
               </td>
             </tr>
 
-            <tr valign=middle>
+            <tr valign="middle">
               <td>
-                <xul:checkbox value="Image:" />
-                <xul:label>Image:</xul:label>
+                <p>
+                  <xul:checkbox value="Image:" />
+                  Image:
+                </p>
               </td>
               <td>
                 <input type="file" value=" Choose Image... " size="50" length="50" maxlength="255" name="table.imageurl" />
@@ -157,9 +171,11 @@
 
             <tr>
               <td/>
-              <td valign=middle>
-                <xul:checkbox value="Leave image at the original location" />
-                <xul:label>Leave image at the original location</xul:label>
+              <td valign="middle">
+                <p>
+                  <xul:checkbox value="Leave image at the original location" />
+                  Leave image at the original location
+                </p>
               </td>
             </tr>
           </table>
diff --git a/mozilla/editor/dialogs/targetdlog.xml b/mozilla/editor/dialogs/targetdlog.xml
index 4afaa44c05f..5f98a1d12c7 100644
--- a/mozilla/editor/dialogs/targetdlog.xml
+++ b/mozilla/editor/dialogs/targetdlog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "targetdlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
-  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing=20>
+  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing="20">
     <tr>
       <td>
-        <xul:label>Target Name:</xul:label>
+        <p>Target Name:</p>
         <p/>
         <input type="text" size="40" length="40" maxlength="40" />
         <select size="1" name="targets.previous">