Bug 1581754 - remove grid usage from EdInsertTOC.xul. r=mkmelin
authorKhushil Mistry <khushil324@gmail.com>
Thu, 19 Sep 2019 06:03:00 +0200
changeset 79036 59ea04a195f685bbdd2debd7fbfc87bad5279d95
parent 79035 9e20734574747e92ddb54e634fa3c3c83cdfa4d3
child 79037 52379a32c6754833aa924c3d9b77841742263387
push id9342
push userkaie@kuix.de
push dateThu, 19 Sep 2019 21:31:29 +0000
treeherdertry-comm-central@514cb59d06af [default view] [failures only]
reviewersmkmelin
bugs1581754
Bug 1581754 - remove grid usage from EdInsertTOC.xul. r=mkmelin
mail/components/compose/content/dialogs/EdInsertTOC.xul
--- a/mail/components/compose/content/dialogs/EdInsertTOC.xul
+++ b/mail/components/compose/content/dialogs/EdInsertTOC.xul
@@ -20,202 +20,218 @@
 
   <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <script src="chrome://messenger/content/messengercompose/EdInsertTOC.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <spacer id="dummy" style="display:none"/>
   <vbox flex="1">
     <groupbox>
-    <hbox class="groupbox-title">
-      <label class="header">&buildToc.label;</label>
-    </hbox>
-      <grid>
-        <columns><column/><column style="min-width: 6em"/><column/></columns>
-        <rows>
-          <row align="center">
-            <spacer/>
-            <label value="&tag.label;"/>
-            <label value="&class.label;"/>
-          </row>
-          <row align="center">
-            <label value="&header1.label;"/>
+      <hbox class="groupbox-title">
+        <label class="header">&buildToc.label;</label>
+      </hbox>
+      <html:table>
+        <html:tr>
+          <html:th></html:th>
+          <html:th>&tag.label;</html:th>
+          <html:th>&class.label;</html:th>
+        </html:tr>
+        <html:tr>
+          <html:th>&header1.label;</html:th>
+          <html:td>
             <menulist id="header1Menulist">
               <menupopup>
                 <menuitem id="header1none" label="--" value=""
                           oncommand="selectHeader(this, 1)"/>
                 <menuseparator/>
-                <menuitem id="header1H1"  label="h1"  value="h1"
+                <menuitem id="header1H1" label="h1" value="h1"
                           oncommand="selectHeader(this, 1)"/>
-                <menuitem id="header1H2"  label="h2"  value="h2"
+                <menuitem id="header1H2" label="h2" value="h2"
                           oncommand="selectHeader(this, 1)"/>
-                <menuitem id="header1H3"  label="h3"  value="h3"
+                <menuitem id="header1H3" label="h3" value="h3"
                           oncommand="selectHeader(this, 1)"/>
-                <menuitem id="header1H4"  label="h4"  value="h4"
+                <menuitem id="header1H4" label="h4" value="h4"
                           oncommand="selectHeader(this, 1)"/>
-                <menuitem id="header1H5"  label="h5"  value="h5"
+                <menuitem id="header1H5" label="h5" value="h5"
                           oncommand="selectHeader(this, 1)"/>
-                <menuitem id="header1H6"  label="h6"  value="h6"
+                <menuitem id="header1H6" label="h6" value="h6"
                           oncommand="selectHeader(this, 1)"/>
                 <menuitem id="header1DIV" label="div" value="div"
                           oncommand="selectHeader(this, 1)"/>
-                <menuitem id="header1P"   label="p"   value="p"
+                <menuitem id="header1P" label="p" value="p"
                           oncommand="selectHeader(this, 1)"/>
               </menupopup>
             </menulist>
+          </html:td>
+          <html:td>
             <textbox id="header1Class" size="10"
                      oninput="changeClass(this, 1)"/>
-          </row>
-
-          <row align="center">
-            <label value="&header2.label;"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:th>&header2.label;</html:th>
+          <html:td>
             <menulist id="header2Menulist">
               <menupopup>
                 <menuitem id="header2none" label="--" value=""
                           oncommand="selectHeader(this, 2)"/>
                 <menuseparator/>
-                <menuitem id="header2H1"  label="h1"  value="h1"
+                <menuitem id="header2H1" label="h1" value="h1"
                           oncommand="selectHeader(this, 2)"/>
-                <menuitem id="header2H2"  label="h2"  value="h2"
+                <menuitem id="header2H2" label="h2" value="h2"
                           oncommand="selectHeader(this, 2)"/>
-                <menuitem id="header2H3"  label="h3"  value="h3"
+                <menuitem id="header2H3" label="h3" value="h3"
                           oncommand="selectHeader(this, 2)"/>
