skylinecms 3.1.0 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (540) hide show
  1. data/.gitignore +5 -0
  2. data/CHANGELOG +51 -1
  3. data/Gemfile +8 -0
  4. data/Rakefile +0 -43
  5. data/app/controllers/skyline/application_controller.rb +30 -26
  6. data/app/controllers/skyline/articles_controller.rb +8 -28
  7. data/app/controllers/skyline/authentications_controller.rb +6 -8
  8. data/app/controllers/skyline/browser/links_controller.rb +12 -8
  9. data/app/controllers/skyline/browser/tabs/linkables_controller.rb +9 -0
  10. data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +0 -12
  11. data/app/controllers/skyline/content/editors/editable_list_controller.rb +0 -4
  12. data/app/controllers/skyline/content/editors/joinable_list_controller.rb +1 -19
  13. data/app/controllers/skyline/content_controller.rb +14 -30
  14. data/app/controllers/skyline/content_items_controller.rb +3 -9
  15. data/app/controllers/skyline/content_sections_controller.rb +3 -10
  16. data/app/controllers/skyline/link_section_links_controller.rb +2 -10
  17. data/app/controllers/skyline/media/data_controller.rb +24 -14
  18. data/app/controllers/skyline/media/dirs_controller.rb +12 -26
  19. data/app/controllers/skyline/media/files_controller.rb +12 -28
  20. data/app/controllers/skyline/publications_controller.rb +0 -12
  21. data/app/controllers/skyline/published_publications_controller.rb +0 -4
  22. data/app/controllers/skyline/sections_controller.rb +4 -18
  23. data/app/controllers/skyline/site/media_files_data_controller.rb +11 -13
  24. data/app/controllers/skyline/site/pages_controller.rb +4 -3
  25. data/app/controllers/skyline/skyline2_controller.rb +1 -1
  26. data/app/controllers/skyline/users_controller.rb +7 -31
  27. data/app/controllers/skyline/variant_current_editor_controller.rb +5 -5
  28. data/app/controllers/skyline/variants_controller.rb +3 -3
  29. data/app/helpers/skyline/application_helper.rb +16 -5
  30. data/app/helpers/skyline/button_helper.rb +12 -18
  31. data/app/helpers/skyline/content_helper.rb +11 -11
  32. data/app/helpers/skyline/dialog_helper.rb +3 -2
  33. data/app/helpers/skyline/editors/checkable_list.rb +4 -2
  34. data/app/helpers/skyline/editors/date_time.rb +1 -1
  35. data/app/helpers/skyline/editors/display.rb +1 -1
  36. data/app/helpers/skyline/editors/editable_list.rb +13 -8
  37. data/app/helpers/skyline/editors/editor.rb +10 -10
  38. data/app/helpers/skyline/editors/list.rb +2 -2
  39. data/app/helpers/skyline/editors/page_browser.rb +1 -0
  40. data/app/helpers/skyline/editors/wysiwyg.rb +2 -3
  41. data/app/helpers/skyline/form_helper.rb +36 -0
  42. data/app/helpers/skyline/media/files_helper.rb +1 -1
  43. data/app/helpers/skyline/message_generator.rb +13 -4
  44. data/app/helpers/skyline/pages_helper.rb +1 -1
  45. data/app/helpers/skyline/plugin_helper.rb +1 -1
  46. data/app/helpers/skyline/presenters/presenter.rb +12 -8
  47. data/app/helpers/skyline/ref_object_helper.rb +9 -7
  48. data/app/helpers/skyline/translation_helper.rb +1 -1
  49. data/app/helpers/skyline/tree_helper.rb +1 -3
  50. data/app/middleware/skyline/flash_session_cookie_middleware.rb +6 -1
  51. data/app/middleware/skyline/plugins_loader_middleware.rb +1 -1
  52. data/app/middleware/skyline/sprockets_middleware.rb +1 -1
  53. data/app/models/skyline/article.rb +94 -26
  54. data/app/models/skyline/article_version.rb +22 -9
  55. data/app/models/skyline/image_ref.rb +1 -1
  56. data/app/models/skyline/inline_ref.rb +78 -62
  57. data/app/models/skyline/link_ref.rb +1 -1
  58. data/app/models/skyline/media_cache.rb +4 -2
  59. data/app/models/skyline/media_file.rb +2 -5
  60. data/app/models/skyline/media_node.rb +2 -2
  61. data/app/models/skyline/object_ref.rb +2 -2
  62. data/app/models/skyline/page.rb +8 -6
  63. data/app/models/skyline/page_fragment.rb +4 -2
  64. data/app/models/skyline/publication.rb +1 -1
  65. data/app/models/skyline/sections/content_collection_section.rb +1 -1
  66. data/app/models/skyline/sections/link_section.rb +1 -1
  67. data/app/models/skyline/user.rb +17 -7
  68. data/app/models/skyline/user_preference.rb +1 -1
  69. data/app/models/skyline/variant.rb +11 -5
  70. data/app/templates/skyline/page/default/index.html.erb +1 -1
  71. data/app/templates/skyline/sections/raw_section/default/index.html.erb +1 -1
  72. data/app/templates/skyline/sections/wysiwyg_section/default/index.html.erb +1 -1
  73. data/app/views/skyline/articles/_currently_editing.html.erb +1 -1
  74. data/app/views/skyline/articles/_meta.html.erb +24 -11
  75. data/app/views/skyline/articles/_security.html.erb +2 -2
  76. data/app/views/skyline/articles/_takeover_action.html.erb +1 -1
  77. data/app/views/skyline/articles/edit.html.erb +29 -16
  78. data/app/views/skyline/articles/edit_preview_only.html.erb +2 -2
  79. data/app/views/skyline/articles/index.html.erb +2 -2
  80. data/app/views/skyline/articles/page/_header.html.erb +1 -1
  81. data/app/views/skyline/articles/page/_index.html.erb +9 -3
  82. data/app/views/skyline/articles/page_fragment/_index.html.erb +7 -2
  83. data/app/views/skyline/articles/update.js.erb +20 -0
  84. data/app/views/skyline/authentications/new.html.erb +1 -1
  85. data/app/views/skyline/browser/links/_index.html.erb +2 -0
  86. data/app/views/skyline/browser/tabs/linkables/_index.html.erb +29 -0
  87. data/app/views/skyline/browser/tabs/linkables/_show.html.erb +67 -0
  88. data/app/views/skyline/browser/tabs/linkables/show.js.erb +4 -0
  89. data/app/views/skyline/browser/tabs/media_library/_index.html.erb +2 -2
  90. data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +4 -35
  91. data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +1 -3
  92. data/app/views/skyline/browser/tabs/media_library/media_files/index.js.erb +1 -0
  93. data/app/views/skyline/browser/tabs/media_library/media_files/show.js.erb +1 -0
  94. data/app/views/skyline/browser/tabs/pages/_index.html.erb +1 -1
  95. data/app/views/skyline/content/_add.rhtml +6 -1
  96. data/app/views/skyline/content/_filter.rhtml +1 -1
  97. data/app/views/skyline/content/_import.html.erb +1 -1
  98. data/app/views/skyline/content/_index.html.erb +2 -2
  99. data/app/views/skyline/content/_meta.html.erb +2 -2
  100. data/app/views/skyline/content/create.rhtml +1 -1
  101. data/app/views/skyline/content/edit.rhtml +1 -1
  102. data/app/views/skyline/content/editors/editable_list/new.js.erb +2 -0
  103. data/app/views/skyline/content/editors/joinable_list/_add.html.erb +17 -10
  104. data/app/views/skyline/content/editors/joinable_list/_list.html.erb +24 -8
  105. data/app/views/skyline/content/editors/joinable_list/cancel.js.erb +1 -0
  106. data/app/views/skyline/content/editors/joinable_list/index.js.erb +1 -0
  107. data/app/views/skyline/content/editors/joinable_list/new.js.erb +5 -0
  108. data/app/views/skyline/content/field.js.erb +2 -0
  109. data/app/views/skyline/content/import.js.erb +4 -0
  110. data/app/views/skyline/content/order.js.erb +6 -0
  111. data/app/views/skyline/content/presenters/_table.html.erb +1 -1
  112. data/app/views/skyline/content_items/_content_item.html.erb +2 -2
  113. data/app/views/skyline/content_items/new.js.erb +6 -0
  114. data/app/views/skyline/content_sections/_tags.html.erb +2 -2
  115. data/app/views/skyline/content_sections/new.js.erb +6 -0
  116. data/app/views/skyline/link_section_links/_form.html.erb +1 -1
  117. data/app/views/skyline/link_section_links/new.js.erb +4 -0
  118. data/app/views/skyline/locales/show.js.erb +3 -3
  119. data/app/views/skyline/media/dirs/_edit.html.erb +9 -7
  120. data/app/views/skyline/media/dirs/edit.js.erb +1 -0
  121. data/app/views/skyline/media/dirs/index.html.erb +16 -6
  122. data/app/views/skyline/media/dirs/index.js.erb +6 -0
  123. data/app/views/skyline/media/dirs/show.js.erb +5 -0
  124. data/app/views/skyline/media/files/_edit.html.erb +13 -11
  125. data/app/views/skyline/media/files/_index.html.erb +2 -2
  126. data/app/views/skyline/media/files/_new.html.erb +2 -2
  127. data/app/views/skyline/media/files/edit.js.erb +4 -0
  128. data/app/views/skyline/media/files/index.js.erb +4 -0
  129. data/app/views/skyline/media/files/update.js.erb +8 -0
  130. data/app/views/skyline/publications/_index.html.erb +2 -2
  131. data/app/views/skyline/publications/index.js.erb +9 -0
  132. data/app/views/skyline/sections/_content_collection_section.html.erb +6 -6
  133. data/app/views/skyline/sections/_content_item_section.html.erb +1 -1
  134. data/app/views/skyline/sections/_form.html.erb +4 -4
  135. data/app/views/skyline/sections/_link_section.html.erb +6 -1
  136. data/app/views/skyline/sections/_splitter_section.html.erb +1 -1
  137. data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -2
  138. data/app/views/skyline/sections/new.js.erb +12 -0
  139. data/app/views/skyline/settings/edit.html.erb +1 -1
  140. data/app/views/skyline/shared/_head.html.erb +3 -0
  141. data/app/views/skyline/shared/_header_area.html.erb +5 -5
  142. data/app/views/skyline/users/_edit.html.erb +1 -1
  143. data/app/views/skyline/users/_form.html.erb +1 -1
  144. data/app/views/skyline/users/_new.html.erb +1 -1
  145. data/app/views/skyline/users/create.js.erb +2 -0
  146. data/app/views/skyline/users/edit.js.erb +1 -0
  147. data/app/views/skyline/users/index.html.erb +21 -6
  148. data/app/views/skyline/users/new.js.erb +1 -0
  149. data/app/views/skyline/users/update.js.erb +2 -0
  150. data/config/initializers/dependencies.rb +1 -17
  151. data/config/initializers/gem_dependencies.rb +10 -0
  152. data/config/initializers/locales.rb +8 -1
  153. data/config/initializers/middlewares.rb +7 -3
  154. data/config/initializers/observers.rb +6 -4
  155. data/config/locales/en-US.yml +44 -34
  156. data/config/locales/nl-NL.yml +45 -33
  157. data/config/routes.rb +65 -74
  158. data/db/migrate/20090508145820_create_skyline_pages.rb +2 -2
  159. data/db/migrate/20090508145852_create_skyline_page_versions.rb +2 -2
  160. data/db/migrate/20090508150149_create_skyline_sections.rb +1 -1
  161. data/db/migrate/20090610142139_add_skyline_tags_taggable_type.rb +2 -2
  162. data/db/migrate/20090624154251_create_skyline_link_section_links.rb +1 -1
  163. data/db/migrate/20100120113953_remove_unused_articles_index.rb +1 -1
  164. data/db/migrate/20110816080626_add_skyline_test_article_data.rb +13 -0
  165. data/db/migrate/20111101092405_rename_indexes.rb +24 -0
  166. data/doc/INSTALL.md +54 -27
  167. data/doc/MIGRATION.md +27 -2
  168. data/lib/skyline.rb +2 -1
  169. data/lib/skyline/authentication/user.rb +80 -0
  170. data/lib/skyline/belongs_to_referable.rb +1 -1
  171. data/lib/skyline/cli/init.rb +14 -26
  172. data/lib/skyline/cli/init/templates/config/initializers/skyline_configuration.rb +0 -1
  173. data/lib/skyline/configuration.rb +74 -32
  174. data/lib/skyline/content/content.rb +7 -6
  175. data/lib/skyline/content/field_meta_data.rb +2 -2
  176. data/lib/skyline/content/stack.rb +1 -1
  177. data/lib/skyline/content_item_section_selectable.rb +4 -4
  178. data/lib/skyline/deprecated/version3_0_8.rb +2 -2
  179. data/lib/skyline/engine.rb +37 -0
  180. data/lib/skyline/form_builder.rb +8 -8
  181. data/lib/skyline/linkable.rb +28 -0
  182. data/lib/skyline/plugins/manager.rb +77 -0
  183. data/lib/skyline/plugins/plugin.rb +89 -0
  184. data/lib/skyline/rendering/helpers/renderer_helper.rb +1 -1
  185. data/lib/skyline/rendering/renderer.rb +27 -13
  186. data/lib/skyline/route_constraint.rb +15 -0
  187. data/lib/skyline/settings.rb +9 -7
  188. data/lib/skyline/taggable.rb +2 -2
  189. data/lib/skyline/version.rb +4 -4
  190. data/lib/skylinecms.rb +5 -3
  191. data/lib/tasks/database.rake +2 -2
  192. data/public/skyline/javascripts/src/application.js +5 -4
  193. data/public/skyline/javascripts/src/rails.js +165 -0
  194. data/public/skyline/javascripts/src/sections.js +6 -9
  195. data/public/skyline/javascripts/src/skyline.editor/src/plugins/autoresize/editor_plugin.js +72 -27
  196. data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylineimage/dialog.js +13 -12
  197. data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylinelink/dialog.js +7 -7
  198. data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +4 -3
  199. data/public/skyline/javascripts/src/skyline.editor/src/theme.js +101 -536
  200. data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +1 -0
  201. data/public/skyline/javascripts/src/skyline.editor/test/single.html +56 -0
  202. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +1410 -1091
  203. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/accessibility.html +101 -0
  204. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +1 -1
  205. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +12 -12
  206. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/lists/media_list.js +5 -1
  207. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/media/sample.flv +0 -0
  208. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +2 -1
  209. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +4 -4
  210. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +3 -2
  211. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +1 -170
  212. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js +1 -5
  213. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +30 -29
  214. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js +1 -1
  215. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +1 -1
  216. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +34 -31
  217. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +32 -13
  218. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js +1 -43
  219. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +21 -17
  220. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js +1 -52
  221. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +35 -30
  222. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -1
  223. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +31 -9
  224. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js +1 -0
  225. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js +172 -0
  226. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
  227. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +23 -5
  228. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
  229. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +14 -5
  230. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js +1 -1
  231. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +1 -1
  232. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
  233. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +34 -21
  234. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm +15 -14
  235. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
  236. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
  237. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
  238. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
  239. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
  240. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
  241. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js +1 -20
  242. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js +1 -0
  243. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js +50 -0
  244. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css +3 -42
  245. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
  246. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +315 -63
  247. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +18 -330
  248. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +199 -438
  249. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js +1 -85
  250. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
  251. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -4
  252. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +2 -1
  253. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +1 -1
  254. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +80 -16
  255. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif +0 -0
  256. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif +0 -0
  257. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif +0 -0
  258. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif +0 -0
  259. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif +0 -0
  260. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +1 -1
  261. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js +1 -1
  262. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +2 -0
  263. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -1
  264. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +31 -28
  265. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js +1 -0
  266. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js +781 -0
  267. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css +5 -4
  268. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
  269. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +703 -295
  270. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js +361 -602
  271. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js +1 -103
  272. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +365 -285
  273. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf +0 -0
  274. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
  275. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +4 -3
  276. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js +1 -1
  277. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +7 -2
  278. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js +1 -1
  279. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +1 -4
  280. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
  281. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +148 -239
  282. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js +1 -5
  283. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
  284. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +4 -0
  285. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +18 -6
  286. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js +1 -16
  287. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +17 -16
  288. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
  289. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +55 -38
  290. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js +3 -9
  291. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js +1 -63
  292. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +515 -398
  293. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
  294. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +122 -112
  295. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +16 -14
  296. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
  297. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +1364 -1139
  298. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +44 -11
  299. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +18 -18
  300. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +15 -14
  301. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js +1 -74
  302. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +11 -11
  303. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +12 -9
  304. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +54 -53
  305. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js +1 -1
  306. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js +1 -15
  307. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
  308. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +1 -1
  309. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -1
  310. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +36 -20
  311. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +6 -5
  312. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +6 -5
  313. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +6 -5
  314. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +5 -4
  315. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +9 -8
  316. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
  317. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +6 -6
  318. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +11 -10
  319. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +1 -16
  320. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +2 -12
  321. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +3 -5
  322. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +4 -13
  323. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js +1 -32
  324. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +3 -5
  325. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +5 -5
  326. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +39 -40
  327. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +10 -9
  328. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
  329. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +195 -54
  330. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +51 -51
  331. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
  332. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
  333. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  334. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
  335. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/pagebreak → themes/advanced}/img/pagebreak.gif +0 -0
  336. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
  337. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/realmedia.gif +0 -0
  338. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
  339. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/trans.gif +0 -0
  340. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif +0 -0
  341. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/windowsmedia.gif +0 -0
  342. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js +1 -0
  343. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +5 -0
  344. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +26 -6
  345. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js +108 -32
  346. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +12 -6
  347. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -7
  348. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js +6 -12
  349. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js +1 -62
  350. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -51
  351. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +27 -28
  352. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm +47 -0
  353. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +14 -1
  354. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
  355. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
  356. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
  357. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -4
  358. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -0
  359. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +105 -0
  360. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +102 -0
  361. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +12 -0
  362. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +1 -0
  363. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
  364. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
  365. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
  366. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +8 -6
  367. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +1 -1
  368. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +1 -1
  369. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +3 -3
  370. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js +1 -1
  371. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +1 -2
  372. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif +0 -0
  373. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js +1 -11
  374. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
  375. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
  376. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +7838 -5579
  377. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +1 -1
  378. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +14 -4
  379. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +95 -10
  380. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +35 -3
  381. data/public/skyline/javascripts/src/skyline/src/drag.js +10 -7
  382. data/public/skyline/javascripts/src/skyline/src/layout.js +13 -12
  383. data/public/skyline/javascripts/src/skyline/src/menubutton.js +1 -3
  384. data/public/skyline/javascripts/src/skyline/src/sortable.js +7 -5
  385. data/public/skyline/javascripts/src/skyline/src/tree.js +8 -4
  386. data/public/skyline/javascripts/src/skyline/test/sortable.html +73 -12
  387. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +485 -2
  388. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +130 -81
  389. data/public/skyline/stylesheets/general.css +23 -6
  390. data/skylinecms.gemspec +45 -0
  391. data/test/mocks/test_article.rb +11 -0
  392. data/test/mocks/test_section.rb +1 -1
  393. data/test/test_helper.rb +2 -1
  394. data/test/unit/article_test.rb +142 -0
  395. data/test/unit/inline_ref_test.rb +38 -16
  396. data/test/unit/test_content_object_test.rb +2 -1
  397. data/vendor/digitpaint/nested_attributes_positioning.rb +1 -1
  398. metadata +207 -487
  399. data/app/helpers/skyline/media_files_helper.rb +0 -7
  400. data/config/initializers/javascript_generator_methods.rb +0 -4
  401. data/config/initializers/rails_defaults.rb +0 -6
  402. data/doc/Bundler.md +0 -76
  403. data/lib/skyline/plugins_manager.rb +0 -150
  404. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +0 -84
  405. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css +0 -6
  406. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif +0 -0
  407. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
  408. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
  409. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
  410. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css +0 -1
  411. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif +0 -0
  412. data/rails/init.rb +0 -32
  413. data/vendor/digitpaint/personify/README.md +0 -86
  414. data/vendor/digitpaint/personify/lib/parser/personify.rb +0 -838
  415. data/vendor/digitpaint/personify/lib/parser/personify.treetop +0 -126
  416. data/vendor/digitpaint/personify/lib/parser/personify_node_classes.rb +0 -7
  417. data/vendor/digitpaint/personify/lib/template.rb +0 -16
  418. data/vendor/digitpaint/personify/personify.rb +0 -7
  419. data/vendor/digitpaint/personify/script/generate_parser.rb +0 -6
  420. data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +0 -8
  421. data/vendor/digitpaint/personify/test/parse_runner.rb +0 -25
  422. data/vendor/digitpaint/personify/test/parser_test.rb +0 -109
  423. data/vendor/digitpaint/personify/test/test_helper.rb +0 -16
  424. data/vendor/digitpaint/personify/vendor/treetop/.gitignore +0 -5
  425. data/vendor/digitpaint/personify/vendor/treetop/History.txt +0 -9
  426. data/vendor/digitpaint/personify/vendor/treetop/README +0 -164
  427. data/vendor/digitpaint/personify/vendor/treetop/Rakefile +0 -20
  428. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet +0 -20
  429. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet +0 -18
  430. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage +0 -251
  431. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/info.plist +0 -10
  432. data/vendor/digitpaint/personify/vendor/treetop/bin/tt +0 -28
  433. data/vendor/digitpaint/personify/vendor/treetop/doc/contributing_and_planned_features.markdown +0 -103
  434. data/vendor/digitpaint/personify/vendor/treetop/doc/grammar_composition.markdown +0 -65
  435. data/vendor/digitpaint/personify/vendor/treetop/doc/index.markdown +0 -90
  436. data/vendor/digitpaint/personify/vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown +0 -51
  437. data/vendor/digitpaint/personify/vendor/treetop/doc/semantic_interpretation.markdown +0 -189
  438. data/vendor/digitpaint/personify/vendor/treetop/doc/site.rb +0 -110
  439. data/vendor/digitpaint/personify/vendor/treetop/doc/sitegen.rb +0 -60
  440. data/vendor/digitpaint/personify/vendor/treetop/doc/syntactic_recognition.markdown +0 -100
  441. data/vendor/digitpaint/personify/vendor/treetop/doc/using_in_ruby.markdown +0 -21
  442. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.rb +0 -551
  443. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.treetop +0 -97
  444. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_node_classes.rb +0 -7
  445. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_test.rb +0 -54
  446. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus +0 -0
  447. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.rb +0 -718
  448. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.treetop +0 -132
  449. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_node_classes.rb +0 -5
  450. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_test.rb +0 -89
  451. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/test_helper.rb +0 -18
  452. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop.rb +0 -11
  453. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb +0 -45
  454. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler.rb +0 -6
  455. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb +0 -40
  456. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb +0 -17
  457. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.rb +0 -2955
  458. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.treetop +0 -404
  459. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes.rb +0 -19
  460. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb +0 -20
  461. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb +0 -14
  462. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb +0 -22
  463. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb +0 -31
  464. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb +0 -24
  465. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb +0 -28
  466. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb +0 -27
  467. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb +0 -13
  468. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb +0 -19
  469. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb +0 -9
  470. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb +0 -138
  471. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb +0 -55
  472. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb +0 -45
  473. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb +0 -55
  474. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb +0 -68
  475. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb +0 -20
  476. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb +0 -9
  477. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb +0 -9
  478. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/ruby_builder.rb +0 -113
  479. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions.rb +0 -2
  480. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions/string.rb +0 -42
  481. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime.rb +0 -5
  482. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/compiled_parser.rb +0 -95
  483. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb +0 -4
  484. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb +0 -15
  485. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb +0 -200
  486. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb +0 -164
  487. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/syntax_node.rb +0 -72
  488. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb +0 -16
  489. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb +0 -17
  490. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/version.rb +0 -9
  491. data/vendor/digitpaint/personify/vendor/treetop/script/generate_metagrammar.rb +0 -14
  492. data/vendor/digitpaint/personify/vendor/treetop/script/svnadd +0 -11
  493. data/vendor/digitpaint/personify/vendor/treetop/script/svnrm +0 -11
  494. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/and_predicate_spec.rb +0 -36
  495. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/anything_symbol_spec.rb +0 -52
  496. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/character_class_spec.rb +0 -188
  497. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/choice_spec.rb +0 -80
  498. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/circular_compilation_spec.rb +0 -28
  499. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb +0 -21
  500. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_compiler_spec.rb +0 -84
  501. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_spec.rb +0 -41
  502. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb +0 -40
  503. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/not_predicate_spec.rb +0 -38
  504. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/one_or_more_spec.rb +0 -35
  505. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/optional_spec.rb +0 -37
  506. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb +0 -19
  507. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parsing_rule_spec.rb +0 -32
  508. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/sequence_spec.rb +0 -115
  509. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_spec.rb +0 -81
  510. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_symbol_spec.rb +0 -37
  511. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.treetop +0 -7
  512. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.tt +0 -7
  513. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar_do.treetop +0 -7
  514. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/zero_or_more_spec.rb +0 -56
  515. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/a.treetop +0 -11
  516. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/b.treetop +0 -11
  517. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/c.treetop +0 -10
  518. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/d.treetop +0 -10
  519. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/grammar_composition_spec.rb +0 -26
  520. data/vendor/digitpaint/personify/vendor/treetop/spec/ruby_extensions/string_spec.rb +0 -32
  521. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/compiled_parser_spec.rb +0 -101
  522. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb +0 -147
  523. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb +0 -349
  524. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb +0 -385
  525. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb +0 -660
  526. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle +0 -6175
  527. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb +0 -58
  528. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb +0 -23
  529. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb +0 -164
  530. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb +0 -84
  531. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/syntax_node_spec.rb +0 -53
  532. data/vendor/digitpaint/personify/vendor/treetop/spec/spec_helper.rb +0 -106
  533. data/vendor/digitpaint/personify/vendor/treetop/spec/spec_suite.rb +0 -4
  534. data/vendor/digitpaint/personify/vendor/treetop/treetop.gemspec +0 -18
  535. data/vendor/mootools-on-rails/README +0 -54
  536. data/vendor/mootools-on-rails/Rakefile +0 -22
  537. data/vendor/mootools-on-rails/lib/mootools_on_rails.rb +0 -30
  538. data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +0 -510
  539. data/vendor/mootools-on-rails/test/mootools_helper_test.rb +0 -138
  540. data/vendor/mootools-on-rails/test/test_helper.rb +0 -5
