Mercurial > public > sg101
diff media/js/tiny_mce/plugins/table/merge_cells.htm @ 183:149c3567fec1
Updated to TinyMCE version 3.3.2. This is for #57.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sun, 28 Mar 2010 21:47:48 +0000 |
| parents | a5b4c5ce0658 |
| children |
line wrap: on
line diff
--- a/media/js/tiny_mce/plugins/table/merge_cells.htm Sun Mar 28 21:41:11 2010 +0000 +++ b/media/js/tiny_mce/plugins/table/merge_cells.htm Sun Mar 28 21:47:48 2010 +0000 @@ -8,7 +8,7 @@ <script type="text/javascript" src="js/merge_cells.js"></script> </head> <body style="margin: 8px"> -<form onsubmit="mergeCells();return false;" action="#"> +<form onsubmit="MergeCellsDialog.merge();return false;" action="#"> <fieldset> <legend>{#table_dlg.merge_cells_title}</legend> <table border="0" cellpadding="0" cellspacing="3" width="100%"> @@ -24,13 +24,8 @@ </fieldset> <div class="mceActionPanel"> - <div style="float: left"> - <input type="submit" id="insert" name="insert" value="{#update}" /> - </div> - - <div style="float: right"> - <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> - </div> + <input type="submit" id="insert" name="insert" value="{#update}" /> + <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> </div> </form> </body>