-                <menuitem id="header2H4"  label="h4"  value="h4"
+                <menuitem id="header2H4" label="h4" value="h4"
                           oncommand="selectHeader(this, 2)"/>
-                <menuitem id="header2H5"  label="h5"  value="h5"
+                <menuitem id="header2H5" label="h5" value="h5"
                           oncommand="selectHeader(this, 2)"/>
-                <menuitem id="header2H6"  label="h6"  value="h6"
+                <menuitem id="header2H6" label="h6" value="h6"
                           oncommand="selectHeader(this, 2)"/>
                 <menuitem id="header2DIV" label="div" value="div"
                           oncommand="selectHeader(this, 2)"/>
-                <menuitem id="header2P"   label="p"   value="p"
+                <menuitem id="header2P" label="p" value="p"
                           oncommand="selectHeader(this, 2)"/>
               </menupopup>
             </menulist>
+          </html:td>
+          <html:td>
             <textbox id="header2Class" size="10"
                      oninput="changeClass(this, 2)"/>
-          </row>
-
-          <row align="center">
-            <label value="&header3.label;"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:th>&header3.label;</html:th>
+          <html:td>
             <menulist id="header3Menulist">
               <menupopup>
                 <menuitem id="header3none" label="--" value=""
                           oncommand="selectHeader(this, 3)"/>
                 <menuseparator/>
-                <menuitem id="header3H1"  label="h1"  value="h1"
+                <menuitem id="header3H1" label="h1" value="h1"
+                        oncommand="selectHeader(this, 3)"/>
+                <menuitem id="header3H2" label="h2" value="h2"
                           oncommand="selectHeader(this, 3)"/>
-                <menuitem id="header3H2"  label="h2"  value="h2"
-                          oncommand="selectHeader(this, 3)"/>
-                <menuitem id="header3H3"  label="h3"  value="h3"
+                <menuitem id="header3H3" label="h3" value="h3"
                           oncommand="selectHeader(this, 3)"/>
-                <menuitem id="header3H4"  label="h4"  value="h4"
+                <menuitem id="header3H4" label="h4" value="h4"
                           oncommand="selectHeader(this, 3)"/>
-                <menuitem id="header3H5"  label="h5"  value="h5"
+                <menuitem id="header3H5" label="h5" value="h5"
                           oncommand="selectHeader(this, 3)"/>
-                <menuitem id="header3H6"  label="h6"  value="h6"
+                <menuitem id="header3H6" label="h6" value="h6"
                           oncommand="selectHeader(this, 3)"/>
                 <menuitem id="header3DIV" label="div" value="div"
                           oncommand="selectHeader(this, 3)"/>
-                <menuitem id="header3P"   label="p"   value="p"
+                <menuitem id="header3P" label="p" value="p"
                           oncommand="selectHeader(this, 3)"/>
               </menupopup>
             </menulist>
+          </html:td>
+          <html:td>
             <textbox id="header3Class" size="10"
                      oninput="changeClass(this, 3)"/>
-          </row>
-
-          <row align="center">
-            <label value="&header4.label;"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:th>&header4.label;</html:th>
+          <html:td>
             <menulist id="header4Menulist">
               <menupopup>
                 <menuitem id="header4none" label="--" value=""
                           oncommand="selectHeader(this, 4)"/>
                 <menuseparator/>
-                <menuitem id="header4H1"  label="h1"  value="h1"
+                <menuitem id="header4H1" label="h1" value="h1"
                           oncommand="selectHeader(this, 4)"/>
-                <menuitem id="header4H2"  label="h2"  value="h2"
+                <menuitem id="header4H2" label="h2" value="h2"
                           oncommand="selectHeader(this, 4)"/>
-                <menuitem id="header4H3"  label="h3"  value="h3"
+                <menuitem id="header4H3" label="h3" value="h3"
                           oncommand="selectHeader(this, 4)"/>
-                <menuitem id="header4H4"  label="h4"  value="h4"
+                <menuitem id="header4H4" label="h4" value="h4"
                           oncommand="selectHeader(this, 4)"/>
-                <menuitem id="header4H5"  label="h5"  value="h5"
+                <menuitem id="header4H5" label="h5" value="h5"
                           oncommand="selectHeader(this, 4)"/>
-                <menuitem id="header4H6"  label="h6"  value="h6"
+                <menuitem id="header4H6" label="h6" value="h6"
                           oncommand="selectHeader(this, 4)"/>
                 <menuitem id="header4DIV" label="div" value="div"
                           oncommand="selectHeader(this, 4)"/>
