Imported Upstream version 0.5

[roundcube.git] / program / js / tiny_mce / plugins / table / merge_cells.htm
diff --git a/program/js/tiny_mce/plugins/table/merge_cells.htm b/program/js/tiny_mce/plugins/table/merge_cells.htm

index 25d42eb6574b976c7a6c93e1c16b18a01fac8b22..9736ed8c03f09248ed515235d963d0fb05d57567 100644 (file)
--- a/program/js/tiny_mce/plugins/table/merge_cells.htm
+++ b/program/js/tiny_mce/plugins/table/merge_cells.htm
@@ -8,7 +8,7 @@
         <script type="text/javascript" src="js/merge_cells.js"></script>\r
  </head>\r
  <body style="margin: 8px">\r
-<form onsubmit="mergeCells();return false;" action="#">\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
@@ -24,13 +24,8 @@
         </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