@@ -1,5 +1 @@
1
- tinyMCE.addI18n('en.paste_dlg',{
2
- text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
3
- text_linebreaks:"Keep linebreaks",
4
- word_title:"Use CTRL+V on your keyboard to paste the text into the window."
5
- });
1
+ tinyMCE.addI18n('en.paste_dlg',{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."});
@@ -1 +1 @@
1
- (function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
1
+ (function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
@@ -12,6 +12,10 @@
12
12
  tinymce.create('tinymce.plugins.SearchReplacePlugin', {
13
13
  init : function(ed, url) {
14
14
  function open(m) {
15
+ // Keep IE from writing out the f/r character to the editor
16
+ // instance while initializing a new dialog. See: #3131190
17
+ window.focus();
18
+
15
19
  ed.windowManager.open({
16
20
  file : url + '/searchreplace.htm',
17
21
  width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),
@@ -2,14 +2,18 @@ tinyMCEPopup.requireLangPack();
2
2
 
3
3
  var SearchReplaceDialog = {
4
4
  init : function(ed) {
5
- var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
5
+ var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
6
6
 
7
- this.switchMode(m);
7
+ t.switchMode(m);
8
8
 
9
9
  f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
10
10
 
11
11
  // Focus input field
12
12
  f[m + '_panel_searchstring'].focus();
13
+
14
+ mcTabs.onChange.add(function(tab_id, panel_id) {
15
+ t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));
16
+ });
13
17
  },
14
18
 
15
19
  switchMode : function(m) {
@@ -42,21 +46,23 @@ var SearchReplaceDialog = {
42
46
  ca = f[m + '_panel_casesensitivebox'].checked;
43
47
  rs = f['replace_panel_replacestring'].value;
44
48
 
49
+ if (tinymce.isIE) {
50
+ r = ed.getDoc().selection.createRange();
51
+ }
52
+
45
53
  if (s == '')
46
54
  return;
47
55
 
48
56
  function fix() {
49
57
  // Correct Firefox graphics glitches
58
+ // TODO: Verify if this is actually needed any more, maybe it was for very old FF versions?
50
59
  r = se.getRng().cloneRange();
51
60
  ed.getDoc().execCommand('SelectAll', false, null);
52
61
  se.setRng(r);
53
62
  };
54
63
 
55
64
  function replace() {
56
- if (tinymce.isIE)
57
- ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE
58
- else
59
- ed.getDoc().execCommand('InsertHTML', false, rs);
65
+ ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE
60
66
  };
61
67
 
62
68
  // IE flags
@@ -70,6 +76,9 @@ var SearchReplaceDialog = {
70
76
  ed.selection.collapse(true);
71
77
 
72
78
  if (tinymce.isIE) {
79
+ ed.focus();
80
+ r = ed.getDoc().selection.createRange();
81
+
73
82
  while (r.findText(s, b ? -1 : 1, fl)) {
74
83
  r.scrollIntoView();
75
84
  r.select();
@@ -111,6 +120,9 @@ var SearchReplaceDialog = {
111
120
  return;
112
121
 
113
122
  if (tinymce.isIE) {
123
+ ed.focus();
124
+ r = ed.getDoc().selection.createRange();
125
+
114
126
  if (r.findText(s, b ? -1 : 1, fl)) {
115
127
  r.scrollIntoView();
116
128
  r.select();
@@ -1,16 +1 @@
1
- tinyMCE.addI18n('en.searchreplace_dlg',{
2
- searchnext_desc:"Find again",
3
- notfound:"The search has been completed. The search string could not be found.",
4
- search_title:"Find",
5
- replace_title:"Find/Replace",
6
- allreplaced:"All occurrences of the search string were replaced.",
7
- findwhat:"Find what",
8
- replacewith:"Replace with",
9
- direction:"Direction",
10
- up:"Up",
11
- down:"Down",
12
- mcase:"Match case",
13
- findnext:"Find next",
14
- replace:"Replace",
15
- replaceall:"Replace all"
16
- });
1
+ tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
@@ -8,27 +8,28 @@
8
8
  <script type="text/javascript" src="js/searchreplace.js"></script>
9
9
  <link rel="stylesheet" type="text/css" href="css/searchreplace.css" />
10
10
  </head>
11
- <body style="display:none;">
11
+ <body style="display:none;" role="application" aria-labelledby="app_title">
12
+ <span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>
12
13
  <form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">
13
14
  <div class="tabs">
14
15
  <ul>
15
- <li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
16
- <li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
16
+ <li id="search_tab" aria-controls="search_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
17
+ <li id="replace_tab" aria-controls="replace_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
17
18
  </ul>
18
19
  </div>
19
20
 
20
21
  <div class="panel_wrapper">
21
22
  <div id="search_panel" class="panel">
22
- <table border="0" cellspacing="0" cellpadding="2">
23
+ <table role="presentation" border="0" cellspacing="0" cellpadding="2">
23
24
  <tr>
24
25
  <td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
25
- <td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>
26
+ <td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" aria-required="true" /></td>
26
27
  </tr>
27
28
  <tr>
28
29
  <td colspan="2">
29
- <table border="0" cellspacing="0" cellpadding="0" class="direction">
30
- <tr>
31
- <td><label>{#searchreplace_dlg.direction}</label></td>
30
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">
31
+ <tr role="group" aria-labelledby="search_panel_backwards_label">
32
+ <td><label id="search_panel_backwards_label">{#searchreplace_dlg.direction}</label></td>
32
33
  <td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>
33
34
  <td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
34
35
  <td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>
@@ -39,7 +40,7 @@
39
40
  </tr>
40
41
  <tr>
41
42
  <td colspan="2">
42
- <table border="0" cellspacing="0" cellpadding="0">
43
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
43
44
  <tr>
44
45
  <td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
45
46
  <td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
@@ -51,20 +52,20 @@
51
52
  </div>
52
53
 
53
54
  <div id="replace_panel" class="panel">
54
- <table border="0" cellspacing="0" cellpadding="2">
55
+ <table role="presentation" border="0" cellspacing="0" cellpadding="2">
55
56
  <tr>
56
57
  <td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
57
- <td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>
58
+ <td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" aria-required="true" /></td>
58
59
  </tr>
59
60
  <tr>
60
61
  <td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>
61
- <td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>
62
+ <td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" aria-required="true" /></td>
62
63
  </tr>
63
64
  <tr>
64
65
  <td colspan="2">
65
- <table border="0" cellspacing="0" cellpadding="0" class="direction">
66
- <tr>
67
- <td><label>{#searchreplace_dlg.direction}</label></td>
66
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">
67
+ <tr role="group" aria-labelledby="replace_panel_dir_label">
68
+ <td><label id="replace_panel_dir_label">{#searchreplace_dlg.direction}</label></td>
68
69
  <td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>
69
70
  <td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
70
71
  <td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>
@@ -75,7 +76,7 @@
75
76
  </tr>
76
77
  <tr>
77
78
  <td colspan="2">
78
- <table border="0" cellspacing="0" cellpadding="0">
79
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
79
80
  <tr>
80
81
  <td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
81
82
  <td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
@@ -1 +1 @@
1
- (function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});e.onInit.add(function(){if(e.settings.content_css!==false){e.dom.loadCSS(f+"/css/content.css")}});e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}����������������\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(o){var i,h,g,f,e,n="",k=this.editor,p=this._getSeparators(),j=k.dom,d=[];var l=k.selection,m=l.getBookmark();c(o,function(q){n+=(n?"|":"")+q});i=new RegExp("(["+p+"])("+n+")(["+p+"])","g");h=new RegExp("^("+n+")","g");g=new RegExp("("+n+")(["+p+"]?)$","g");f=new RegExp("^("+n+")(["+p+"]?)$","g");e=new RegExp("("+n+")(["+p+"])","g");this._walk(this.editor.getBody(),function(q){if(q.nodeType==3){d.push(q)}});c(d,function(r){var q;if(r.nodeType==3){q=r.nodeValue;if(i.test(q)||h.test(q)||g.test(q)||f.test(q)){q=j.encode(q);q=q.replace(e,'<span class="mceItemHiddenSpellWord">$1</span>$2');q=q.replace(g,'<span class="mceItemHiddenSpellWord">$1</span>$2');j.replace(j.create("span",{"class":"mceItemHidden"},q),r)}}});l.moveToBookmark(m)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){l=b.getPos(h.getContentAreaContainer());d=h.controlManager.createDropMenu("spellcheckermenu",{offset_x:l.x,offset_y:l.y,"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
1
+ (function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}����������������\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(l){var g=this.editor,f=g.dom,j=g.getDoc(),h=g.selection,i=h.getBookmark(),d=[],k=l.join("|"),m=this._getSeparators(),e=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(g.getBody(),function(o){if(o.nodeType==3){d.push(o)}});c(d,function(t){var r,q,o,s,p=t.nodeValue;if(e.test(p)){p=f.encode(p);q=f.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(e,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(f.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(f.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(f.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(e,'$1<span class="mceItemHiddenSpellWord">$2</span>')}f.replace(q,t)}});h.moveToBookmark(i)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
@@ -70,10 +70,8 @@
70
70
  t._done();
71
71
  });
72
72
 
73
- ed.onInit.add(function() {
74
- if (ed.settings.content_css !== false)
75
- ed.dom.loadCSS(url + '/css/content.css');
76
- });
73
+ if (ed.settings.content_css !== false)
74
+ ed.contentCSS.push(url + '/css/content.css');
77
75
 
78
76
  ed.onClick.add(t._showMenu, t);
79
77
  ed.onContextMenu.add(t._showMenu, t);
@@ -132,6 +130,9 @@
132
130
  var o = {icon : 1}, mi;
133
131
 
134
132
  o.onclick = function() {
133
+ if (v == t.selectedLang) {
134
+ return;
135
+ }
135
136
  mi.setSelected(1);
136
137
  t.selectedItem.setSelected(0);
137
138
  t.selectedItem = mi;
@@ -220,21 +221,11 @@
220
221
  },
221
222
 
222
223
  _markWords : function(wl) {
223
- var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];
224
- var se = ed.selection, b = se.getBookmark();
225
-
226
- each(wl, function(v) {
227
- w += (w ? '|' : '') + v;
228
- });
229
-
230
- r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
231
- r2 = new RegExp('^(' + w + ')', 'g');
232
- r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
233
- r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
234
- r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
224
+ var ed = this.editor, dom = ed.dom, doc = ed.getDoc(), se = ed.selection, b = se.getBookmark(), nl = [],
225
+ w = wl.join('|'), re = this._getSeparators(), rx = new RegExp('(^|[' + re + '])(' + w + ')(?=[' + re + ']|$)', 'g');
235
226
 
236
227
  // Collect all text nodes
237
- this._walk(this.editor.getBody(), function(n) {
228
+ this._walk(ed.getBody(), function(n) {
238
229
  if (n.nodeType == 3) {
239
230
  nl.push(n);
240
231
  }
@@ -242,18 +233,49 @@
242
233
 
243
234
  // Wrap incorrect words in spans
244
235
  each(nl, function(n) {
245
- var v;
246
-
247
- if (n.nodeType == 3) {
248
- v = n.nodeValue;
249
-
250
- if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {
251
- v = dom.encode(v);
252
- v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
253
- v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
254
-
255
- dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);
236
+ var node, elem, txt, pos, v = n.nodeValue;
237
+
238
+ if (rx.test(v)) {
239
+ // Encode the content
240
+ v = dom.encode(v);
241
+ // Create container element
242
+ elem = dom.create('span', {'class' : 'mceItemHidden'});
243
+
244
+ // Following code fixes IE issues by creating text nodes
245
+ // using DOM methods instead of innerHTML.
246
+ // Bug #3124: <PRE> elements content is broken after spellchecking.
247
+ // Bug #1408: Preceding whitespace characters are removed
248
+ // @TODO: I'm not sure that both are still issues on IE9.
249
+ if (tinymce.isIE) {
250
+ // Enclose mispelled words with temporal tag
251
+ v = v.replace(rx, '$1<mcespell>$2</mcespell>');
252
+ // Loop over the content finding mispelled words
253
+ while ((pos = v.indexOf('<mcespell>')) != -1) {
254
+ // Add text node for the content before the word
255
+ txt = v.substring(0, pos);
256
+ if (txt.length) {
257
+ node = doc.createTextNode(dom.decode(txt));
258
+ elem.appendChild(node);
259
+ }
260
+ v = v.substring(pos+10);
261
+ pos = v.indexOf('</mcespell>');
262
+ txt = v.substring(0, pos);
263
+ v = v.substring(pos+11);
264
+ // Add span element for the word
265
+ elem.appendChild(dom.create('span', {'class' : 'mceItemHiddenSpellWord'}, txt));
266
+ }
267
+ // Add text node for the rest of the content
268
+ if (v.length) {
269
+ node = doc.createTextNode(dom.decode(v));
270
+ elem.appendChild(node);
271
+ }
272
+ } else {
273
+ // Other browsers preserve whitespace characters on innerHTML usage
274
+ elem.innerHTML = v.replace(rx, '$1<span class="mceItemHiddenSpellWord">$2</span>');
256
275
  }
276
+
277
+ // Finally, replace the node with the container
278
+ dom.replace(elem, n);
257
279
  }
258
280
  });
259
281
 
@@ -266,15 +288,7 @@
266
288
  e = 0; // Fixes IE memory leak
267
289
 
268
290
  if (!m) {
269
- p1 = DOM.getPos(ed.getContentAreaContainer());
270
- //p2 = DOM.getPos(ed.getContainer());
271
-
272
- m = ed.controlManager.createDropMenu('spellcheckermenu', {
273
- offset_x : p1.x,
274
- offset_y : p1.y,
275
- 'class' : 'mceNoIcons'
276
- });
277
-
291
+ m = ed.controlManager.createDropMenu('spellcheckermenu', {'class' : 'mceNoIcons'});
278
292
  t._menu = m;
279
293
  }
280
294
 
@@ -337,7 +351,6 @@
337
351
  }
338
352
  });
339
353
 
340
-
341
354
  if (t.editor.getParam("spellchecker_enable_learn_rpc")) {
342
355
  m.add({
343
356
  title : 'spellchecker.learn_word',
@@ -358,6 +371,10 @@
358
371
  m.update();
359
372
  });
360
373
 
374
+ p1 = DOM.getPos(ed.getContentAreaContainer());
375
+ m.settings.offset_x = p1.x;
376
+ m.settings.offset_y = p1.y;
377
+
361
378
  ed.selection.select(wordSpan);
362
379
  p1 = dom.getPos(wordSpan);
363
380
  m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);
@@ -177,11 +177,7 @@ function setupFormData() {
177
177
 
178
178
  f.box_height.value = getNum(ce.style.height);
179
179
  selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
180
-
181
- if (tinymce.isGecko)
182
- selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
183
- else
184
- selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
180
+ selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);
185
181
 
186
182
  selectByValue(f, 'box_clear', ce.style.clear, true, true);
187
183
 
@@ -376,7 +372,7 @@ function applyAction() {
376
372
  generateCSS();
377
373
 
378
374
  tinyMCEPopup.restoreSelection();
379
- ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
375
+ ed.dom.setAttrib(ed.selection.getSelectedBlocks(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
380
376
  }
381
377
 
382
378
  function updateAction() {
@@ -440,9 +436,7 @@ function generateCSS() {
440
436
  ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
441
437
  ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
442
438
  ce.style.styleFloat = f.box_float.value;
443
-
444
- if (tinymce.isGecko)
445
- ce.style.cssFloat = f.box_float.value;
439
+ ce.style.cssFloat = f.box_float.value;
446
440
 
447
441
  ce.style.clear = f.box_clear.value;
448
442
 
@@ -1,63 +1 @@
1
- tinyMCE.addI18n('en.style_dlg',{
2
- title:"Edit CSS Style",
3
- apply:"Apply",
4
- text_tab:"Text",
5
- background_tab:"Background",
6
- block_tab:"Block",
7
- box_tab:"Box",
8
- border_tab:"Border",
9
- list_tab:"List",
10
- positioning_tab:"Positioning",
11
- text_props:"Text",
12
- text_font:"Font",
13
- text_size:"Size",
14
- text_weight:"Weight",
15
- text_style:"Style",
16
- text_variant:"Variant",
17
- text_lineheight:"Line height",
18
- text_case:"Case",
19
- text_color:"Color",
20
- text_decoration:"Decoration",
21
- text_overline:"overline",
22
- text_underline:"underline",
23
- text_striketrough:"strikethrough",
24
- text_blink:"blink",
25
- text_none:"none",
26
- background_color:"Background color",
27
- background_image:"Background image",
28
- background_repeat:"Repeat",
29
- background_attachment:"Attachment",
30
- background_hpos:"Horizontal position",
31
- background_vpos:"Vertical position",
32
- block_wordspacing:"Word spacing",
33
- block_letterspacing:"Letter spacing",
34
- block_vertical_alignment:"Vertical alignment",
35
- block_text_align:"Text align",
36
- block_text_indent:"Text indent",
37
- block_whitespace:"Whitespace",
38
- block_display:"Display",
39
- box_width:"Width",
40
- box_height:"Height",
41
- box_float:"Float",
42
- box_clear:"Clear",
43
- padding:"Padding",
44
- same:"Same for all",
45
- top:"Top",
46
- right:"Right",
47
- bottom:"Bottom",
48
- left:"Left",
49
- margin:"Margin",
50
- style:"Style",
51
- width:"Width",
52
- height:"Height",
53
- color:"Color",
54
- list_type:"Type",
55
- bullet_image:"Bullet image",
56
- position:"Position",
57
- positioning_type:"Type",
58
- visibility:"Visibility",
59
- zindex:"Z-index",
60
- overflow:"Overflow",
61
- placement:"Placement",
62
- clip:"Clip"
63
- });
1
+ tinyMCE.addI18n('en.style_dlg',{"text_lineheight":"Line Height","text_variant":"Variant","text_style":"Style","text_weight":"Weight","text_size":"Size","text_font":"Font","text_props":"Text","positioning_tab":"Positioning","list_tab":"List","border_tab":"Border","box_tab":"Box","block_tab":"Block","background_tab":"Background","text_tab":"Text",apply:"Apply",title:"Edit CSS Style",clip:"Clip",placement:"Placement",overflow:"Overflow",zindex:"Z-index",visibility:"Visibility","positioning_type":"Type",position:"Position","bullet_image":"Bullet Image","list_type":"Type",color:"Color",height:"Height",width:"Width",style:"Style",margin:"Margin",left:"Left",bottom:"Bottom",right:"Right",top:"Top",same:"Same for All",padding:"Padding","box_clear":"Clear","box_float":"Float","box_height":"Height","box_width":"Width","block_display":"Display","block_whitespace":"Whitespace","block_text_indent":"Text Indent","block_text_align":"Text Align","block_vertical_alignment":"Vertical Alignment","block_letterspacing":"Letter Spacing","block_wordspacing":"Word Spacing","background_vpos":"Vertical Position","background_hpos":"Horizontal Position","background_attachment":"Attachment","background_repeat":"Repeat","background_image":"Background Image","background_color":"Background Color","text_none":"None","text_blink":"Blink","text_case":"Case","text_striketrough":"Strikethrough","text_underline":"Underline","text_overline":"Overline","text_decoration":"Decoration","text_color":"Color",text:"Text",background:"Background",block:"Block",box:"Box",border:"Border",list:"List"});
@@ -10,277 +10,319 @@
10
10
  <link href="css/props.css" rel="stylesheet" type="text/css" />
11
11
  </head>
12
12
 
13
- <body id="styleprops" style="display: none">
13
+ <body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
14
+ <span id="app_title" style="display:none">{#style_dlg.title}</span>
14
15
  <form onsubmit="updateAction();return false;" action="#">
15
16
  <div class="tabs">
16
17
  <ul>
17
- <li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
18
- <li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
19
- <li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
20
- <li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
21
- <li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
22
- <li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
23
- <li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
18
+ <li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
19
+ <li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
20
+ <li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
21
+ <li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
22
+ <li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
23
+ <li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
24
+ <li id="positioning_tab" aria-controls="positioning_panel"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
24
25
  </ul>
25
26
  </div>
26
27
 
27
28
  <div class="panel_wrapper">
28
29
  <div id="text_panel" class="panel current">
29
- <table border="0" width="100%">
30
- <tr>
31
- <td><label for="text_font">{#style_dlg.text_font}</label></td>
32
- <td colspan="3">
33
- <select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
34
- </td>
35
- </tr>
36
- <tr>
37
- <td><label for="text_size">{#style_dlg.text_size}</label></td>
38
- <td>
39
- <table border="0" cellspacing="0" cellpadding="0">
40
- <tr>
41
- <td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
42
- <td>&nbsp;</td>
43
- <td><select id="text_size_measurement" name="text_size_measurement"></select></td>
44
- </tr>
45
- </table>
46
- </td>
47
- <td><label for="text_weight">{#style_dlg.text_weight}</label></td>
48
- <td>
49
- <select id="text_weight" name="text_weight"></select>
50
- </td>
51
- </tr>
52
- <tr>
53
- <td><label for="text_style">{#style_dlg.text_style}</label></td>
54
- <td>
55
- <select id="text_style" name="text_style" class="mceEditableSelect"></select>
56
- </td>
57
- <td><label for="text_variant">{#style_dlg.text_variant}</label></td>
58
- <td>
59
- <select id="text_variant" name="text_variant"></select>
60
- </td>
61
- </tr>
62
- <tr>
63
- <td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
64
- <td>
65
- <table border="0" cellspacing="0" cellpadding="0">
66
- <tr>
67
- <td>
68
- <select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
69
- </td>
70
- <td>&nbsp;</td>
71
- <td><select id="text_lineheight_measurement" name="text_lineheight_measurement"></select></td>
72
- </tr>
73
- </table>
74
- </td>
75
- <td><label for="text_case">{#style_dlg.text_case}</label></td>
76
- <td>
77
- <select id="text_case" name="text_case"></select>
78
- </td>
79
- </tr>
80
- <tr>
81
- <td><label for="text_color">{#style_dlg.text_color}</label></td>
82
- <td colspan="2">
83
- <table border="0" cellpadding="0" cellspacing="0">
84
- <tr>
85
- <td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
86
- <td id="text_color_pickcontainer">&nbsp;</td>
87
- </tr>
88
- </table>
89
- </td>
90
- </tr>
91
- <tr>
92
- <td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
93
- <td colspan="2">
94
- <table border="0" cellspacing="0" cellpadding="0">
95
- <tr>
96
- <td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
97
- <td><label for="text_underline">{#style_dlg.text_underline}</label></td>
98
- </tr>
99
- <tr>
100
- <td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
101
- <td><label for="text_overline">{#style_dlg.text_overline}</label></td>
102
- </tr>
103
- <tr>
104
- <td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
105
- <td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
106
- </tr>
107
- <tr>
108
- <td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
109
- <td><label for="text_blink">{#style_dlg.text_blink}</label></td>
110
- </tr>
111
- <tr>
112
- <td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
113
- <td><label for="text_none">{#style_dlg.text_none}</label></td>
114
- </tr>
115
- </table>
116
- </td>
117
- </tr>
118
- </table>
30
+ <fieldset>
31
+ <legend>{#style_dlg.text}</legend>
32
+ <table role="presentation" border="0" width="100%">
33
+ <tr>
34
+ <td><label for="text_font">{#style_dlg.text_font}</label></td>
35
+ <td colspan="3">
36
+ <select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
37
+ </td>
38
+ </tr>
39
+ <tr>
40
+ <td><label for="text_size">{#style_dlg.text_size}</label></td>
41
+ <td>
42
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
43
+ <tr>
44
+ <td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
45
+ <td>&nbsp;</td>
46
+ <td>
47
+ <label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>
48
+ <select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></select>
49
+ </td>
50
+ </tr>
51
+ </table>
52
+ </td>
53
+ <td><label for="text_weight">{#style_dlg.text_weight}</label></td>
54
+ <td>
55
+ <select id="text_weight" name="text_weight"></select>
56
+ </td>
57
+ </tr>
58
+ <tr>
59
+ <td><label for="text_style">{#style_dlg.text_style}</label></td>
60
+ <td>
61
+ <select id="text_style" name="text_style" class="mceEditableSelect"></select>
62
+ </td>
63
+ <td><label for="text_variant">{#style_dlg.text_variant}</label></td>
64
+ <td>
65
+ <select id="text_variant" name="text_variant"></select>
66
+ </td>
67
+ </tr>
68
+ <tr>
69
+ <td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
70
+ <td>
71
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
72
+ <tr>
73
+ <td>
74
+ <select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
75
+ </td>
76
+ <td>&nbsp;</td>
77
+ <td>
78
+ <label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>
79
+ <select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></select>
80
+ </td>
81
+ </tr>
82
+ </table>
83
+ </td>
84
+ <td><label for="text_case">{#style_dlg.text_case}</label></td>
85
+ <td>
86
+ <select id="text_case" name="text_case"></select>
87
+ </td>
88
+ </tr>
89
+ <tr>
90
+ <td><label for="text_color">{#style_dlg.text_color}</label></td>
91
+ <td colspan="2">
92
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
93
+ <tr>
94
+ <td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
95
+ <td id="text_color_pickcontainer">&nbsp;</td>
96
+ </tr>
97
+ </table>
98
+ </td>
99
+ </tr>
100
+ <tr>
101
+ <td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
102
+ <td colspan="2">
103
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
104
+ <tr>
105
+ <td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
106
+ <td><label for="text_underline">{#style_dlg.text_underline}</label></td>
107
+ </tr>
108
+ <tr>
109
+ <td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
110
+ <td><label for="text_overline">{#style_dlg.text_overline}</label></td>
111
+ </tr>
112
+ <tr>
113
+ <td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
114
+ <td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
115
+ </tr>
116
+ <tr>
117
+ <td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
118
+ <td><label for="text_blink">{#style_dlg.text_blink}</label></td>
119
+ </tr>
120
+ <tr>
121
+ <td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
122
+ <td><label for="text_none">{#style_dlg.text_none}</label></td>
123
+ </tr>
124
+ </table>
125
+ </td>
126
+ </tr>
127
+ </table>
128
+ </fieldset>
119
129
  </div>
120
130
 
121
131
  <div id="background_panel" class="panel">
122
- <table border="0">
123
- <tr>
124
- <td><label for="background_color">{#style_dlg.background_color}</label></td>
125
- <td>
126
- <table border="0" cellpadding="0" cellspacing="0">
127
- <tr>
128
- <td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
129
- <td id="background_color_pickcontainer">&nbsp;</td>
132
+ <fieldset>
133
+ <legend>{#style_dlg.background}</legend>
134
+ <table role="presentation" border="0">
135
+ <tr>
136
+ <td><label for="background_color">{#style_dlg.background_color}</label></td>
137
+ <td>
138
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
139
+ <tr>
140
+ <td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
141
+ <td id="background_color_pickcontainer">&nbsp;</td>
142
+ </tr>
143
+ </table>
144
+ </td>
145
+ </tr>
146
+
147
+ <tr>
148
+ <td><label for="background_image">{#style_dlg.background_image}</label></td>
149
+ <td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
150
+ <tr>
151
+ <td><input id="background_image" name="background_image" type="text" /></td>
152
+ <td id="background_image_browser">&nbsp;</td>
130
153
  </tr>
131
- </table>
132
- </td>
133
- </tr>
154
+ </table>
155
+ </td>
156
+ </tr>
134
157
 
135
- <tr>
136
- <td><label for="background_image">{#style_dlg.background_image}</label></td>
137
- <td><table border="0" cellspacing="0" cellpadding="0">
138
- <tr>
139
- <td><input id="background_image" name="background_image" type="text" /></td>
140
- <td id="background_image_browser">&nbsp;</td>
141
- </tr>
142
- </table>
143
- </td>
144
- </tr>
158
+ <tr>
159
+ <td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
160
+ <td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
161
+ </tr>
145
162
 
146
- <tr>
147
- <td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
148
- <td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
149
- </tr>
163
+ <tr>
164
+ <td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
165
+ <td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
166
+ </tr>
150
167
 
151
- <tr>
152
- <td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
153
- <td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
154
- </tr>
168
+ <tr>
169
+ <td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
170
+ <td>
171
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
172
+ <tr>
173
+ <td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
174
+ <td>&nbsp;</td>
175
+ <td>
176
+ <label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>
177
+ <select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>
178
+ </td>
179
+ </tr>
180
+ </table>
181
+ </td>
182
+ </tr>
155
183
 
156
- <tr>
157
- <td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
158
- <td>
159
- <table border="0" cellspacing="0" cellpadding="0">
160
- <tr>
161
- <td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
162
- <td>&nbsp;</td>
163
- <td><select id="background_hpos_measurement" name="background_hpos_measurement"></select></td>
164
- </tr>
165
- </table>
166
- </td>
167
- </tr>
184
+ <tr>
185
+ <td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
186
+ <td>
187
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
188
+ <tr>
189
+ <td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
190
+ <td>&nbsp;</td>
191
+ <td>
168
192
 
169
- <tr>
170
- <td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
171
- <td>
172
- <table border="0" cellspacing="0" cellpadding="0">
173
- <tr>
174
- <td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
175
- <td>&nbsp;</td>
176
- <td><select id="background_vpos_measurement" name="background_vpos_measurement"></select></td>
177
- </tr>
178
- </table>
179
- </td>
180
- </tr>
181
- </table>
193
+ <label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>
194
+ <select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>
195
+ </tr>
196
+ </table>
197
+ </td>
198
+ </tr>
199
+ </table>
200
+ </fieldset>
182
201
  </div>
183
202
 
184
203
  <div id="block_panel" class="panel">
185
- <table border="0">
186
- <tr>
187
- <td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
188
- <td>
189
- <table border="0" cellspacing="0" cellpadding="0">
190
- <tr>
191
- <td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
192
- <td>&nbsp;</td>
193
- <td><select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select></td>
194
- </tr>
195
- </table>
196
- </td>
197
- </tr>
204
+ <fieldset>
205
+ <legend>{#style_dlg.block}</legend>
206
+ <table role="presentation" border="0">
207
+ <tr>
208
+ <td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
209
+ <td>
210
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
211
+ <tr>
212
+ <td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
213
+ <td>&nbsp;</td>
214
+ <td>
215
+ <label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>
216
+ <select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></select>
217
+ </td>
218
+ </tr>
219
+ </table>
220
+ </td>
221
+ </tr>
198
222
 
199
- <tr>
200
- <td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
201
- <td>
202
- <table border="0" cellspacing="0" cellpadding="0">
203
- <tr>
204
- <td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
205
- <td>&nbsp;</td>
206
- <td><select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select></td>
207
- </tr>
208
- </table>
209
- </td>
210
- </tr>
223
+ <tr>
224
+ <td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
225
+ <td>
226
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
227
+ <tr>
228
+ <td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
229
+ <td>&nbsp;</td>
230
+ <td>
231
+ <label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>
232
+ <select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></select>
233
+ </td>
234
+ </tr>
235
+ </table>
236
+ </td>
237
+ </tr>
211
238
 
212
- <tr>
213
- <td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
214
- <td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
215
- </tr>
239
+ <tr>
240
+ <td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
241
+ <td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
242
+ </tr>
216
243
 
217
- <tr>
218
- <td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
219
- <td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
220
- </tr>
244
+ <tr>
245
+ <td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
246
+ <td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
247
+ </tr>
221
248
 
222
- <tr>
223
- <td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
224
- <td>
225
- <table border="0" cellspacing="0" cellpadding="0">
226
- <tr>
227
- <td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
228
- <td>&nbsp;</td>
229
- <td><select id="block_text_indent_measurement" name="block_text_indent_measurement"></select></td>
230
- </tr>
231
- </table>
232
- </td>
233
- </tr>
249
+ <tr>
250
+ <td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
251
+ <td>
252
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
253
+ <tr>
254
+ <td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
255
+ <td>&nbsp;</td>
256
+ <td>
257
+ <label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>
234
258
 
235
- <tr>
236
- <td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
237
- <td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
238
- </tr>
259
+ <select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>
260
+ </td>
261
+ </tr>
262
+ </table>
263
+ </td>
264
+ </tr>
239
265
 
240
- <tr>
241
- <td><label for="block_display">{#style_dlg.block_display}</label></td>
242
- <td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
243
- </tr>
244
- </table>
266
+ <tr>
267
+ <td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
268
+ <td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
269
+ </tr>
270
+
271
+ <tr>
272
+ <td><label for="block_display">{#style_dlg.block_display}</label></td>
273
+ <td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
274
+ </tr>
275
+ </table>
276
+ </fieldset>
245
277
  </div>
246
278
 
247
279
  <div id="box_panel" class="panel">
248
- <table border="0">
249
- <tr>
250
- <td><label for="box_width">{#style_dlg.box_width}</label></td>
251
- <td>
252
- <table border="0" cellspacing="0" cellpadding="0">
253
- <tr>
254
- <td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
255
- <td>&nbsp;</td>
256
- <td><select id="box_width_measurement" name="box_width_measurement"></select></td>
257
- </tr>
258
- </table>
259
- </td>
260
- <td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
261
- <td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
262
- </tr>
280
+ <fieldset>
281
+ <legend>{#style_dlg.box}</legend>
282
+ <table role="presentation" border="0">
283
+ <tr>
284
+ <td><label for="box_width">{#style_dlg.box_width}</label></td>
285
+ <td>
286
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
287
+ <tr>
288
+ <td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
289
+ <td>&nbsp;</td>
290
+ <td>
291
+ <label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>
292
+ <select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></select>
293
+ </td>
294
+ </tr>
295
+ </table>
296
+ </td>
297
+ <td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
298
+ <td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
299
+ </tr>
300
+
301
+ <tr>
302
+ <td><label for="box_height">{#style_dlg.box_height}</label></td>
303
+ <td>
304
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
305
+ <tr>
306
+ <td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
307
+ <td>&nbsp;</td>
308
+ <td>
309
+ <label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>
310
+ <select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></select>
311
+ </td>
312
+ </tr>
313
+ </table>
314
+ </td>
315
+ <td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
316
+ <td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
317
+ </tr>
318
+ </table>
319
+ </fieldset>
263
320
 
264
- <tr>
265
- <td><label for="box_height">{#style_dlg.box_height}</label></td>
266
- <td>
267
- <table border="0" cellspacing="0" cellpadding="0">
268
- <tr>
269
- <td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
270
- <td>&nbsp;</td>
271
- <td><select id="box_height_measurement" name="box_height_measurement"></select></td>
272
- </tr>
273
- </table>
274
- </td>
275
- <td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
276
- <td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
277
- </tr>
278
- </table>
279
321
  <div style="float: left; width: 49%">
280
322
  <fieldset>
281
323
  <legend>{#style_dlg.padding}</legend>
282
324
 
283
- <table border="0">
325
+ <table role="presentation" border="0">
284
326
  <tr>
285
327
  <td>&nbsp;</td>
286
328
  <td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
@@ -288,11 +330,14 @@
288
330
  <tr>
289
331
  <td><label for="box_padding_top">{#style_dlg.top}</label></td>
290
332
  <td>
291
- <table border="0" cellspacing="0" cellpadding="0">
333
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
292
334
  <tr>
293
335
  <td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
294
336
  <td>&nbsp;</td>
295
- <td><select id="box_padding_top_measurement" name="box_padding_top_measurement"></select></td>
337
+ <td>
338
+ <label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>
339
+ <select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>
340
+ </td>
296
341
  </tr>
297
342
  </table>
298
343
  </td>
@@ -300,11 +345,14 @@
300
345
  <tr>
301
346
  <td><label for="box_padding_right">{#style_dlg.right}</label></td>
302
347
  <td>
303
- <table border="0" cellspacing="0" cellpadding="0">
348
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
304
349
  <tr>
305
350
  <td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
306
351
  <td>&nbsp;</td>
307
- <td><select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select></td>
352
+ <td>
353
+ <label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>
354
+ <select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>
355
+ </td>
308
356
  </tr>
309
357
  </table>
310
358
  </td>
@@ -312,11 +360,14 @@
312
360
  <tr>
313
361
  <td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
314
362
  <td>
315
- <table border="0" cellspacing="0" cellpadding="0">
363
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
316
364
  <tr>
317
365
  <td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
318
366
  <td>&nbsp;</td>
319
- <td><select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select></td>
367
+ <td>
368
+ <label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>
369
+ <select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>
370
+ </td>
320
371
  </tr>
321
372
  </table>
322
373
  </td>
@@ -324,11 +375,14 @@
324
375
  <tr>
325
376
  <td><label for="box_padding_left">{#style_dlg.left}</label></td>
326
377
  <td>
327
- <table border="0" cellspacing="0" cellpadding="0">
378
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
328
379
  <tr>
329
380
  <td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
330
381
  <td>&nbsp;</td>
331
- <td><select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select></td>
382
+ <td>
383
+ <label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>
384
+ <select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>
385
+ </td>
332
386
  </tr>
333
387
  </table>
334
388
  </td>
@@ -341,7 +395,7 @@
341
395
  <fieldset>
342
396
  <legend>{#style_dlg.margin}</legend>
343
397
 
344
- <table border="0">
398
+ <table role="presentation" border="0">
345
399
  <tr>
346
400
  <td>&nbsp;</td>
347
401
  <td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
@@ -349,11 +403,14 @@
349
403
  <tr>
350
404
  <td><label for="box_margin_top">{#style_dlg.top}</label></td>
351
405
  <td>
352
- <table border="0" cellspacing="0" cellpadding="0">
406
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
353
407
  <tr>
354
408
  <td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
355
409
  <td>&nbsp;</td>
356
- <td><select id="box_margin_top_measurement" name="box_margin_top_measurement"></select></td>
410
+ <td>
411
+ <label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>
412
+ <select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>
413
+ </td>
357
414
  </tr>
358
415
  </table>
359
416
  </td>
@@ -361,11 +418,14 @@
361
418
  <tr>
362
419
  <td><label for="box_margin_right">{#style_dlg.right}</label></td>
363
420
  <td>
364
- <table border="0" cellspacing="0" cellpadding="0">
421
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
365
422
  <tr>
366
423
  <td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
367
424
  <td>&nbsp;</td>
368
- <td><select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select></td>
425
+ <td>
426
+ <label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>
427
+ <select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>
428
+ </td>
369
429
  </tr>
370
430
  </table>
371
431
  </td>
@@ -373,11 +433,14 @@
373
433
  <tr>
374
434
  <td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
375
435
  <td>
376
- <table border="0" cellspacing="0" cellpadding="0">
436
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
377
437
  <tr>
378
438
  <td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
379
439
  <td>&nbsp;</td>
380
- <td><select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select></td>
440
+ <td>
441
+ <label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>
442
+ <select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>
443
+ </td>
381
444
  </tr>
382
445
  </table>
383
446
  </td>
@@ -385,11 +448,14 @@
385
448
  <tr>
386
449
  <td><label for="box_margin_left">{#style_dlg.left}</label></td>
387
450
  <td>
388
- <table border="0" cellspacing="0" cellpadding="0">
451
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
389
452
  <tr>
390
453
  <td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
391
454
  <td>&nbsp;</td>
392
- <td><select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select></td>
455
+ <td>
456
+ <label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>
457
+ <select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>
458
+ </td>
393
459
  </tr>
394
460
  </table>
395
461
  </td>
@@ -401,131 +467,148 @@
401
467
  </div>
402
468
 
403
469
  <div id="border_panel" class="panel">
404
- <table border="0" cellspacing="0" cellpadding="0" width="100%">
405
- <tr>
406
- <td class="tdelim">&nbsp;</td>
407
- <td class="tdelim delim">&nbsp;</td>
408
- <td class="tdelim">{#style_dlg.style}</td>
409
- <td class="tdelim delim">&nbsp;</td>
410
- <td class="tdelim">{#style_dlg.width}</td>
411
- <td class="tdelim delim">&nbsp;</td>
412
- <td class="tdelim">{#style_dlg.color}</td>
413
- </tr>
414
-
415
- <tr>
416
- <td>&nbsp;</td>
417
- <td class="delim">&nbsp;</td>
418
- <td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
419
- <td class="delim">&nbsp;</td>
420
- <td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
421
- <td class="delim">&nbsp;</td>
422
- <td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
423
- </tr>
424
-
425
- <tr>
426
- <td>{#style_dlg.top}</td>
427
- <td class="delim">&nbsp;</td>
428
- <td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
429
- <td class="delim">&nbsp;</td>
430
- <td>
431
- <table border="0" cellspacing="0" cellpadding="0">
432
- <tr>
433
- <td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
434
- <td>&nbsp;</td>
435
- <td><select id="border_width_top_measurement" name="border_width_top_measurement"></select></td>
436
- </tr>
437
- </table>
438
- </td>
439
- <td class="delim">&nbsp;</td>
440
- <td>
441
- <table border="0" cellpadding="0" cellspacing="0">
442
- <tr>
443
- <td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
444
- <td id="border_color_top_pickcontainer">&nbsp;</td>
445
- </tr>
446
- </table>
447
- </td>
448
- </tr>
449
-
450
- <tr>
451
- <td>{#style_dlg.right}</td>
452
- <td class="delim">&nbsp;</td>
453
- <td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
454
- <td class="delim">&nbsp;</td>
455
- <td>
456
- <table border="0" cellspacing="0" cellpadding="0">
457
- <tr>
458
- <td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
459
- <td>&nbsp;</td>
460
- <td><select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select></td>
461
- </tr>
462
- </table>
463
- </td>
464
- <td class="delim">&nbsp;</td>
465
- <td>
466
- <table border="0" cellpadding="0" cellspacing="0">
467
- <tr>
468
- <td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
469
- <td id="border_color_right_pickcontainer">&nbsp;</td>
470
- </tr>
471
- </table>
472
- </td>
473
- </tr>
474
-
475
- <tr>
476
- <td>{#style_dlg.bottom}</td>
477
- <td class="delim">&nbsp;</td>
478
- <td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
479
- <td class="delim">&nbsp;</td>
480
- <td>
481
- <table border="0" cellspacing="0" cellpadding="0">
482
- <tr>
483
- <td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
484
- <td>&nbsp;</td>
485
- <td><select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select></td>
486
- </tr>
487
- </table>
488
- </td>
489
- <td class="delim">&nbsp;</td>
490
- <td>
491
- <table border="0" cellpadding="0" cellspacing="0">
492
- <tr>
493
- <td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
494
- <td id="border_color_bottom_pickcontainer">&nbsp;</td>
495
- </tr>
496
- </table>
497
- </td>
498
- </tr>
499
-
500
- <tr>
501
- <td>{#style_dlg.left}</td>
502
- <td class="delim">&nbsp;</td>
503
- <td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
504
- <td class="delim">&nbsp;</td>
505
- <td>
506
- <table border="0" cellspacing="0" cellpadding="0">
507
- <tr>
508
- <td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
509
- <td>&nbsp;</td>
510
- <td><select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select></td>
511
- </tr>
512
- </table>
513
- </td>
514
- <td class="delim">&nbsp;</td>
515
- <td>
516
- <table border="0" cellpadding="0" cellspacing="0">
517
- <tr>
518
- <td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
519
- <td id="border_color_left_pickcontainer">&nbsp;</td>
520
- </tr>
470
+ <fieldset>
471
+ <legend>{#style_dlg.border}</legend>
472
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">
473
+ <tr>
474
+ <td class="tdelim">&nbsp;</td>
475
+ <td class="tdelim delim">&nbsp;</td>
476
+ <td class="tdelim">{#style_dlg.style}</td>
477
+ <td class="tdelim delim">&nbsp;</td>
478
+ <td class="tdelim">{#style_dlg.width}</td>
479
+ <td class="tdelim delim">&nbsp;</td>
480
+ <td class="tdelim">{#style_dlg.color}</td>
481
+ </tr>
482
+
483
+ <tr>
484
+ <td>&nbsp;</td>
485
+ <td class="delim">&nbsp;</td>
486
+ <td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
487
+ <td class="delim">&nbsp;</td>
488
+ <td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
489
+ <td class="delim">&nbsp;</td>
490
+ <td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
491
+ </tr>
492
+
493
+ <tr>
494
+ <td>{#style_dlg.top}</td>
495
+ <td class="delim">&nbsp;</td>
496
+ <td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
497
+ <td class="delim">&nbsp;</td>
498
+ <td>
499
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
500
+ <tr>
501
+ <td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
502
+ <td>&nbsp;</td>
503
+ <td>
504
+ <label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>
505
+ <select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>
506
+ </td>
507
+ </tr>
508
+ </table>
509
+ </td>
510
+ <td class="delim">&nbsp;</td>
511
+ <td>
512
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
513
+ <tr>
514
+ <td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
515
+ <td id="border_color_top_pickcontainer">&nbsp;</td>
516
+ </tr>
517
+ </table>
518
+ </td>
519
+ </tr>
520
+
521
+ <tr>
522
+ <td>{#style_dlg.right}</td>
523
+ <td class="delim">&nbsp;</td>
524
+ <td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
525
+ <td class="delim">&nbsp;</td>
526
+ <td>
527
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
528
+ <tr>
529
+ <td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
530
+ <td>&nbsp;</td>
531
+ <td>
532
+ <label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>
533
+ <select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>
534
+ </td>
535
+ </tr>
536
+ </table>
537
+ </td>
538
+ <td class="delim">&nbsp;</td>
539
+ <td>
540
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
541
+ <tr>
542
+ <td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
543
+ <td id="border_color_right_pickcontainer">&nbsp;</td>
544
+ </tr>
545
+ </table>
546
+ </td>
547
+ </tr>
548
+
549
+ <tr>
550
+ <td>{#style_dlg.bottom}</td>
551
+ <td class="delim">&nbsp;</td>
552
+ <td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
553
+ <td class="delim">&nbsp;</td>
554
+ <td>
555
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
556
+ <tr>
557
+ <td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
558
+ <td>&nbsp;</td>
559
+ <td>
560
+ <label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>
561
+ <select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>
562
+ </td>
563
+ </tr>
564
+ </table>
565
+ </td>
566
+ <td class="delim">&nbsp;</td>
567
+ <td>
568
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
569
+ <tr>
570
+ <td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
571
+ <td id="border_color_bottom_pickcontainer">&nbsp;</td>
572
+ </tr>
573
+ </table>
574
+ </td>
575
+ </tr>
576
+
577
+ <tr>
578
+ <td>{#style_dlg.left}</td>
579
+ <td class="delim">&nbsp;</td>
580
+ <td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
581
+ <td class="delim">&nbsp;</td>
582
+ <td>
583
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
584
+ <tr>
585
+ <td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
586
+ <td>&nbsp;</td>
587
+ <td>
588
+ <label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>
589
+ <select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>
590
+ </td>
591
+ </tr>
592
+ </table>
593
+ </td>
594
+ <td class="delim">&nbsp;</td>
595
+ <td>
596
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0">
597
+ <tr>
598
+ <td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
599
+ <td id="border_color_left_pickcontainer">&nbsp;</td>
600
+ </tr>
601
+ </table>
602
+ </td>
603
+ </tr>
521
604
  </table>
522
- </td>
523
- </tr>
524
- </table>
605
+ </fieldset>
525
606
  </div>
526
607
 
527
608
  <div id="list_panel" class="panel">
528
- <table border="0">
609
+ <fieldset>
610
+ <legend>{#style_dlg.list}</legend>
611
+ <table role="presentation" border="0">
529
612
  <tr>
530
613
  <td><label for="list_type">{#style_dlg.list_type}</label></td>
531
614
  <td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
@@ -541,10 +624,13 @@
541
624
  <td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
542
625
  </tr>
543
626
  </table>
627
+ </fieldset>
544
628
  </div>
545
629
 
546
630
  <div id="positioning_panel" class="panel">
547
- <table border="0">
631
+ <fieldset>
632
+ <legend>{#style_dlg.position}</legend>
633
+ <table role="presentation" border="0">
548
634
  <tr>
549
635
  <td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
550
636
  <td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
@@ -555,11 +641,14 @@
555
641
  <tr>
556
642
  <td><label for="positioning_width">{#style_dlg.width}</label></td>
557
643
  <td>
558
- <table border="0" cellspacing="0" cellpadding="0">
644
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
559
645
  <tr>
560
646
  <td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
561
647
  <td>&nbsp;</td>
562
- <td><select id="positioning_width_measurement" name="positioning_width_measurement"></select></td>
648
+ <td>
649
+ <label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>
650
+ <select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>
651
+ </td>
563
652
  </tr>
564
653
  </table>
565
654
  </td>
@@ -570,11 +659,14 @@
570
659
  <tr>
571
660
  <td><label for="positioning_height">{#style_dlg.height}</label></td>
572
661
  <td>
573
- <table border="0" cellspacing="0" cellpadding="0">
662
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
574
663
  <tr>
575
664
  <td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
576
665
  <td>&nbsp;</td>
577
- <td><select id="positioning_height_measurement" name="positioning_height_measurement"></select></td>
666
+ <td>
667
+ <label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>
668
+ <select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>
669
+ </td>
578
670
  </tr>
579
671
  </table>
580
672
  </td>
@@ -582,12 +674,13 @@
582
674
  <td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>
583
675
  </tr>
584
676
  </table>
677
+ </fieldset>
585
678
 
586
679
  <div style="float: left; width: 49%">
587
680
  <fieldset>
588
681
  <legend>{#style_dlg.placement}</legend>
589
682
 
590
- <table border="0">
683
+ <table role="presentation" border="0">
591
684
  <tr>
592
685
  <td>&nbsp;</td>
593
686
  <td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
@@ -595,11 +688,14 @@
595
688
  <tr>
596
689
  <td>{#style_dlg.top}</td>
597
690
  <td>
598
- <table border="0" cellspacing="0" cellpadding="0">
691
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
599
692
  <tr>
600
693
  <td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
601
694
  <td>&nbsp;</td>
602
- <td><select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select></td>
695
+ <td>
696
+ <label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>
697
+ <select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>
698
+ </td>
603
699
  </tr>
604
700
  </table>
605
701
  </td>
@@ -607,11 +703,14 @@
607
703
  <tr>
608
704
  <td>{#style_dlg.right}</td>
609
705
  <td>
610
- <table border="0" cellspacing="0" cellpadding="0">
706
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
611
707
  <tr>
612
708
  <td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
613
709
  <td>&nbsp;</td>
614
- <td><select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select></td>
710
+ <td>
711
+ <label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>
712
+ <select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>
713
+ </td>
615
714
  </tr>
616
715
  </table>
617
716
  </td>
@@ -619,11 +718,14 @@
619
718
  <tr>
620
719
  <td>{#style_dlg.bottom}</td>
621
720
  <td>
622
- <table border="0" cellspacing="0" cellpadding="0">
721
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
623
722
  <tr>
624
723
  <td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
625
724
  <td>&nbsp;</td>
626
- <td><select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select></td>
725
+ <td>
726
+ <label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>
727
+ <select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>
728
+ </td>
627
729
  </tr>
628
730
  </table>
629
731
  </td>
@@ -631,11 +733,14 @@
631
733
  <tr>
632
734
  <td>{#style_dlg.left}</td>
633
735
  <td>
634
- <table border="0" cellspacing="0" cellpadding="0">
736
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
635
737
  <tr>
636
738
  <td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
637
739
  <td>&nbsp;</td>
638
- <td><select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select></td>
740
+ <td>
741
+ <label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>
742
+ <select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>
743
+ </td>
639
744
  </tr>
640
745
  </table>
641
746
  </td>
@@ -648,7 +753,7 @@
648
753
  <fieldset>
649
754
  <legend>{#style_dlg.clip}</legend>
650
755
 
651
- <table border="0">
756
+ <table role="presentation" border="0">
652
757
  <tr>
653
758
  <td>&nbsp;</td>
654
759
  <td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
@@ -656,11 +761,14 @@
656
761
  <tr>
657
762
  <td>{#style_dlg.top}</td>
658
763
  <td>
659
- <table border="0" cellspacing="0" cellpadding="0">
764
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
660
765
  <tr>
661
766
  <td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
662
767
  <td>&nbsp;</td>
663
- <td><select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select></td>
768
+ <td>
769
+ <label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>
770
+ <select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>
771
+ </td>
664
772
  </tr>
665
773
  </table>
666
774
  </td>
@@ -668,11 +776,14 @@
668
776
  <tr>
669
777
  <td>{#style_dlg.right}</td>
670
778
  <td>
671
- <table border="0" cellspacing="0" cellpadding="0">
779
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
672
780
  <tr>
673
781
  <td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
674
782
  <td>&nbsp;</td>
675
- <td><select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled"></select></td>
783
+ <td>
784
+ <label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>
785
+ <select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>
786
+ </td>
676
787
  </tr>
677
788
  </table>
678
789
  </td>
@@ -680,11 +791,14 @@
680
791
  <tr>
681
792
  <td>{#style_dlg.bottom}</td>
682
793
  <td>
683
- <table border="0" cellspacing="0" cellpadding="0">
794
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
684
795
  <tr>
685
796
  <td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
686
797
  <td>&nbsp;</td>
687
- <td><select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select></td>
798
+ <td>
799
+ <label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>
800
+ <select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>
801
+ </td>
688
802
  </tr>
689
803
  </table>
690
804
  </td>
@@ -692,11 +806,14 @@
692
806
  <tr>
693
807
  <td>{#style_dlg.left}</td>
694
808
  <td>
695
- <table border="0" cellspacing="0" cellpadding="0">
809
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
696
810
  <tr>
697
811
  <td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
698
812
  <td>&nbsp;</td>
699
- <td><select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select></td>
813
+ <td>
814
+ <label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>
815
+ <select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>
816
+ </td>
700
817
  </tr>
701
818
  </table>
702
819
  </td>