* Upgraded TinyMCE to version 2.0RC3. This fixes a conflict with

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

index e098b18d8dbdff955ec9c7e10ea2317eadcfc725..9c39389ce1643c8195188d5360ea001512528180 100644 (file)
--- a/webcit/tiny_mce/plugins/table/cell.htm
+++ b/webcit/tiny_mce/plugins/table/cell.htm
@@ -8,7 +8,7 @@
         <link href="css/cell.css" rel="stylesheet" type="text/css" />
  </head>
  <body id="tablecell" onload="init();" style="display: none">
-       <form onsubmit="updateAction();return false;">
+       <form onsubmit="updateAction();return false;" action="#">
                 <div class="tabs">
                         <ul>
                                 <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_table_general_tab}</a></span></li>
@@ -44,7 +44,7 @@
  
                                                 <tr>
                                                         <td><label for="valign">{$lang_table_valign}</label></td>
-                                                       <td colspan="2">
+                                                       <td>
                                                                 <select id="valign" name="valign">
                                                                         <option value="">{$lang_not_set}</option>
                                                                         <option value="top">{$lang_table_align_top}</option>
@@ -52,14 +52,26 @@
                                                                         <option value="bottom">{$lang_table_align_bottom}</option>
                                                                 </select>
                                                         </td>
+
+                                                       <td><label for="scope">{$lang_table_scope}</label></td>
+                                                       <td>
+                                                               <select id="scope" name="scope">
+                                                                       <option value="">{$lang_not_set}</option>
+                                                                       <option value="col">{$lang_table_col}</option>
+                                                                       <option value="row">{$lang_table_row}</option>
+                                                                       <option value="rowgroup">{$lang_table_rowgroup}</option>
+                                                                       <option value="colgroup">{$lang_table_colgroup}</option>
+                                                               </select>
+                                                       </td>
+
                                                 </tr>
  
                                                 <tr>
                                                         <td><label for="width">{$lang_table_width}</label></td>
-                                                       <td><input id="width" name="width" type="text" value="" size="4" maxlength="4" /></td>
+                                                       <td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
  
                                                         <td><label for="height">{$lang_table_height}</label></td>
-                                                       <td><input id="height" name="height" type="text" value="" size="4" maxlength="4" /></td>
+                                                       <td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
                                                 </tr>
  
                                                 <tr>
@@ -124,7 +136,7 @@
                                                         <td>
                                                                 <table border="0" cellpadding="0" cellspacing="0">
                                                                         <tr>
-                                                                               <td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');" /></td>
+                                                                               <td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
                                                                                 <td><script language="javascript" type="text/javascript">renderColorPicker('bordercolor_pick','bordercolor');</script></td>
                                                                         </tr>
                                                                 </table>
@@ -136,7 +148,7 @@
                                                         <td>
                                                                 <table border="0" cellpadding="0" cellspacing="0">
                                                                         <tr>
-                                                                               <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');" /></td>
+                                                                               <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
                                                                                 <td><script language="javascript" type="text/javascript">renderColorPicker('bgcolor_pick','bgcolor');</script></td>
                                                                         </tr>
                                                                 </table>