Upgrade TinyMCE to v3.4.5

[citadel.git] / webcit / tiny_mce / plugins / table / merge_cells.htm
diff --git a/webcit/tiny_mce/plugins/table/merge_cells.htm b/webcit/tiny_mce/plugins/table/merge_cells.htm

index 9d34a886b08449c961ff636a7ed3ede8f214f1e5..d231090e7988149d0bd087828c4fdbdd4c3f3b51 100644 (file)
--- a/webcit/tiny_mce/plugins/table/merge_cells.htm
+++ b/webcit/tiny_mce/plugins/table/merge_cells.htm
@@ -6,32 +6,26 @@
         <script type="text/javascript" src="../../utils/mctabs.js"></script>\r
         <script type="text/javascript" src="../../utils/validate.js"></script>\r
         <script type="text/javascript" src="js/merge_cells.js"></script>\r
-       <base target="_self" />\r
  </head>\r
-<body style="margin: 8px" style="display: none">\r
-<form onsubmit="mergeCells();return false;" action="#">\r
+<body style="margin: 8px" role="application">\r
+<form onsubmit="MergeCellsDialog.merge();return false;" action="#">\r
         <fieldset>\r
                 <legend>{#table_dlg.merge_cells_title}</legend>\r
-                 <table border="0" cellpadding="0" cellspacing="3" width="100%">\r
-                         <tr>\r
-                               <td>{#table_dlg.cols}:</td>\r
-                               <td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>\r
-                         </tr>\r
-                         <tr>\r
-                               <td>{#table_dlg.rows}:</td>\r
-                               <td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>\r
-                         </tr>\r
-                 </table>\r
+               <table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">\r
+                       <tr>\r
+                               <td><label for="numcols">{#table_dlg.cols}</label>:</td>\r
+                               <td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>\r
+                       </tr>\r
+                       <tr>\r
+                               <td><label for="numrows">{#table_dlg.rows}</label>:</td>\r
+                               <td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>\r
+                       </tr>\r
+               </table>\r
         </fieldset>\r
  \r
         <div class="mceActionPanel">\r
-               <div style="float: left">\r
-                       <input type="submit" id="insert" name="insert" value="{#update}" />\r
-               </div>\r
-\r
-               <div style="float: right">\r
-                       <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />\r
-               </div>\r
+               <input type="submit" id="insert" name="insert" value="{#update}" />\r
+               <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />\r
         </div>\r
  </form>\r
  </body>\r