-                <menuitem id="header4P"   label="p"   value="p"
+                <menuitem id="header4P" label="p" value="p"
                           oncommand="selectHeader(this, 4)"/>
               </menupopup>
             </menulist>
+          </html:td>
+          <html:td>
             <textbox id="header4Class" size="10"
                      oninput="changeClass(this, 4)"/>
-          </row>
-
-          <row align="center">
-            <label value="&header5.label;"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:th>&header5.label;</html:th>
+          <html:td>
             <menulist id="header5Menulist">
               <menupopup>
                 <menuitem id="header5none" label="--" value=""
                           oncommand="selectHeader(this, 5)"/>
                 <menuseparator/>
-                <menuitem id="header5H1"  label="h1"  value="h1"
+                <menuitem id="header5H1" label="h1" value="h1"
                           oncommand="selectHeader(this, 5)"/>
-                <menuitem id="header5H2"  label="h2"  value="h2"
+                <menuitem id="header5H2" label="h2" value="h2"
                           oncommand="selectHeader(this, 5)"/>
-                <menuitem id="header5H3"  label="h3"  value="h3"
+                <menuitem id="header5H3" label="h3" value="h3"
                           oncommand="selectHeader(this, 5)"/>
-                <menuitem id="header5H4"  label="h4"  value="h4"
+                <menuitem id="header5H4" label="h4" value="h4"
                           oncommand="selectHeader(this, 5)"/>
-                <menuitem id="header5H5"  label="h5"  value="h5"
+                <menuitem id="header5H5" label="h5" value="h5"
                           oncommand="selectHeader(this, 5)"/>
-                <menuitem id="header5H6"  label="h6"  value="h6"
+                <menuitem id="header5H6" label="h6" value="h6"
                           oncommand="selectHeader(this, 5)"/>
                 <menuitem id="header5DIV" label="div" value="div"
                           oncommand="selectHeader(this, 5)"/>
-                <menuitem id="header5P"   label="p"   value="p"
+                <menuitem id="header5P" label="p" value="p"
                           oncommand="selectHeader(this, 5)"/>
               </menupopup>
             </menulist>
+          </html:td>
+          <html:td>
             <textbox id="header5Class" size="10"
                      oninput="changeClass(this, 5)"/>
-          </row>
-
-          <row align="center">
-            <label value="&header6.label;"/>
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:th>&header6.label;</html:th>
+          <html:td>
             <menulist id="header6Menulist">
               <menupopup>
                 <menuitem id="header6none" label="--" value=""
                           oncommand="selectHeader(this, 6)"/>
                 <menuseparator/>
-                <menuitem id="header6H1"  label="h1"  value="h1"
+                <menuitem id="header6H1" label="h1" value="h1"
                           oncommand="selectHeader(this, 6)"/>
-                <menuitem id="header6H2"  label="h2"  value="h2"
-                          oncommand="selectHeader(this, 6)"/>
-                <menuitem id="header6H3"  label="h3"  value="h3"
+                <menuitem id="header6H2" label="h2" value="h2"
                           oncommand="selectHeader(this, 6)"/>
-                <menuitem id="header6H4"  label="h4"  value="h4"
+                <menuitem id="header6H3" label="h3" value="h3"
+                         oncommand="selectHeader(this, 6)"/>
+                <menuitem id="header6H4" label="h4" value="h4"
                           oncommand="selectHeader(this, 6)"/>
-                <menuitem id="header6H5"  label="h5"  value="h5"
-                          oncommand="selectHeader(this, 6)"/>
-                <menuitem id="header6H6"  label="h6"  value="h6"
+                <menuitem id="header6H5" label="h5" value="h5"
+                         oncommand="selectHeader(this, 6)"/>
+                <menuitem id="header6H6" label="h6" value="h6"
                           oncommand="selectHeader(this, 6)"/>
                 <menuitem id="header6DIV" label="div" value="div"
                           oncommand="selectHeader(this, 6)"/>
-                <menuitem id="header6P"   label="p"   value="p"
+                <menuitem id="header6P" label="p" value="p"
                           oncommand="selectHeader(this, 6)"/>
               </menupopup>
             </menulist>
+          </html:td>
+          <html:td>
             <textbox id="header6Class" size="10"
                      oninput="changeClass(this, 6)"/>
-          </row>
-        </rows>
-      </grid>
+          </html:td>
+        </html:tr>
+      </html:table>
     </groupbox>
     <vbox>
       <checkbox id="orderedListCheckbox"
                 label="&orderedList.label;"
                 oncommand="ToggleOrderedList(this)"/>
       <checkbox id="readOnlyCheckbox"
                 label="&makeReadOnly.label;"
                 oncommand="ToggleReadOnlyToc(this)"/>