alchemy_cms 2.4.rc2 → 2.4.rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (122) hide show
  1. data/.gitignore +2 -1
  2. data/.travis.yml +7 -4
  3. data/README.md +1 -0
  4. data/alchemy_cms.gemspec +19 -1
  5. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +5 -2
  6. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +1 -1
  7. data/app/assets/javascripts/alchemy/alchemy.preview_window.js +4 -21
  8. data/app/assets/javascripts/alchemy/alchemy.windows.js +0 -1
  9. data/app/assets/stylesheets/alchemy/base.scss +4 -0
  10. data/app/assets/stylesheets/alchemy/elements.scss +59 -60
  11. data/app/assets/stylesheets/alchemy/flash.scss +3 -3
  12. data/app/assets/stylesheets/alchemy/form_elements.scss +15 -2
  13. data/app/assets/stylesheets/alchemy/jquery-ui.scss +11 -3
  14. data/app/assets/stylesheets/alchemy/mixins.scss +9 -0
  15. data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +1 -1
  16. data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +4 -0
  17. data/app/assets/stylesheets/alchemy/variables.scss +5 -1
  18. data/app/controllers/alchemy/admin/base_controller.rb +18 -3
  19. data/app/controllers/alchemy/admin/elements_controller.rb +4 -7
  20. data/app/controllers/alchemy/admin/pages_controller.rb +3 -4
  21. data/app/controllers/alchemy/admin/resources_controller.rb +1 -18
  22. data/app/controllers/alchemy/admin/users_controller.rb +8 -5
  23. data/app/helpers/alchemy/admin/pages_helper.rb +6 -1
  24. data/app/models/alchemy/content.rb +26 -5
  25. data/app/models/alchemy/element.rb +1 -0
  26. data/app/models/alchemy/essence_richtext.rb +1 -1
  27. data/app/models/alchemy/page.rb +131 -88
  28. data/app/views/alchemy/admin/clipboard/insert.js.erb +1 -1
  29. data/app/views/alchemy/admin/elements/create.js.erb +6 -1
  30. data/app/views/alchemy/admin/elements/trash.js.erb +1 -3
  31. data/app/views/alchemy/admin/resources/_form.html.erb +13 -1
  32. data/app/views/alchemy/admin/trash/index.html.erb +1 -1
  33. data/app/views/alchemy/base/remote_errors.js.erb +5 -1
  34. data/app/views/alchemy/essences/_essence_link_view.html.erb +2 -0
  35. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
  36. data/config/locales/alchemy.de.yml +11 -4
  37. data/lib/alchemy/capistrano.rb +59 -1
  38. data/lib/alchemy/essence.rb +1 -0
  39. data/lib/alchemy/seeder.rb +39 -49
  40. data/lib/alchemy/tinymce.rb +1 -1
  41. data/lib/alchemy/version.rb +1 -1
  42. data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +1 -1
  43. data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +3 -0
  44. data/lib/rails/generators/alchemy/elements/templates/view.html.haml +2 -2
  45. data/lib/rails/generators/alchemy/elements/templates/view.html.slim +2 -2
  46. data/lib/tasks/database.rake +25 -0
  47. data/lib/tasks/install.rake +5 -14
  48. data/spec/factories.rb +10 -0
  49. data/spec/integration/admin/resources_integration_spec.rb +64 -23
  50. data/spec/integration/pages_controller_spec.rb +0 -2
  51. data/spec/libraries/resources_helper_spec.rb +6 -2
  52. data/spec/models/content_spec.rb +31 -0
  53. data/spec/models/element_spec.rb +7 -2
  54. data/spec/models/page_spec.rb +36 -0
  55. data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.1_0_1.js +676 -0
  56. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +298 -238
  57. data/vendor/assets/javascripts/tiny_mce/langs/de.js +1 -1
  58. data/vendor/assets/javascripts/tiny_mce/langs/en.js +1 -1
  59. data/vendor/assets/javascripts/tiny_mce/license.txt +6 -6
  60. data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
  61. data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +97 -97
  62. data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +376 -386
  63. data/vendor/assets/javascripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
  64. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +30 -30
  65. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +45 -45
  66. data/vendor/assets/javascripts/tiny_mce/plugins/paste/langs/de_dlg.js +1 -1
  67. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +17 -20
  68. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +12 -12
  69. data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +173 -183
  70. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +4 -4
  71. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +7 -7
  72. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +3 -3
  73. data/vendor/assets/javascripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
  74. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +280 -282
  75. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +15 -15
  76. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +221 -204
  77. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +448 -435
  78. data/vendor/assets/javascripts/tiny_mce/plugins/table/langs/de_dlg.js +1 -1
  79. data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +22 -24
  80. data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +136 -144
  81. data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +168 -184
  82. data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +46 -62
  83. data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +16 -17
  84. data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +47 -56
  85. data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +52 -69
  86. data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +1 -852
  87. data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +69 -79
  88. data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  89. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +48 -48
  90. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +50 -37
  91. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +317 -317
  92. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +345 -331
  93. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +248 -246
  94. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +152 -146
  95. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +53 -31
  96. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +1 -1
  97. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +1 -1
  98. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +1 -1
  99. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
  100. data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +46 -53
  101. data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +45 -57
  102. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +47 -182
  103. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +93 -399
  104. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +191 -890
  105. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -102
  106. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +79 -377
  107. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +80 -451
  108. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +45 -167
  109. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +93 -399
  110. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +194 -889
  111. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +7 -33
  112. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +4 -15
  113. data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +16 -19
  114. data/vendor/assets/javascripts/tiny_mce/tiny_mce.js +1 -1
  115. data/vendor/assets/javascripts/tiny_mce/tiny_mce_popup.js +1 -1
  116. data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +46 -46
  117. data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +124 -124
  118. data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +112 -112
  119. data/vendor/assets/javascripts/tiny_mce/utils/validate.js +213 -213
  120. metadata +11 -6
  121. data/spec/dummy/public/404.html.bak +0 -26
  122. data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js +0 -8
