From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/js/tiny_mce/plugins/table/table.htm | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/program/js/tiny_mce/plugins/table/table.htm b/program/js/tiny_mce/plugins/table/table.htm
index 7d5b908..f269039 100644
--- a/program/js/tiny_mce/plugins/table/table.htm
+++ b/program/js/tiny_mce/plugins/table/table.htm
@@ -9,7 +9,6 @@
<script type="text/javascript" src="../../utils/editable_selects.js"></script>
<script type="text/javascript" src="js/table.js"></script>
<link href="css/table.css" rel="stylesheet" type="text/css" />
- <base target="_self" />
</head>
<body id="table" style="display: none">
<form onsubmit="insertTable();return false;" action="#">
@@ -58,7 +57,7 @@
<td><label id="classlabel" for="class">{#class_name}</label></td>
<td colspan="3">
<select id="class" name="class" class="mceEditableSelect">
- <option value="" selected>{#not_set}</option>
+ <option value="" selected="selected">{#not_set}</option>
</select></td>
</tr>
<tr>
@@ -109,24 +108,10 @@
</tr>
<tr>
- <td class="column1"><label for="frame">{#table_dlg.frame}</label></td>
+ <td class="column1"><label for="tframe">{#table_dlg.frame}</label></td>
<td>
- <select id="frame" name="frame" class="advfield">
- <option value="">{#not_set}</option>
- <option value="none">{#table_dlg.frame_none}</option>
- <option value="groups">{#table_dlg.frame_groups}</option>
- <option value="rows">{#table_dlg.frame_rows}</option>
- <option value="cols">{#table_dlg.frame_cols}</option>
- <option value="all">{#table_dlg.frame_all}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="column1"><label for="rules">{#table_dlg.rules}</label></td>
- <td>
- <select id="rules" name="rules" class="advfield">
- <option value="">{#not_set}</option>
+ <select id="tframe" name="tframe" class="advfield">
+ <option value="">{#not_set}</option>
<option value="void">{#table_dlg.rules_void}</option>
<option value="above">{#table_dlg.rules_above}</option>
<option value="below">{#table_dlg.rules_below}</option>
@@ -136,6 +121,20 @@
<option value="vsides">{#table_dlg.rules_vsides}</option>
<option value="box">{#table_dlg.rules_box}</option>
<option value="border">{#table_dlg.rules_border}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="column1"><label for="rules">{#table_dlg.rules}</label></td>
+ <td>
+ <select id="rules" name="rules" class="advfield">
+ <option value="">{#not_set}</option>
+ <option value="none">{#table_dlg.frame_none}</option>
+ <option value="groups">{#table_dlg.frame_groups}</option>
+ <option value="rows">{#table_dlg.frame_rows}</option>
+ <option value="cols">{#table_dlg.frame_cols}</option>
+ <option value="all">{#table_dlg.frame_all}</option>
</select>
</td>
</tr>
@@ -180,13 +179,8 @@
</div>
<div class="mceActionPanel">
- <div style="float: left">
- <input type="submit" id="insert" name="insert" value="{#insert}" />
- </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="{#insert}" />
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</form>
</body>
--
Gitblit v1.9.1