data/vendor/assets/javascripts/tiny_mce/plugins/table/langs/de_dlg.js CHANGED
@@ -1 +1 @@
1
- tinyMCE.addI18n('de.table_dlg',{"rules_border":"alle 4 Seiten (Border)","rules_box":"alle 4 Seiten (Box)","rules_vsides":"links und rechts","rules_rhs":"nur rechts","rules_lhs":"nur links","rules_hsides":"oben und unten","rules_below":"nur unten","rules_above":"nur oben","rules_void":"keins",rules:"Gitter","frame_all":"zwischen allen Zellen","frame_cols":"zwischen Spalten","frame_rows":"zwischen Zeilen","frame_groups":"zwischen Gruppen","frame_none":"keine",frame:"Rahmen",caption:"Beschriftung der Tabelle","missing_scope":"Wollen Sie wirklich keine Beziehung f\u00fcr diese \u00dcberschrift angeben? Benutzer mit k\u00f6rperlichen Einschr\u00e4nkungen k\u00f6nnten Schwierigkeiten haben, den Inhalt der Tabelle zu verstehen.","cell_limit":"Sie haben die maximale Zellenzahl von {$cells} \u00fcberschritten.","row_limit":"Sie haben die maximale Zeilenzahl von {$rows} \u00fcberschritten.","col_limit":"Sie haben die maximale Spaltenzahl von {$cols} \u00fcberschritten.",colgroup:"Horizontal gruppieren",rowgroup:"Vertikal gruppieren",scope:"Bezug",tfoot:"Tabellenfu\u00df",tbody:"Tabelleninhalt",thead:"Tabellenkopf","row_all":"Alle Zeilen ver\u00e4ndern","row_even":"Gerade Zeilen ver\u00e4ndern","row_odd":"Ungerade Zeilen ver\u00e4ndern","row_row":"Diese Zeile ver\u00e4ndern","cell_all":"Alle Zellen der Tabelle ver\u00e4ndern","cell_row":"Alle Zellen in dieser Zeile ver\u00e4ndern","cell_cell":"Diese Zelle ver\u00e4ndern",th:"\u00dcberschrift",td:"Textzelle",summary:"Zusammenfassung",bgimage:"Hintergrundbild",rtl:"Rechts nach links",ltr:"Links nach rechts",mime:"MIME-Type des Inhalts",langcode:"Sprachcode",langdir:"Schriftrichtung",style:"Format",id:"ID","merge_cells_title":"Zellen vereinen",bgcolor:"Hintergrundfarbe",bordercolor:"Rahmenfarbe","align_bottom":"Unten","align_top":"Oben",valign:"Vertikale Ausrichtung","cell_type":"Zellentyp","cell_title":"Eigenschaften der Zelle","row_title":"Eigenschaften der Zeile","align_middle":"Mittig","align_right":"Rechts","align_left":"Links","align_default":"Standard",align:"Ausrichtung",border:"Rahmen",cellpadding:"Abstand innerhalb der Zellen",cellspacing:"Zellenabstand",rows:"Zeilen",cols:"Spalten",height:"H\u00f6he",width:"Breite",title:"Tabelle einf\u00fcgen/bearbeiten",rowtype:"Gruppierung","advanced_props":"Erweiterte Einstellungen","general_props":"Allgemeine Einstellungen","advanced_tab":"Erweitert","general_tab":"Allgemein","cell_col":"Alle Zellen in dieser Spalte aktualisieren"});
1
+ tinyMCE.addI18n('de.table_dlg',{"rules_border":"alle 4 Seiten (Border)","rules_box":"alle 4 Seiten (Box)","rules_vsides":"links und rechts","rules_rhs":"nur rechts","rules_lhs":"nur links","rules_hsides":"oben und unten","rules_below":"nur unten","rules_above":"nur oben","rules_void":"keins",rules:"Gitter","frame_all":"zwischen allen Zellen","frame_cols":"zwischen Spalten","frame_rows":"zwischen Zeilen","frame_groups":"zwischen Gruppen","frame_none":"keine",frame:"Rahmen",caption:"Beschriftung der Tabelle","missing_scope":"Soll f\u00fcr diese \u00dcberschrift wirklich kein Bereich angegeben werden? Benutzer mit k\u00f6rperlichen Einschr\u00e4nkungen k\u00f6nnten Schwierigkeiten haben, den Inhalt der Tabelle zu verstehen.","cell_limit":"Die maximale Zellenzahl von {$cells} wurde \u00fcberschritten.","row_limit":"Die maximale Zeilenzahl von {$rows} wurde \u00fcberschritten.","col_limit":"Die maximale Spaltenzahl von {$cols} wurde \u00fcberschritten.",colgroup:"Horizontal gruppieren",rowgroup:"Vertikal gruppieren",scope:"Bezug",tfoot:"Tabellenfu\u00df",tbody:"Tabelleninhalt",thead:"Tabellenkopf","row_all":"Alle Zeilen ver\u00e4ndern","row_even":"Gerade Zeilen ver\u00e4ndern","row_odd":"Ungerade Zeilen ver\u00e4ndern","row_row":"Diese Zeile ver\u00e4ndern","cell_all":"Alle Zellen der Tabelle ver\u00e4ndern","cell_row":"Alle Zellen in dieser Zeile ver\u00e4ndern","cell_cell":"Diese Zelle ver\u00e4ndern",th:"\u00dcberschrift",td:"Textzelle",summary:"Zusammenfassung",bgimage:"Hintergrundbild",rtl:"Rechts nach links",ltr:"Links nach rechts",mime:"MIME-Type des Inhalts",langcode:"Sprachcode",langdir:"Schriftrichtung",style:"Format",id:"ID","merge_cells_title":"Zellen vereinen",bgcolor:"Hintergrundfarbe",bordercolor:"Rahmenfarbe","align_bottom":"Unten","align_top":"Oben",valign:"Vertikale Ausrichtung","cell_type":"Zellentyp","cell_title":"Eigenschaften der Zelle","row_title":"Eigenschaften der Zeile","align_middle":"Mittig","align_right":"Rechts","align_left":"Links","align_default":"Standard",align:"Ausrichtung",border:"Rahmen",cellpadding:"Abstand innerhalb der Zellen",cellspacing:"Zellenabstand",rows:"Zeilen",cols:"Spalten",height:"H\u00f6he",width:"Breite",title:"Tabelle einf\u00fcgen/bearbeiten",rowtype:"Gruppierung","advanced_props":"Erweiterte Einstellungen","general_props":"Allgemeine Einstellungen","advanced_tab":"Erweitert","general_tab":"Allgemein","cell_col":"Alle Zellen in dieser Spalte aktualisieren"});
data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm CHANGED
@@ -1,34 +1,32 @@
1
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
2
  <html xmlns="http://www.w3.org/1999/xhtml">
3
3
  <head>
4
- <title>{#table_dlg.merge_cells_title}</title>
5
- <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
- <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
- <script type="text/javascript" src="../../utils/validate.js"></script>
8
- <script type="text/javascript" src="js/merge_cells.js"></script>
4
+ <title>{#table_dlg.merge_cells_title}</title>
5
+ <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
+ <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
+ <script type="text/javascript" src="../../utils/validate.js"></script>
8
+ <script type="text/javascript" src="js/merge_cells.js"></script>
9
9
  </head>
10
10
  <body style="margin: 8px" role="application">
11
11
  <form onsubmit="MergeCellsDialog.merge();return false;" action="#">
12
- <fieldset>
13
- <legend>{#table_dlg.merge_cells_title}</legend>
14
- <table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">
15
- <tr>
16
- <td><label for="numcols">{#table_dlg.cols}</label>:</td>
17
- <td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus"
18
- style="width: 30px" aria-required="true"/></td>
19
- </tr>
20
- <tr>
21
- <td><label for="numrows">{#table_dlg.rows}</label>:</td>
22
- <td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1"
23
- style="width: 30px" aria-required="true"/></td>
24
- </tr>
25
- </table>
26
- </fieldset>
12
+ <fieldset>
13
+ <legend>{#table_dlg.merge_cells_title}</legend>
14
+ <table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">
15
+ <tr>
16
+ <td><label for="numcols">{#table_dlg.cols}</label>:</td>
17
+ <td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>
18
+ </tr>
19
+ <tr>
20
+ <td><label for="numrows">{#table_dlg.rows}</label>:</td>
21
+ <td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>
22
+ </tr>
23
+ </table>
24
+ </fieldset>
27
25
 
28
- <div class="mceActionPanel">
29
- <input type="submit" id="insert" name="insert" value="{#update}"/>
30
- <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
31
- </div>
26
+ <div class="mceActionPanel">
27
+ <input type="submit" id="insert" name="insert" value="{#update}" />
28
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
29
+ </div>
32
30
  </form>
33
31
  </body>
34
32
  </html>
data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm CHANGED
@@ -1,166 +1,158 @@
1
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
2
  <html xmlns="http://www.w3.org/1999/xhtml">
3
3
  <head>
4
- <title>{#table_dlg.row_title}</title>
5
- <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
- <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
- <script type="text/javascript" src="../../utils/form_utils.js"></script>
8
- <script type="text/javascript" src="../../utils/validate.js"></script>
9
- <script type="text/javascript" src="../../utils/editable_selects.js"></script>
10
- <script type="text/javascript" src="js/row.js"></script>
11
- <link href="css/row.css" rel="stylesheet" type="text/css"/>
4
+ <title>{#table_dlg.row_title}</title>
5
+ <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
+ <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
+ <script type="text/javascript" src="../../utils/form_utils.js"></script>
8
+ <script type="text/javascript" src="../../utils/validate.js"></script>
9
+ <script type="text/javascript" src="../../utils/editable_selects.js"></script>
10
+ <script type="text/javascript" src="js/row.js"></script>
11
+ <link href="css/row.css" rel="stylesheet" type="text/css" />
12
12
  </head>
13
13
  <body id="tablerow" style="display: none" role="application">
14
- <form onsubmit="updateAction();return false;" action="#">
15
- <div class="tabs">
16
- <ul>
17
- <li id="general_tab" class="current" aria-controls="general_panel"><span><a
18
- href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span>
19
- </li>
20
- <li id="advanced_tab" aria-controls="advanced_panel"><span><a
21
- href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span>
22
- </li>
23
- </ul>
24
- </div>
14
+ <form onsubmit="updateAction();return false;" action="#">
15
+ <div class="tabs">
16
+ <ul>
17
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
18
+ <li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
19
+ </ul>
20
+ </div>
25
21
 
26
- <div class="panel_wrapper">
27
- <div id="general_panel" class="panel current">
28
- <fieldset>
29
- <legend>{#table_dlg.general_props}</legend>
22
+ <div class="panel_wrapper">
23
+ <div id="general_panel" class="panel current">
24
+ <fieldset>
25
+ <legend>{#table_dlg.general_props}</legend>
30
26
 
31
- <table role="presentation" border="0" cellpadding="4" cellspacing="0">
32
- <tr>
33
- <td><label for="rowtype">{#table_dlg.rowtype}</label></td>
34
- <td class="col2">
35
- <select id="rowtype" name="rowtype" class="mceFocus">
36
- <option value="thead">{#table_dlg.thead}</option>
37
- <option value="tbody">{#table_dlg.tbody}</option>
38
- <option value="tfoot">{#table_dlg.tfoot}</option>
39
- </select>
40
- </td>
41
- </tr>
27
+ <table role="presentation" border="0" cellpadding="4" cellspacing="0">
28
+ <tr>
29
+ <td><label for="rowtype">{#table_dlg.rowtype}</label></td>
30
+ <td class="col2">
31
+ <select id="rowtype" name="rowtype" class="mceFocus" onChange="changedRowType();">
32
+ <option value="thead">{#table_dlg.thead}</option>
33
+ <option value="tbody">{#table_dlg.tbody}</option>
34
+ <option value="tfoot">{#table_dlg.tfoot}</option>
35
+ </select>
36
+ </td>
37
+ </tr>
42
38
 
43
- <tr>
44
- <td><label for="align">{#table_dlg.align}</label></td>
45
- <td class="col2">
46
- <select id="align" name="align">
47
- <option value="">{#not_set}</option>
48
- <option value="center">{#table_dlg.align_middle}</option>
49
- <option value="left">{#table_dlg.align_left}</option>
50
- <option value="right">{#table_dlg.align_right}</option>
51
- </select>
52
- </td>
53
- </tr>
39
+ <tr>
40
+ <td><label for="align">{#table_dlg.align}</label></td>
41
+ <td class="col2">
42
+ <select id="align" name="align">
43
+ <option value="">{#not_set}</option>
44
+ <option value="center">{#table_dlg.align_middle}</option>
45
+ <option value="left">{#table_dlg.align_left}</option>
46
+ <option value="right">{#table_dlg.align_right}</option>
47
+ </select>
48
+ </td>
49
+ </tr>
54
50
 
55
- <tr>
56
- <td><label for="valign">{#table_dlg.valign}</label></td>
57
- <td class="col2">
58
- <select id="valign" name="valign">
59
- <option value="">{#not_set}</option>
60
- <option value="top">{#table_dlg.align_top}</option>
61
- <option value="middle">{#table_dlg.align_middle}</option>
62
- <option value="bottom">{#table_dlg.align_bottom}</option>
63
- </select>
64
- </td>
65
- </tr>
51
+ <tr>
52
+ <td><label for="valign">{#table_dlg.valign}</label></td>
53
+ <td class="col2">
54
+ <select id="valign" name="valign">
55
+ <option value="">{#not_set}</option>
56
+ <option value="top">{#table_dlg.align_top}</option>
57
+ <option value="middle">{#table_dlg.align_middle}</option>
58
+ <option value="bottom">{#table_dlg.align_bottom}</option>
59
+ </select>
60
+ </td>
61
+ </tr>
66
62
 
67
- <tr id="styleSelectRow">
68
- <td><label for="class">{#class_name}</label></td>
69
- <td class="col2">
70
- <select id="class" name="class" class="mceEditableSelect">
71
- <option value="" selected="selected">{#not_set}</option>
72
- </select>
73
- </td>
74
- </tr>
63
+ <tr id="styleSelectRow">
64
+ <td><label for="class">{#class_name}</label></td>
65
+ <td class="col2">
66
+ <select id="class" name="class" class="mceEditableSelect">
67
+ <option value="" selected="selected">{#not_set}</option>
68
+ </select>
69
+ </td>
70
+ </tr>
75
71
 
76
- <tr>
77
- <td><label for="height">{#table_dlg.height}</label></td>
78
- <td class="col2"><input name="height" type="text" id="height" value="" size="7" maxlength="7"
79
- onchange="changedSize();" class="size"/></td>
80
- </tr>
81
- </table>
82
- </fieldset>
83
- </div>
72
+ <tr>
73
+ <td><label for="height">{#table_dlg.height}</label></td>
74
+ <td class="col2"><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
75
+ </tr>
76
+ </table>
77
+ </fieldset>
78
+ </div>
84
79
 
85
- <div id="advanced_panel" class="panel">
86
- <fieldset>
87
- <legend>{#table_dlg.advanced_props}</legend>
80
+ <div id="advanced_panel" class="panel">
81
+ <fieldset>
82
+ <legend>{#table_dlg.advanced_props}</legend>
88
83
 
89
- <table role="presentation" border="0" cellpadding="0" cellspacing="4">
90
- <tr>
91
- <td class="column1"><label for="id">{#table_dlg.id}</label></td>
92
- <td><input id="id" name="id" type="text" value="" style="width: 200px"/></td>
93
- </tr>
84
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
85
+ <tr>
86
+ <td class="column1"><label for="id">{#table_dlg.id}</label></td>
87
+ <td><input id="id" name="id" type="text" value="" style="width: 200px" /></td>
88
+ </tr>
94
89
 
95
- <tr>
96
- <td><label for="style">{#table_dlg.style}</label></td>
97
- <td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();"/>
98
- </td>
99
- </tr>
90
+ <tr>
91
+ <td><label for="style">{#table_dlg.style}</label></td>
92
+ <td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
93
+ </tr>
100
94
 
101
- <tr>
102
- <td class="column1"><label for="dir">{#table_dlg.langdir}</label></td>
103
- <td>
104
- <select id="dir" name="dir" style="width: 200px">
105
- <option value="">{#not_set}</option>
106
- <option value="ltr">{#table_dlg.ltr}</option>
107
- <option value="rtl">{#table_dlg.rtl}</option>
108
- </select>
109
- </td>
110
- </tr>
95
+ <tr>
96
+ <td class="column1"><label for="dir">{#table_dlg.langdir}</label></td>
97
+ <td>
98
+ <select id="dir" name="dir" style="width: 200px">
99
+ <option value="">{#not_set}</option>
100
+ <option value="ltr">{#table_dlg.ltr}</option>
101
+ <option value="rtl">{#table_dlg.rtl}</option>
102
+ </select>
103
+ </td>
104
+ </tr>
111
105
 
112
- <tr>
113
- <td class="column1"><label for="lang">{#table_dlg.langcode}</label></td>
114
- <td>
115
- <input id="lang" name="lang" type="text" value="" style="width: 200px"/>
116
- </td>
117
- </tr>
106
+ <tr>
107
+ <td class="column1"><label for="lang">{#table_dlg.langcode}</label></td>
108
+ <td>
109
+ <input id="lang" name="lang" type="text" value="" style="width: 200px" />
110
+ </td>
111
+ </tr>
118
112
 
119
- <tr>
120
- <td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td>
121
- <td>
122
- <table role="presentation" border="0" cellpadding="0" cellspacing="0">
123
- <tr>
124
- <td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px"
125
- onchange="changedBackgroundImage();"/></td>
126
- <td id="backgroundimagebrowsercontainer">&nbsp;</td>
127
- </tr>
128
- </table>
129
- </td>
130
- </tr>
113
+ <tr>
114
+ <td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td>
115
+ <td>
116
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
117
+ <tr>
118
+ <td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
119
+ <td id="backgroundimagebrowsercontainer">&nbsp;</td>
120
+ </tr>
121
+ </table>
122
+ </td>
123
+ </tr>
131
124
 
132
- <tr>
133
- <td class="column1"><label for="bgcolor" id="bgcolor_label">{#table_dlg.bgcolor}</label></td>
134
- <td>
135
- <span role="group" aria-labelledby="bgcolor_label">
136
- <table role="presentation" border="0" cellpadding="0" cellspacing="0">
137
- <tr>
138
- <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9"
139
- onchange="updateColor('bgcolor_pick','bgcolor');changedColor();"/></td>
140
- <td id="bgcolor_pickcontainer">&nbsp;</td>
141
- </tr>
142
- </table>
143
- </span>
144
- </td>
145
- </tr>
146
- </table>
147
- </fieldset>
148
- </div>
149
- </div>
125
+ <tr>
126
+ <td class="column1"><label for="bgcolor" id="bgcolor_label">{#table_dlg.bgcolor}</label></td>
127
+ <td>
128
+ <span role="group" aria-labelledby="bgcolor_label">
129
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
130
+ <tr>
131
+ <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
132
+ <td id="bgcolor_pickcontainer">&nbsp;</td>
133
+ </tr>
134
+ </table>
135
+ </span>
136
+ </td>
137
+ </tr>
138
+ </table>
139
+ </fieldset>
140
+ </div>
141
+ </div>
150
142
 
151
- <div class="mceActionPanel">
152
- <div>
153
- <select id="action" name="action">
154
- <option value="row">{#table_dlg.row_row}</option>
155
- <option value="odd">{#table_dlg.row_odd}</option>
156
- <option value="even">{#table_dlg.row_even}</option>
157
- <option value="all">{#table_dlg.row_all}</option>
158
- </select>
159
- </div>
143
+ <div class="mceActionPanel">
144
+ <div>
145
+ <select id="action" name="action">
146
+ <option value="row">{#table_dlg.row_row}</option>
147
+ <option value="odd">{#table_dlg.row_odd}</option>
148
+ <option value="even">{#table_dlg.row_even}</option>
149
+ <option value="all">{#table_dlg.row_all}</option>
150
+ </select>
151
+ </div>
160
152
 
161
- <input type="submit" id="insert" name="insert" value="{#update}"/>
162
- <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
163
- </div>
164
- </form>
153
+ <input type="submit" id="insert" name="insert" value="{#update}" />
154
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
155
+ </div>
156
+ </form>
165
157
  </body>
166
158
  </html>
data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm CHANGED
@@ -1,204 +1,188 @@
1
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
2
  <html xmlns="http://www.w3.org/1999/xhtml">
3
3
  <head>
4
- <title>{#table_dlg.title}</title>
5
- <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
- <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
- <script type="text/javascript" src="../../utils/form_utils.js"></script>
8
- <script type="text/javascript" src="../../utils/validate.js"></script>
9
- <script type="text/javascript" src="../../utils/editable_selects.js"></script>
10
- <script type="text/javascript" src="js/table.js"></script>
11
- <link href="css/table.css" rel="stylesheet" type="text/css"/>
4
+ <title>{#table_dlg.title}</title>
5
+ <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
+ <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
+ <script type="text/javascript" src="../../utils/form_utils.js"></script>
8
+ <script type="text/javascript" src="../../utils/validate.js"></script>
9
+ <script type="text/javascript" src="../../utils/editable_selects.js"></script>
10
+ <script type="text/javascript" src="js/table.js"></script>
11
+ <link href="css/table.css" rel="stylesheet" type="text/css" />
12
12
  </head>
13
13
  <body id="table" style="display: none" role="application" aria-labelledby="app_title">
14
- <span style="display:none;" id="app_title">{#table_dlg.title}</span>
14
+ <span style="display:none;" id="app_title">{#table_dlg.title}</span>
15
+ <form onsubmit="insertTable();return false;" action="#">
16
+ <div class="tabs">
17
+ <ul>
18
+ <li id="general_tab" aria-controls="general_panel" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
19
+ <li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
20
+ </ul>
21
+ </div>
15
22
 
16
- <form onsubmit="insertTable();return false;" action="#">
17
- <div class="tabs">
18
- <ul>
19
- <li id="general_tab" aria-controls="general_panel" class="current"><span><a
20
- href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span>
21
- </li>
22
- <li id="advanced_tab" aria-controls="advanced_panel"><span><a
23
- href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span>
24
- </li>
25
- </ul>
26
- </div>
23
+ <div class="panel_wrapper">
24
+ <div id="general_panel" class="panel current">
25
+ <fieldset>
26
+ <legend>{#table_dlg.general_props}</legend>
27
+ <table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
28
+ <tr>
29
+ <td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
30
+ <td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" aria-required="true" /></td>
31
+ <td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
32
+ <td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" aria-required="true" /></td>
33
+ </tr>
34
+ <tr>
35
+ <td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
36
+ <td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>
37
+ <td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
38
+ <td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>
39
+ </tr>
40
+ <tr>
41
+ <td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
42
+ <td><select id="align" name="align">
43
+ <option value="">{#not_set}</option>
44
+ <option value="center">{#table_dlg.align_middle}</option>
45
+ <option value="left">{#table_dlg.align_left}</option>
46
+ <option value="right">{#table_dlg.align_right}</option>
47
+ </select></td>
48
+ <td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
49
+ <td><input id="border" name="border" type="text" value="" size="3" maxlength="5" onchange="changedBorder();" class="size" /></td>
50
+ </tr>
51
+ <tr id="width_row">
52
+ <td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
53
+ <td><input name="width" type="text" id="width" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
54
+ <td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
55
+ <td><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
56
+ </tr>
57
+ <tr id="styleSelectRow" >
58
+ <td><label id="classlabel" for="class">{#class_name}</label></td>
59
+ <td colspan="3" >
60
+ <select id="class" name="class" class="mceEditableSelect">
61
+ <option value="" selected="selected">{#not_set}</option>
62
+ </select></td>
63
+ </tr>
64
+ <tr>
65
+ <td class="column1" ><label for="caption">{#table_dlg.caption}</label></td>
66
+ <td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td>
67
+ </tr>
68
+ </table>
69
+ </fieldset>
70
+ </div>
27
71
 
28
- <div class="panel_wrapper">
29
- <div id="general_panel" class="panel current">
30
- <fieldset>
31
- <legend>{#table_dlg.general_props}</legend>
32
- <table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
33
- <tr>
34
- <td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
35
- <td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3"
36
- class="required number min1 mceFocus" aria-required="true"/></td>
37
- <td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
38
- <td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1"
39
- aria-required="true"/></td>
40
- </tr>
41
- <tr>
42
- <td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
43
- <td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number"/>
44
- </td>
45
- <td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
46
- <td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number"/>
47
- </td>
48
- </tr>
49
- <tr>
50
- <td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
51
- <td><select id="align" name="align">
52
- <option value="">{#not_set}</option>
53
- <option value="center">{#table_dlg.align_middle}</option>
54
- <option value="left">{#table_dlg.align_left}</option>
55
- <option value="right">{#table_dlg.align_right}</option>
56
- </select></td>
57
- <td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
58
- <td><input id="border" name="border" type="text" value="" size="3" maxlength="5" onchange="changedBorder();"
59
- class="size"/></td>
60
- </tr>
61
- <tr id="width_row">
62
- <td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
63
- <td><input name="width" type="text" id="width" value="" size="7" maxlength="7" onchange="changedSize();"
64
- class="size"/></td>
65
- <td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
66
- <td><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();"
67
- class="size"/></td>
68
- </tr>
69
- <tr id="styleSelectRow">
70
- <td><label id="classlabel" for="class">{#class_name}</label></td>
71
- <td colspan="3">
72
- <select id="class" name="class" class="mceEditableSelect">
73
- <option value="" selected="selected">{#not_set}</option>
74
- </select></td>
75
- </tr>
76
- <tr>
77
- <td class="column1"><label for="caption">{#table_dlg.caption}</label></td>
78
- <td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true"/></td>
79
- </tr>
80
- </table>
81
- </fieldset>
82
- </div>
72
+ <div id="advanced_panel" class="panel">
73
+ <fieldset>
74
+ <legend>{#table_dlg.advanced_props}</legend>
83
75
 
84
- <div id="advanced_panel" class="panel">
85
- <fieldset>
86
- <legend>{#table_dlg.advanced_props}</legend>
76
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
77
+ <tr>
78
+ <td class="column1"><label for="id">{#table_dlg.id}</label></td>
79
+ <td><input id="id" name="id" type="text" value="" class="advfield" /></td>
80
+ </tr>
87
81
 
88
- <table role="presentation" border="0" cellpadding="0" cellspacing="4">
89
- <tr>
90
- <td class="column1"><label for="id">{#table_dlg.id}</label></td>
91
- <td><input id="id" name="id" type="text" value="" class="advfield"/></td>
92
- </tr>
82
+ <tr>
83
+ <td class="column1"><label for="summary">{#table_dlg.summary}</label></td>
84
+ <td><input id="summary" name="summary" type="text" value="" class="advfield" /></td>
85
+ </tr>
93
86
 
94
- <tr>
95
- <td class="column1"><label for="summary">{#table_dlg.summary}</label></td>
96
- <td><input id="summary" name="summary" type="text" value="" class="advfield"/></td>
97
- </tr>
87
+ <tr>
88
+ <td><label for="style">{#table_dlg.style}</label></td>
89
+ <td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>
90
+ </tr>
98
91
 
99
- <tr>
100
- <td><label for="style">{#table_dlg.style}</label></td>
101
- <td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();"/></td>
102
- </tr>
92
+ <tr>
93
+ <td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td>
94
+ <td>
95
+ <input id="lang" name="lang" type="text" value="" class="advfield" />
96
+ </td>
97
+ </tr>
103
98
 
104
- <tr>
105
- <td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td>
106
- <td>
107
- <input id="lang" name="lang" type="text" value="" class="advfield"/>
108
- </td>
109
- </tr>
99
+ <tr>
100
+ <td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td>
101
+ <td>
102
+ <table role="presentation" aria-labelledby="backgroundimage_label" border="0" cellpadding="0" cellspacing="0">
103
+ <tr>
104
+ <td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>
105
+ <td id="backgroundimagebrowsercontainer">&nbsp;</td>
106
+ </tr>
107
+ </table>
108
+ </td>
109
+ </tr>
110
110
 
111
- <tr>
112
- <td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td>
113
- <td>
114
- <table role="presentation" aria-labelledby="backgroundimage_label" border="0" cellpadding="0"
115
- cellspacing="0">
116
- <tr>
117
- <td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield"
118
- onchange="changedBackgroundImage();"/></td>
119
- <td id="backgroundimagebrowsercontainer">&nbsp;</td>
120
- </tr>
121
- </table>
122
- </td>
123
- </tr>
111
+ <tr>
112
+ <td class="column1"><label for="tframe">{#table_dlg.frame}</label></td>
113
+ <td>
114
+ <select id="tframe" name="tframe" class="advfield">
115
+ <option value="">{#not_set}</option>
116
+ <option value="void">{#table_dlg.rules_void}</option>
117
+ <option value="above">{#table_dlg.rules_above}</option>
118
+ <option value="below">{#table_dlg.rules_below}</option>
119
+ <option value="hsides">{#table_dlg.rules_hsides}</option>
120
+ <option value="lhs">{#table_dlg.rules_lhs}</option>
121
+ <option value="rhs">{#table_dlg.rules_rhs}</option>
122
+ <option value="vsides">{#table_dlg.rules_vsides}</option>
123
+ <option value="box">{#table_dlg.rules_box}</option>
124
+ <option value="border">{#table_dlg.rules_border}</option>
125
+ </select>
126
+ </td>
127
+ </tr>
124
128
 
125
- <tr>
126
- <td class="column1"><label for="tframe">{#table_dlg.frame}</label></td>
127
- <td>
128
- <select id="tframe" name="tframe" class="advfield">
129
- <option value="">{#not_set}</option>
130
- <option value="void">{#table_dlg.rules_void}</option>
131
- <option value="above">{#table_dlg.rules_above}</option>
132
- <option value="below">{#table_dlg.rules_below}</option>
133
- <option value="hsides">{#table_dlg.rules_hsides}</option>
134
- <option value="lhs">{#table_dlg.rules_lhs}</option>
135
- <option value="rhs">{#table_dlg.rules_rhs}</option>
136
- <option value="vsides">{#table_dlg.rules_vsides}</option>
137
- <option value="box">{#table_dlg.rules_box}</option>
138
- <option value="border">{#table_dlg.rules_border}</option>
139
- </select>
140
- </td>
141
- </tr>
129
+ <tr>
130
+ <td class="column1"><label for="rules">{#table_dlg.rules}</label></td>
131
+ <td>
132
+ <select id="rules" name="rules" class="advfield">
133
+ <option value="">{#not_set}</option>
134
+ <option value="none">{#table_dlg.frame_none}</option>
135
+ <option value="groups">{#table_dlg.frame_groups}</option>
136
+ <option value="rows">{#table_dlg.frame_rows}</option>
137
+ <option value="cols">{#table_dlg.frame_cols}</option>
138
+ <option value="all">{#table_dlg.frame_all}</option>
139
+ </select>
140
+ </td>
141
+ </tr>
142
142
 
143
- <tr>
144
- <td class="column1"><label for="rules">{#table_dlg.rules}</label></td>
145
- <td>
146
- <select id="rules" name="rules" class="advfield">
147
- <option value="">{#not_set}</option>
148
- <option value="none">{#table_dlg.frame_none}</option>
149
- <option value="groups">{#table_dlg.frame_groups}</option>
150
- <option value="rows">{#table_dlg.frame_rows}</option>
151
- <option value="cols">{#table_dlg.frame_cols}</option>
152
- <option value="all">{#table_dlg.frame_all}</option>
153
- </select>
154
- </td>
155
- </tr>
143
+ <tr>
144
+ <td class="column1"><label for="dir">{#table_dlg.langdir}</label></td>
145
+ <td>
146
+ <select id="dir" name="dir" class="advfield">
147
+ <option value="">{#not_set}</option>
148
+ <option value="ltr">{#table_dlg.ltr}</option>
149
+ <option value="rtl">{#table_dlg.rtl}</option>
150
+ </select>
151
+ </td>
152
+ </tr>
156
153
 
157
- <tr>
158
- <td class="column1"><label for="dir">{#table_dlg.langdir}</label></td>
159
- <td>
160
- <select id="dir" name="dir" class="advfield">
161
- <option value="">{#not_set}</option>
162
- <option value="ltr">{#table_dlg.ltr}</option>
163
- <option value="rtl">{#table_dlg.rtl}</option>
164
- </select>
165
- </td>
166
- </tr>
154
+ <tr role="group" aria-labelledby="bordercolor_label">
155
+ <td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td>
156
+ <td>
157
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
158
+ <tr>
159
+ <td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
160
+ <td id="bordercolor_pickcontainer">&nbsp;</td>
161
+ </tr>
162
+ </table>
163
+ </td>
164
+ </tr>
167
165
 
168
- <tr role="group" aria-labelledby="bordercolor_label">
169
- <td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td>
170
- <td>
171
- <table role="presentation" border="0" cellpadding="0" cellspacing="0">
172
- <tr>
173
- <td><input id="bordercolor" name="bordercolor" type="text" value="" size="9"
174
- onchange="updateColor('bordercolor_pick','bordercolor');changedColor();"/></td>
175
- <td id="bordercolor_pickcontainer">&nbsp;</td>
176
- </tr>
177
- </table>
178
- </td>
179
- </tr>
166
+ <tr role="group" aria-labelledby="bgcolor_label">
167
+ <td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td>
168
+ <td>
169
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
170
+ <tr>
171
+ <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
172
+ <td id="bgcolor_pickcontainer">&nbsp;</td>
173
+ </tr>
174
+ </table>
175
+ </td>
176
+ </tr>
177
+ </table>
178
+ </fieldset>
179
+ </div>
180
+ </div>
180
181
 
181
- <tr role="group" aria-labelledby="bgcolor_label">
182
- <td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td>
183
- <td>
184
- <table role="presentation" border="0" cellpadding="0" cellspacing="0">
185
- <tr>
186
- <td><input id="bgcolor" name="bgcolor" type="text" value="" size="9"
187
- onchange="updateColor('bgcolor_pick','bgcolor');changedColor();"/></td>
188
- <td id="bgcolor_pickcontainer">&nbsp;</td>
189
- </tr>
190
- </table>
191
- </td>
192
- </tr>
193
- </table>
194
- </fieldset>
195
- </div>
196
- </div>
197
-
198
- <div class="mceActionPanel">
199
- <input type="submit" id="insert" name="insert" value="{#insert}"/>
200
- <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
201
- </div>
202
- </form>
182
+ <div class="mceActionPanel">
183
+ <input type="submit" id="insert" name="insert" value="{#insert}" />
184
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
185
+ </div>
186
+ </form>
203
187
  </body>
204
188
  </html>