alchemy_cms 2.1.12 → 2.2.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (405) hide show
  1. data/.travis.yml +1 -1
  2. data/Gemfile +20 -16
  3. data/README.md +11 -7
  4. data/alchemy_cms.gemspec +31 -29
  5. data/app/assets/javascripts/alchemy/alchemy.base.js +234 -233
  6. data/app/assets/javascripts/alchemy/alchemy.buttons.js +26 -26
  7. data/app/assets/javascripts/alchemy/alchemy.datepicker.js +32 -32
  8. data/app/assets/javascripts/alchemy/alchemy.dirty.js +78 -78
  9. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +103 -103
  10. data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js +84 -84
  11. data/app/assets/javascripts/alchemy/alchemy.elements_window.js +88 -88
  12. data/app/assets/javascripts/alchemy/alchemy.file_progress.js +92 -0
  13. data/app/assets/javascripts/alchemy/alchemy.growler.js +23 -23
  14. data/app/assets/javascripts/alchemy/alchemy.html5.js +23 -0
  15. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js +53 -52
  16. data/app/assets/javascripts/alchemy/alchemy.jquery_loader.js +33 -30
  17. data/app/assets/javascripts/alchemy/alchemy.js +2 -0
  18. data/app/assets/javascripts/alchemy/alchemy.js_extensions.js +14 -14
  19. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +181 -0
  20. data/app/assets/javascripts/alchemy/alchemy.menubar.js +48 -48
  21. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +39 -39
  22. data/app/assets/javascripts/alchemy/alchemy.preview.js +81 -83
  23. data/app/assets/javascripts/alchemy/alchemy.preview_window.js +86 -86
  24. data/app/assets/javascripts/alchemy/alchemy.routes.js.erb +23 -23
  25. data/app/assets/javascripts/alchemy/alchemy.swf_upload.js +208 -353
  26. data/app/assets/javascripts/alchemy/alchemy.uploader.js +279 -0
  27. data/app/assets/javascripts/alchemy/alchemy.windows.js +268 -268
  28. data/app/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js +42 -42
  29. data/app/assets/stylesheets/alchemy/_defaults.scss +89 -89
  30. data/app/assets/stylesheets/alchemy/base.css.scss +790 -804
  31. data/app/assets/stylesheets/alchemy/buttons.css.scss +263 -264
  32. data/app/assets/stylesheets/alchemy/dashboard.css.scss +66 -66
  33. data/app/assets/stylesheets/alchemy/elements.css.scss +575 -564
  34. data/app/assets/stylesheets/alchemy/flash.css.scss +45 -45
  35. data/app/assets/stylesheets/alchemy/frame.css.scss +262 -262
  36. data/app/assets/stylesheets/alchemy/icons.css.scss +86 -86
  37. data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss +706 -707
  38. data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss +46 -27
  39. data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +107 -107
  40. data/app/assets/stylesheets/alchemy/login.css.scss +40 -38
  41. data/app/assets/stylesheets/alchemy/menubar.css.scss +84 -82
  42. data/app/assets/stylesheets/alchemy/modules.css.scss +9 -9
  43. data/app/assets/stylesheets/alchemy/pagination.css.scss +49 -49
  44. data/app/assets/stylesheets/alchemy/print.css +7 -7
  45. data/app/assets/stylesheets/alchemy/sitemap.css.scss +185 -154
  46. data/app/assets/stylesheets/alchemy/standard_set.css +205 -206
  47. data/app/assets/stylesheets/alchemy/tables.css.scss +94 -60
  48. data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +34 -34
  49. data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +177 -177
  50. data/app/assets/stylesheets/alchemy/upload.css.scss +68 -45
  51. data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss +222 -221
  52. data/app/controllers/alchemy/admin/attachments_controller.rb +100 -100
  53. data/app/controllers/alchemy/admin/base_controller.rb +116 -116
  54. data/app/controllers/alchemy/admin/clipboard_controller.rb +44 -44
  55. data/app/controllers/alchemy/admin/contents_controller.rb +55 -55
  56. data/app/controllers/alchemy/admin/dashboard_controller.rb +12 -11
  57. data/app/controllers/alchemy/admin/elements_controller.rb +109 -109
  58. data/app/controllers/alchemy/admin/essence_audios_controller.rb +8 -8
  59. data/app/controllers/alchemy/admin/essence_files_controller.rb +20 -20
  60. data/app/controllers/alchemy/admin/essence_flashes_controller.rb +8 -8
  61. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +81 -81
  62. data/app/controllers/alchemy/admin/essence_videos_controller.rb +8 -8
  63. data/app/controllers/alchemy/admin/languages_controller.rb +16 -4
  64. data/app/controllers/alchemy/admin/layoutpages_controller.rb +9 -9
  65. data/app/controllers/alchemy/admin/pages_controller.rb +249 -248
  66. data/app/controllers/alchemy/admin/pictures_controller.rb +105 -105
  67. data/app/controllers/alchemy/admin/resources_controller.rb +111 -166
  68. data/app/controllers/alchemy/admin/trash_controller.rb +18 -18
  69. data/app/controllers/alchemy/admin/users_controller.rb +69 -69
  70. data/app/controllers/alchemy/attachments_controller.rb +27 -27
  71. data/app/controllers/alchemy/base_controller.rb +159 -155
  72. data/app/controllers/alchemy/elements_controller.rb +16 -16
  73. data/app/controllers/alchemy/messages_controller.rb +59 -59
  74. data/app/controllers/alchemy/pages_controller.rb +194 -198
  75. data/app/controllers/alchemy/pictures_controller.rb +57 -57
  76. data/app/controllers/alchemy/user_sessions_controller.rb +70 -70
  77. data/app/helpers/alchemy/admin/attachments_helper.rb +7 -7
  78. data/app/helpers/alchemy/admin/base_helper.rb +425 -425
  79. data/app/helpers/alchemy/admin/contents_helper.rb +72 -72
  80. data/app/helpers/alchemy/admin/elements_helper.rb +108 -107
  81. data/app/helpers/alchemy/admin/essences_helper.rb +108 -108
  82. data/app/helpers/alchemy/admin/pages_helper.rb +42 -42
  83. data/app/helpers/alchemy/admin/pictures_helper.rb +26 -26
  84. data/app/helpers/alchemy/base_helper.rb +90 -90
  85. data/app/helpers/alchemy/elements_helper.rb +167 -168
  86. data/app/helpers/alchemy/essences_helper.rb +133 -133
  87. data/app/helpers/alchemy/pages_helper.rb +515 -526
  88. data/app/helpers/alchemy/pictures_helper.rb +19 -0
  89. data/app/mailers/alchemy/messages.rb +13 -13
  90. data/app/mailers/alchemy/notifications.rb +19 -19
  91. data/app/models/alchemy.rb +3 -3
  92. data/app/models/alchemy/attachment.rb +52 -78
  93. data/app/models/alchemy/cell.rb +48 -48
  94. data/app/models/alchemy/content.rb +196 -196
  95. data/app/models/alchemy/element.rb +500 -490
  96. data/app/models/alchemy/essence_audio.rb +7 -7
  97. data/app/models/alchemy/essence_date.rb +10 -10
  98. data/app/models/alchemy/essence_file.rb +7 -7
  99. data/app/models/alchemy/essence_flash.rb +6 -6
  100. data/app/models/alchemy/essence_html.rb +9 -9
  101. data/app/models/alchemy/essence_picture.rb +17 -17
  102. data/app/models/alchemy/essence_richtext.rb +53 -53
  103. data/app/models/alchemy/essence_text.rb +21 -21
  104. data/app/models/alchemy/essence_video.rb +7 -7
  105. data/app/models/alchemy/folded_page.rb +3 -3
  106. data/app/models/alchemy/language.rb +91 -91
  107. data/app/models/alchemy/language/code.rb +14 -14
  108. data/app/models/alchemy/message.rb +48 -45
  109. data/app/models/alchemy/page.rb +555 -558
  110. data/app/models/alchemy/picture.rb +100 -99
  111. data/app/models/alchemy/user.rb +76 -74
  112. data/app/models/alchemy/user_session.rb +8 -8
  113. data/app/sweepers/alchemy/content_sweeper.rb +15 -15
  114. data/app/sweepers/alchemy/pages_sweeper.rb +50 -50
  115. data/app/sweepers/alchemy/pictures_sweeper.rb +14 -14
  116. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +23 -23
  117. data/app/views/alchemy/admin/attachments/_attachment.html.erb +56 -56
  118. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +15 -15
  119. data/app/views/alchemy/admin/attachments/_files_list.html.erb +16 -16
  120. data/app/views/alchemy/admin/attachments/create.js.erb +2 -2
  121. data/app/views/alchemy/admin/attachments/destroy.js.erb +3 -3
  122. data/app/views/alchemy/admin/attachments/edit.html.erb +10 -10
  123. data/app/views/alchemy/admin/attachments/index.html.erb +14 -14
  124. data/app/views/alchemy/admin/attachments/new.html.erb +9 -9
  125. data/app/views/alchemy/admin/clipboard/index.html.erb +21 -21
  126. data/app/views/alchemy/admin/clipboard/insert.js.erb +5 -5
  127. data/app/views/alchemy/admin/contents/_missing.html.erb +1 -1
  128. data/app/views/alchemy/admin/contents/create.js.erb +33 -33
  129. data/app/views/alchemy/admin/contents/destroy.js.erb +5 -5
  130. data/app/views/alchemy/admin/contents/new.html.erb +13 -13
  131. data/app/views/alchemy/admin/contents/order.js.erb +2 -2
  132. data/app/views/alchemy/admin/dashboard/index.html.erb +96 -92
  133. data/app/views/alchemy/admin/elements/_add_content.html.erb +12 -12
  134. data/app/views/alchemy/admin/elements/_element.html.erb +3 -3
  135. data/app/views/alchemy/admin/elements/_new_element_form.html.erb +28 -28
  136. data/app/views/alchemy/admin/elements/_picture_editor.html.erb +21 -21
  137. data/app/views/alchemy/admin/elements/create.js.erb +32 -32
  138. data/app/views/alchemy/admin/elements/index.html.erb +2 -2
  139. data/app/views/alchemy/admin/elements/new.html.erb +31 -31
  140. data/app/views/alchemy/admin/elements/order.js.erb +3 -3
  141. data/app/views/alchemy/admin/elements/trash.js.erb +13 -13
  142. data/app/views/alchemy/admin/elements/update.js.erb +6 -6
  143. data/app/views/alchemy/admin/essence_files/assign.js.erb +6 -6
  144. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +32 -32
  145. data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +1 -1
  146. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +1 -1
  147. data/app/views/alchemy/admin/essence_pictures/update.js.erb +11 -11
  148. data/app/views/alchemy/admin/languages/_form.html.erb +51 -45
  149. data/app/views/alchemy/admin/languages/_language.html.erb +45 -45
  150. data/app/views/alchemy/admin/languages/_table.html.erb +25 -25
  151. data/app/views/alchemy/admin/layoutpages/index.html.erb +35 -35
  152. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +42 -42
  153. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  154. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +27 -27
  155. data/app/views/alchemy/admin/pages/_page.html.erb +112 -112
  156. data/app/views/alchemy/admin/pages/_sitemap.html.erb +1 -1
  157. data/app/views/alchemy/admin/pages/configure.html.erb +71 -69
  158. data/app/views/alchemy/admin/pages/configure_external.html.erb +38 -38
  159. data/app/views/alchemy/admin/pages/destroy.js.erb +10 -10
  160. data/app/views/alchemy/admin/pages/edit.html.erb +165 -165
  161. data/app/views/alchemy/admin/pages/fold.js.erb +2 -2
  162. data/app/views/alchemy/admin/pages/index.html.erb +66 -66
  163. data/app/views/alchemy/admin/pages/locked.html.erb +1 -1
  164. data/app/views/alchemy/admin/pages/new.html.erb +40 -40
  165. data/app/views/alchemy/admin/pages/sort.js.erb +4 -4
  166. data/app/views/alchemy/admin/pages/unlock.js.erb +6 -6
  167. data/app/views/alchemy/admin/pages/update.js.erb +19 -19
  168. data/app/views/alchemy/admin/partials/_flash.html.erb +2 -2
  169. data/app/views/alchemy/admin/partials/_flash_notices.html.erb +1 -1
  170. data/app/views/alchemy/admin/partials/_flash_upload.html.erb +38 -0
  171. data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +15 -15
  172. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +8 -8
  173. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +35 -35
  174. data/app/views/alchemy/admin/partials/_search_form.html.erb +14 -14
  175. data/app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb +6 -6
  176. data/app/views/alchemy/admin/partials/_upload_form.html.erb +56 -118
  177. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +11 -11
  178. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +71 -71
  179. data/app/views/alchemy/admin/pictures/_picture.html.erb +32 -32
  180. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +26 -26
  181. data/app/views/alchemy/admin/pictures/_pictures_list.html.erb +6 -6
  182. data/app/views/alchemy/admin/pictures/create.js.erb +7 -7
  183. data/app/views/alchemy/admin/pictures/index.html.erb +67 -67
  184. data/app/views/alchemy/admin/pictures/show_in_window.html.erb +5 -4
  185. data/app/views/alchemy/admin/resources/_form.html.erb +25 -19
  186. data/app/views/alchemy/admin/resources/_resource.html.erb +37 -36
  187. data/app/views/alchemy/admin/resources/_table.html.erb +17 -17
  188. data/app/views/alchemy/admin/resources/destroy.js.erb +1 -1
  189. data/app/views/alchemy/admin/resources/index.html.erb +14 -14
  190. data/app/views/alchemy/admin/trash/index.html.erb +20 -20
  191. data/app/views/alchemy/admin/users/_table.html.erb +52 -52
  192. data/app/views/alchemy/admin/users/_user.html.erb +35 -36
  193. data/app/views/alchemy/admin/users/index.html.erb +26 -27
  194. data/app/views/alchemy/base/error_notice.html.erb +2 -2
  195. data/app/views/alchemy/base/update.js.erb +1 -1
  196. data/app/views/alchemy/elements/_contactform_view.html.erb +76 -76
  197. data/app/views/alchemy/elements/_download_view.html.erb +1 -1
  198. data/app/views/alchemy/elements/_editor_not_found.html.erb +3 -3
  199. data/app/views/alchemy/elements/_searchresult_view.html.erb +2 -2
  200. data/app/views/alchemy/elements/_sitemap_editor.html.erb +1 -1
  201. data/app/views/alchemy/essences/_essence_audio_view.html.erb +13 -13
  202. data/app/views/alchemy/essences/_essence_date_editor.html.erb +10 -10
  203. data/app/views/alchemy/essences/_essence_file_editor.html.erb +62 -62
  204. data/app/views/alchemy/essences/_essence_file_view.html.erb +8 -8
  205. data/app/views/alchemy/essences/_essence_flash_view.html.erb +19 -19
  206. data/app/views/alchemy/essences/_essence_html_editor.html.erb +6 -6
  207. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +73 -73
  208. data/app/views/alchemy/essences/_essence_picture_view.html.erb +34 -34
  209. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +7 -7
  210. data/app/views/alchemy/essences/_essence_text_editor.html.erb +8 -8
  211. data/app/views/alchemy/navigation/_image_link.html.erb +12 -12
  212. data/app/views/alchemy/navigation/_link.html.erb +13 -13
  213. data/app/views/alchemy/navigation/_renderer.html.erb +17 -17
  214. data/app/views/alchemy/page_layouts/_layout_footer.html.erb +1 -1
  215. data/app/views/alchemy/page_layouts/_layout_header.html.erb +1 -1
  216. data/app/views/alchemy/pages/show.rss.builder +14 -14
  217. data/app/views/alchemy/search/_result.html.erb +7 -7
  218. data/app/views/alchemy/user_sessions/leave.html.erb +9 -9
  219. data/app/views/alchemy/user_sessions/login.html.erb +39 -39
  220. data/app/views/alchemy/user_sessions/logout.html.erb +1 -1
  221. data/app/views/layouts/alchemy/admin.html.erb +81 -81
  222. data/app/views/layouts/alchemy/login.html.erb +36 -36
  223. data/app/views/layouts/alchemy/pages.html.erb +48 -27
  224. data/bin/alchemy +136 -134
  225. data/config/alchemy/config.yml +13 -9
  226. data/config/locales/alchemy.de.yml +24 -30
  227. data/config/locales/alchemy.en.yml +11 -28
  228. data/config/routes.rb +146 -146
  229. data/db/migrate/20100607193638_create_essence_pictures.rb +3 -3
  230. data/db/migrate/20101109150312_alter_pages_visible_column_default.rb +1 -1
  231. data/db/migrate/20101109151812_create_languages.rb +3 -3
  232. data/db/migrate/20110115123343_remove_css_class_default_from_essence_pictures.rb +3 -3
  233. data/db/migrate/20110224105120_change_pages_visible_default.rb +3 -3
  234. data/db/migrate/20110228182659_remove_default_page_layout_from_pages.rb +2 -2
  235. data/db/migrate/20110414163140_remove_display_name_from_elements.rb +3 -3
  236. data/db/migrate/20110511100516_rename_essence_texts_title_to_link_title.rb +2 -2
  237. data/db/migrate/20110529130500_add_cell_id_to_elements.rb +3 -3
  238. data/db/migrate/20110530102804_change_pages_page_layout_column.rb +3 -3
  239. data/db/migrate/20110711142057_change_open_link_in_new_window_to_link_target.rb +1 -1
  240. data/db/migrate/20111116125112_namespace_alchemy_models.rb +21 -21
  241. data/lib/alchemy/auth_engine.rb +5 -5
  242. data/lib/alchemy/capistrano.rb +64 -64
  243. data/lib/alchemy/config.rb +47 -44
  244. data/lib/alchemy/engine.rb +41 -41
  245. data/lib/alchemy/essence.rb +50 -51
  246. data/lib/alchemy/i18n.rb +48 -48
  247. data/lib/alchemy/modules.rb +30 -30
  248. data/lib/alchemy/mount_point.rb +6 -6
  249. data/lib/alchemy/page_layout.rb +94 -93
  250. data/lib/alchemy/resource.rb +82 -0
  251. data/lib/alchemy/resources_helper.rb +56 -0
  252. data/lib/alchemy/scoped_pagination_url_helper.rb +8 -8
  253. data/lib/alchemy/seeder.rb +88 -88
  254. data/lib/alchemy/tinymce.rb +49 -49
  255. data/lib/alchemy/upgrader.rb +103 -103
  256. data/lib/alchemy/version.rb +1 -1
  257. data/lib/alchemy_cms.rb +26 -27
  258. data/lib/extensions/action_view.rb +1 -1
  259. data/lib/extensions/array.rb +3 -3
  260. data/lib/extensions/hash.rb +3 -3
  261. data/lib/middleware/flash_session_cookie.rb +1 -1
  262. data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +24 -24
  263. data/lib/rails/generators/alchemy/elements/elements_generator.rb +7 -7
  264. data/lib/rails/generators/alchemy/elements/templates/view.html.erb +17 -17
  265. data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +6 -6
  266. data/lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb +8 -8
  267. data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb +7 -7
  268. data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +36 -36
  269. data/lib/rails/templates/alchemy.rb +1 -1
  270. data/lib/tasks/ferret.rake +2 -2
  271. data/lib/tasks/fleximage.rake +32 -32
  272. data/lib/tasks/install.rake +12 -12
  273. data/lib/tasks/upgrade.rake +4 -4
  274. data/spec/controllers/admin/clipboard_controller_spec.rb +43 -43
  275. data/spec/controllers/admin/contents_controller_spec.rb +22 -22
  276. data/spec/controllers/admin/elements_controller_spec.rb +13 -13
  277. data/spec/controllers/admin/languages_controller_spec.rb +31 -0
  278. data/spec/controllers/admin/pages_controller_spec.rb +10 -41
  279. data/spec/controllers/admin/resources_controller_spec.rb +19 -0
  280. data/spec/controllers/admin/trash_controller_spec.rb +11 -11
  281. data/spec/controllers/base_controller_spec.rb +46 -46
  282. data/spec/controllers/pages_controller_spec.rb +102 -92
  283. data/spec/dummy/app/controllers/admin/events_controller.rb +3 -0
  284. data/spec/dummy/app/controllers/errors_controller.rb +5 -0
  285. data/spec/dummy/app/models/event.rb +3 -0
  286. data/spec/dummy/config.ru +1 -1
  287. data/spec/dummy/config/application.rb +3 -0
  288. data/spec/dummy/config/authorization_rules.rb +7 -0
  289. data/spec/dummy/config/environments/development.rb +8 -1
  290. data/spec/dummy/config/environments/production.rb +1 -1
  291. data/spec/dummy/config/environments/test.rb +5 -2
  292. data/spec/dummy/config/routes.rb +9 -1
  293. data/spec/dummy/db/schema.rb +47 -35
  294. data/spec/dummy/public/404.html +19 -7
  295. data/spec/dummy/public/404.html.bak +26 -0
  296. data/spec/dummy/public/422.html +19 -7
  297. data/spec/dummy/public/500.html +19 -7
  298. data/spec/dummy/script/rails +2 -2
  299. data/spec/factories.rb +76 -76
  300. data/spec/helpers/admin/base_helper_spec.rb +21 -21
  301. data/spec/helpers/admin/contents_helper_spec.rb +14 -14
  302. data/spec/helpers/admin/elements_helper_spec.rb +40 -40
  303. data/spec/helpers/admin/essences_helper_spec.rb +7 -7
  304. data/spec/helpers/elements_helper_spec.rb +154 -154
  305. data/spec/helpers/essences_helper_spec.rb +10 -10
  306. data/spec/helpers/pages_helper_spec.rb +369 -372
  307. data/spec/helpers/pictures_helper_spec.rb +14 -0
  308. data/spec/helpers/url_helpers_spec.rb +29 -34
  309. data/spec/integration/admin/pages_controller_spec.rb +50 -50
  310. data/spec/integration/admin/resources_integration_spec.rb +100 -0
  311. data/spec/integration/navigation_spec.rb +1 -1
  312. data/spec/integration/pages_controller_spec.rb +205 -207
  313. data/spec/integration/security_spec.rb +47 -47
  314. data/spec/javascripts/alchemy/link_overlay_spec.js.coffee +42 -0
  315. data/spec/javascripts/alchemy_integration_spec.coffee +12 -0
  316. data/spec/javascripts/fixtures/select.html +3 -0
  317. data/spec/javascripts/helpers/.gitkeep +0 -0
  318. data/spec/javascripts/helpers/jasmine-jquery-1.3.1.js +289 -0
  319. data/spec/javascripts/helpers/mock-ajax.js +207 -0
  320. data/spec/javascripts/helpers/test_responses/test_responses.js +1 -0
  321. data/spec/javascripts/spec.css +3 -0
  322. data/spec/javascripts/spec.js +2 -0
  323. data/spec/libraries/resource_spec.rb +122 -0
  324. data/spec/libraries/resources_helper_spec.rb +105 -0
  325. data/spec/models/content_spec.rb +67 -67
  326. data/spec/models/element_spec.rb +133 -133
  327. data/spec/models/essence_picture_spec.rb +5 -5
  328. data/spec/models/essence_richtext_spec.rb +4 -4
  329. data/spec/models/language_spec.rb +89 -89
  330. data/spec/models/page_spec.rb +436 -506
  331. data/spec/models/picture_spec.rb +34 -34
  332. data/spec/models/user_spec.rb +2 -2
  333. data/spec/page_layout_spec.rb +24 -20
  334. data/spec/routing_spec.rb +253 -253
  335. data/spec/spec_helper.rb +51 -50
  336. data/spec/support/alchemy/controller_hacks.rb +25 -25
  337. data/spec/support/alchemy/specs_helpers.rb +25 -25
  338. data/spec/support/integration_spec_helper.rb +24 -0
  339. data/vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js +271 -0
  340. data/vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js +86 -85
  341. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +380 -377
  342. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +285 -279
  343. data/vendor/assets/javascripts/swfupload/SWFObject License.txt +3 -3
  344. data/vendor/assets/javascripts/swfupload/swfupload.cookies.js +47 -47
  345. data/vendor/assets/javascripts/swfupload/swfupload.js +612 -612
  346. data/vendor/assets/javascripts/swfupload/swfupload.queue.js +93 -93
  347. data/vendor/assets/javascripts/swfupload/swfupload.speed.js +337 -337
  348. data/vendor/assets/javascripts/swfupload/swfupload.swfobject.js +706 -102
  349. data/vendor/assets/javascripts/tiny_mce/license.txt +6 -6
  350. data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +97 -97
  351. data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +386 -376
  352. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +30 -30
  353. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +45 -45
  354. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +20 -17
  355. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +12 -12
  356. data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +183 -173
  357. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +4 -4
  358. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +7 -7
  359. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +3 -3
  360. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +282 -280
  361. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +15 -15
  362. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +204 -204
  363. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +435 -435
  364. data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +24 -22
  365. data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +144 -136
  366. data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +184 -168
  367. data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +62 -46
  368. data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +17 -16
  369. data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +56 -47
  370. data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +67 -54
  371. data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +852 -1
  372. data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +79 -69
  373. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +48 -48
  374. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +28 -28
  375. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +317 -317
  376. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +248 -246
  377. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +246 -246
  378. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +146 -146
  379. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +31 -31
  380. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +1 -1
  381. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +1 -1
  382. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +1 -1
  383. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
  384. data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +53 -46
  385. data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +57 -45
  386. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +182 -47
  387. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +399 -92
  388. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +891 -187
  389. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +102 -24
  390. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +377 -78
  391. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +452 -77
  392. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +167 -45
  393. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +399 -92
  394. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +890 -190
  395. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +33 -7
  396. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +15 -4
  397. data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +18 -15
  398. data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +46 -46
  399. data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +124 -124
  400. data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +112 -112
  401. data/vendor/assets/javascripts/tiny_mce/utils/validate.js +213 -213
  402. metadata +102 -115
  403. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js +0 -216
  404. data/lib/tasks/routes.rake +0 -29
  405. data/spec/integration/admin/resources_spec.rb +0 -19
@@ -3,486 +3,486 @@ tinyMCEPopup.requireLangPack();
3
3
  var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
4
4
 
5
5
  function insertTable() {
6
- var formObj = document.forms[0];
7
- var inst = tinyMCEPopup.editor, dom = inst.dom;
8
- var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
9
- var html = '', capEl, elm;
10
- var cellLimit, rowLimit, colLimit;
11
-
12
- tinyMCEPopup.restoreSelection();
13
-
14
- if (!AutoValidator.validate(formObj)) {
15
- tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
16
- return false;
17
- }
18
-
19
- elm = dom.getParent(inst.selection.getNode(), 'table');
20
-
21
- // Get form data
22
- cols = formObj.elements['cols'].value;
23
- rows = formObj.elements['rows'].value;
24
- border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;
25
- cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
26
- cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
27
- align = getSelectValue(formObj, "align");
28
- frame = getSelectValue(formObj, "tframe");
29
- rules = getSelectValue(formObj, "rules");
30
- width = formObj.elements['width'].value;
31
- height = formObj.elements['height'].value;
32
- bordercolor = formObj.elements['bordercolor'].value;
33
- bgcolor = formObj.elements['bgcolor'].value;
34
- className = getSelectValue(formObj, "class");
35
- id = formObj.elements['id'].value;
36
- summary = formObj.elements['summary'].value;
37
- style = formObj.elements['style'].value;
38
- dir = formObj.elements['dir'].value;
39
- lang = formObj.elements['lang'].value;
40
- background = formObj.elements['backgroundimage'].value;
41
- caption = formObj.elements['caption'].checked;
42
-
43
- cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
44
- rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
45
- colLimit = tinyMCEPopup.getParam('table_col_limit', false);
46
-
47
- // Validate table size
48
- if (colLimit && cols > colLimit) {
49
- tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
50
- return false;
51
- } else if (rowLimit && rows > rowLimit) {
52
- tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
53
- return false;
54
- } else if (cellLimit && cols * rows > cellLimit) {
55
- tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
56
- return false;
57
- }
58
-
59
- // Update table
60
- if (action == "update") {
61
- dom.setAttrib(elm, 'cellPadding', cellpadding, true);
62
- dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
63
-
64
- if (!isCssSize(border)) {
65
- dom.setAttrib(elm, 'border', border);
66
- } else {
67
- dom.setAttrib(elm, 'border', '');
68
- }
69
-
70
- if (border == '') {
71
- dom.setStyle(elm, 'border-width', '');
72
- dom.setStyle(elm, 'border', '');
73
- dom.setAttrib(elm, 'border', '');
74
- }
75
-
76
- dom.setAttrib(elm, 'align', align);
77
- dom.setAttrib(elm, 'frame', frame);
78
- dom.setAttrib(elm, 'rules', rules);
79
- dom.setAttrib(elm, 'class', className);
80
- dom.setAttrib(elm, 'style', style);
81
- dom.setAttrib(elm, 'id', id);
82
- dom.setAttrib(elm, 'summary', summary);
83
- dom.setAttrib(elm, 'dir', dir);
84
- dom.setAttrib(elm, 'lang', lang);
85
-
86
- capEl = inst.dom.select('caption', elm)[0];
87
-
88
- if (capEl && !caption)
89
- capEl.parentNode.removeChild(capEl);
90
-
91
- if (!capEl && caption) {
92
- capEl = elm.ownerDocument.createElement('caption');
93
-
94
- if (!tinymce.isIE)
95
- capEl.innerHTML = '<br data-mce-bogus="1"/>';
96
-
97
- elm.insertBefore(capEl, elm.firstChild);
98
- }
99
-
100
- if (width && inst.settings.inline_styles) {
101
- dom.setStyle(elm, 'width', width);
102
- dom.setAttrib(elm, 'width', '');
103
- } else {
104
- dom.setAttrib(elm, 'width', width, true);
105
- dom.setStyle(elm, 'width', '');
106
- }
107
-
108
- // Remove these since they are not valid XHTML
109
- dom.setAttrib(elm, 'borderColor', '');
110
- dom.setAttrib(elm, 'bgColor', '');
111
- dom.setAttrib(elm, 'background', '');
112
-
113
- if (height && inst.settings.inline_styles) {
114
- dom.setStyle(elm, 'height', height);
115
- dom.setAttrib(elm, 'height', '');
116
- } else {
117
- dom.setAttrib(elm, 'height', height, true);
118
- dom.setStyle(elm, 'height', '');
119
- }
120
-
121
- if (background != '')
122
- elm.style.backgroundImage = "url('" + background + "')";
123
- else
124
- elm.style.backgroundImage = '';
125
-
126
- /* if (tinyMCEPopup.getParam("inline_styles")) {
127
- if (width != '')
128
- elm.style.width = getCSSSize(width);
129
- }*/
130
-
131
- if (bordercolor != "") {
132
- elm.style.borderColor = bordercolor;
133
- elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
134
- elm.style.borderWidth = cssSize(border);
135
- } else
136
- elm.style.borderColor = '';
137
-
138
- elm.style.backgroundColor = bgcolor;
139
- elm.style.height = getCSSSize(height);
140
-
141
- inst.addVisual();
142
-
143
- // Fix for stange MSIE align bug
144
- //elm.outerHTML = elm.outerHTML;
145
-
146
- inst.nodeChanged();
147
- inst.execCommand('mceEndUndoLevel');
148
-
149
- // Repaint if dimensions changed
150
- if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
151
- inst.execCommand('mceRepaint');
152
-
153
- tinyMCEPopup.close();
154
- return true;
155
- }
156
-
157
- // Create new table
158
- html += '<table';
159
-
160
- html += makeAttrib('id', id);
161
- if (!isCssSize(border)) {
162
- html += makeAttrib('border', border);
163
- }
164
-
165
- html += makeAttrib('cellpadding', cellpadding);
166
- html += makeAttrib('cellspacing', cellspacing);
167
- html += makeAttrib('data-mce-new', '1');
168
-
169
- if (width && inst.settings.inline_styles) {
170
- if (style)
171
- style += '; ';
172
-
173
- // Force px
174
- if (/^[0-9\.]+$/.test(width))
175
- width += 'px';
176
-
177
- style += 'width: ' + width;
178
- } else
179
- html += makeAttrib('width', width);
180
-
181
- /* if (height) {
182
- if (style)
183
- style += '; ';
184
-
185
- style += 'height: ' + height;
186
- }*/
187
-
188
- //html += makeAttrib('height', height);
189
- //html += makeAttrib('bordercolor', bordercolor);
190
- //html += makeAttrib('bgcolor', bgcolor);
191
- html += makeAttrib('align', align);
192
- html += makeAttrib('frame', frame);
193
- html += makeAttrib('rules', rules);
194
- html += makeAttrib('class', className);
195
- html += makeAttrib('style', style);
196
- html += makeAttrib('summary', summary);
197
- html += makeAttrib('dir', dir);
198
- html += makeAttrib('lang', lang);
199
- html += '>';
200
-
201
- if (caption) {
202
- if (!tinymce.isIE)
203
- html += '<caption><br data-mce-bogus="1"/></caption>';
204
- else
205
- html += '<caption></caption>';
206
- }
207
-
208
- for (var y=0; y<rows; y++) {
209
- html += "<tr>";
210
-
211
- for (var x=0; x<cols; x++) {
212
- if (!tinymce.isIE)
213
- html += '<td><br data-mce-bogus="1"/></td>';
214
- else
215
- html += '<td></td>';
216
- }
217
-
218
- html += "</tr>";
219
- }
220
-
221
- html += "</table>";
222
-
223
- // Move table
224
- if (inst.settings.fix_table_elements) {
225
- var patt = '';
226
-
227
- inst.focus();
228
- inst.selection.setContent('<br class="_mce_marker" />');
229
-
230
- tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {
231
- if (patt)
232
- patt += ',';
233
-
234
- patt += n + ' ._mce_marker';
235
- });
236
-
237
- tinymce.each(inst.dom.select(patt), function(n) {
238
- inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);
239
- });
240
-
241
- dom.setOuterHTML(dom.select('br._mce_marker')[0], html);
242
- } else
243
- inst.execCommand('mceInsertContent', false, html);
244
-
245
- tinymce.each(dom.select('table[data-mce-new]'), function(node) {
246
- // Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document
247
- if (tinymce.isIE && node.nextSibling == null) {
248
- dom.insertAfter(dom.create('p'), node);
249
- }
250
-
251
- var tdorth = dom.select('td,th', node);
252
- try {
253
- // IE9 might fail to do this selection
254
- inst.selection.setCursorLocation(tdorth[0], 0);
255
- } catch (ex) {
256
- // Ignore
257
- }
258
-
259
- dom.setAttrib(node, 'data-mce-new', '');
260
- });
261
-
262
- inst.addVisual();
263
- inst.execCommand('mceEndUndoLevel');
264
-
265
- tinyMCEPopup.close();
6
+ var formObj = document.forms[0];
7
+ var inst = tinyMCEPopup.editor, dom = inst.dom;
8
+ var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
9
+ var html = '', capEl, elm;
10
+ var cellLimit, rowLimit, colLimit;
11
+
12
+ tinyMCEPopup.restoreSelection();
13
+
14
+ if (!AutoValidator.validate(formObj)) {
15
+ tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
16
+ return false;
17
+ }
18
+
19
+ elm = dom.getParent(inst.selection.getNode(), 'table');
20
+
21
+ // Get form data
22
+ cols = formObj.elements['cols'].value;
23
+ rows = formObj.elements['rows'].value;
24
+ border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;
25
+ cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
26
+ cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
27
+ align = getSelectValue(formObj, "align");
28
+ frame = getSelectValue(formObj, "tframe");
29
+ rules = getSelectValue(formObj, "rules");
30
+ width = formObj.elements['width'].value;
31
+ height = formObj.elements['height'].value;
32
+ bordercolor = formObj.elements['bordercolor'].value;
33
+ bgcolor = formObj.elements['bgcolor'].value;
34
+ className = getSelectValue(formObj, "class");
35
+ id = formObj.elements['id'].value;
36
+ summary = formObj.elements['summary'].value;
37
+ style = formObj.elements['style'].value;
38
+ dir = formObj.elements['dir'].value;
39
+ lang = formObj.elements['lang'].value;
40
+ background = formObj.elements['backgroundimage'].value;
41
+ caption = formObj.elements['caption'].checked;
42
+
43
+ cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
44
+ rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
45
+ colLimit = tinyMCEPopup.getParam('table_col_limit', false);
46
+
47
+ // Validate table size
48
+ if (colLimit && cols > colLimit) {
49
+ tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
50
+ return false;
51
+ } else if (rowLimit && rows > rowLimit) {
52
+ tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
53
+ return false;
54
+ } else if (cellLimit && cols * rows > cellLimit) {
55
+ tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
56
+ return false;
57
+ }
58
+
59
+ // Update table
60
+ if (action == "update") {
61
+ dom.setAttrib(elm, 'cellPadding', cellpadding, true);
62
+ dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
63
+
64
+ if (!isCssSize(border)) {
65
+ dom.setAttrib(elm, 'border', border);
66
+ } else {
67
+ dom.setAttrib(elm, 'border', '');
68
+ }
69
+
70
+ if (border == '') {
71
+ dom.setStyle(elm, 'border-width', '');
72
+ dom.setStyle(elm, 'border', '');
73
+ dom.setAttrib(elm, 'border', '');
74
+ }
75
+
76
+ dom.setAttrib(elm, 'align', align);
77
+ dom.setAttrib(elm, 'frame', frame);
78
+ dom.setAttrib(elm, 'rules', rules);
79
+ dom.setAttrib(elm, 'class', className);
80
+ dom.setAttrib(elm, 'style', style);
81
+ dom.setAttrib(elm, 'id', id);
82
+ dom.setAttrib(elm, 'summary', summary);
83
+ dom.setAttrib(elm, 'dir', dir);
84
+ dom.setAttrib(elm, 'lang', lang);
85
+
86
+ capEl = inst.dom.select('caption', elm)[0];
87
+
88
+ if (capEl && !caption)
89
+ capEl.parentNode.removeChild(capEl);
90
+
91
+ if (!capEl && caption) {
92
+ capEl = elm.ownerDocument.createElement('caption');
93
+
94
+ if (!tinymce.isIE)
95
+ capEl.innerHTML = '<br data-mce-bogus="1"/>';
96
+
97
+ elm.insertBefore(capEl, elm.firstChild);
98
+ }
99
+
100
+ if (width && inst.settings.inline_styles) {
101
+ dom.setStyle(elm, 'width', width);
102
+ dom.setAttrib(elm, 'width', '');
103
+ } else {
104
+ dom.setAttrib(elm, 'width', width, true);
105
+ dom.setStyle(elm, 'width', '');
106
+ }
107
+
108
+ // Remove these since they are not valid XHTML
109
+ dom.setAttrib(elm, 'borderColor', '');
110
+ dom.setAttrib(elm, 'bgColor', '');
111
+ dom.setAttrib(elm, 'background', '');
112
+
113
+ if (height && inst.settings.inline_styles) {
114
+ dom.setStyle(elm, 'height', height);
115
+ dom.setAttrib(elm, 'height', '');
116
+ } else {
117
+ dom.setAttrib(elm, 'height', height, true);
118
+ dom.setStyle(elm, 'height', '');
119
+ }
120
+
121
+ if (background != '')
122
+ elm.style.backgroundImage = "url('" + background + "')";
123
+ else
124
+ elm.style.backgroundImage = '';
125
+
126
+ /* if (tinyMCEPopup.getParam("inline_styles")) {
127
+ if (width != '')
128
+ elm.style.width = getCSSSize(width);
129
+ }*/
130
+
131
+ if (bordercolor != "") {
132
+ elm.style.borderColor = bordercolor;
133
+ elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
134
+ elm.style.borderWidth = cssSize(border);
135
+ } else
136
+ elm.style.borderColor = '';
137
+
138
+ elm.style.backgroundColor = bgcolor;
139
+ elm.style.height = getCSSSize(height);
140
+
141
+ inst.addVisual();
142
+
143
+ // Fix for stange MSIE align bug
144
+ //elm.outerHTML = elm.outerHTML;
145
+
146
+ inst.nodeChanged();
147
+ inst.execCommand('mceEndUndoLevel');
148
+
149
+ // Repaint if dimensions changed
150
+ if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
151
+ inst.execCommand('mceRepaint');
152
+
153
+ tinyMCEPopup.close();
154
+ return true;
155
+ }
156
+
157
+ // Create new table
158
+ html += '<table';
159
+
160
+ html += makeAttrib('id', id);
161
+ if (!isCssSize(border)) {
162
+ html += makeAttrib('border', border);
163
+ }
164
+
165
+ html += makeAttrib('cellpadding', cellpadding);
166
+ html += makeAttrib('cellspacing', cellspacing);
167
+ html += makeAttrib('data-mce-new', '1');
168
+
169
+ if (width && inst.settings.inline_styles) {
170
+ if (style)
171
+ style += '; ';
172
+
173
+ // Force px
174
+ if (/^[0-9\.]+$/.test(width))
175
+ width += 'px';
176
+
177
+ style += 'width: ' + width;
178
+ } else
179
+ html += makeAttrib('width', width);
180
+
181
+ /* if (height) {
182
+ if (style)
183
+ style += '; ';
184
+
185
+ style += 'height: ' + height;
186
+ }*/
187
+
188
+ //html += makeAttrib('height', height);
189
+ //html += makeAttrib('bordercolor', bordercolor);
190
+ //html += makeAttrib('bgcolor', bgcolor);
191
+ html += makeAttrib('align', align);
192
+ html += makeAttrib('frame', frame);
193
+ html += makeAttrib('rules', rules);
194
+ html += makeAttrib('class', className);
195
+ html += makeAttrib('style', style);
196
+ html += makeAttrib('summary', summary);
197
+ html += makeAttrib('dir', dir);
198
+ html += makeAttrib('lang', lang);
199
+ html += '>';
200
+
201
+ if (caption) {
202
+ if (!tinymce.isIE)
203
+ html += '<caption><br data-mce-bogus="1"/></caption>';
204
+ else
205
+ html += '<caption></caption>';
206
+ }
207
+
208
+ for (var y = 0; y < rows; y++) {
209
+ html += "<tr>";
210
+
211
+ for (var x = 0; x < cols; x++) {
212
+ if (!tinymce.isIE)
213
+ html += '<td><br data-mce-bogus="1"/></td>';
214
+ else
215
+ html += '<td></td>';
216
+ }
217
+
218
+ html += "</tr>";
219
+ }
220
+
221
+ html += "</table>";
222
+
223
+ // Move table
224
+ if (inst.settings.fix_table_elements) {
225
+ var patt = '';
226
+
227
+ inst.focus();
228
+ inst.selection.setContent('<br class="_mce_marker" />');
229
+
230
+ tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function (n) {
231
+ if (patt)
232
+ patt += ',';
233
+
234
+ patt += n + ' ._mce_marker';
235
+ });
236
+
237
+ tinymce.each(inst.dom.select(patt), function (n) {
238
+ inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);
239
+ });
240
+
241
+ dom.setOuterHTML(dom.select('br._mce_marker')[0], html);
242
+ } else
243
+ inst.execCommand('mceInsertContent', false, html);
244
+
245
+ tinymce.each(dom.select('table[data-mce-new]'), function (node) {
246
+ // Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document
247
+ if (tinymce.isIE && node.nextSibling == null) {
248
+ dom.insertAfter(dom.create('p'), node);
249
+ }
250
+
251
+ var tdorth = dom.select('td,th', node);
252
+ try {
253
+ // IE9 might fail to do this selection
254
+ inst.selection.setCursorLocation(tdorth[0], 0);
255
+ } catch (ex) {
256
+ // Ignore
257
+ }
258
+
259
+ dom.setAttrib(node, 'data-mce-new', '');
260
+ });
261
+
262
+ inst.addVisual();
263
+ inst.execCommand('mceEndUndoLevel');
264
+
265
+ tinyMCEPopup.close();
266
266
  }
267
267
 
268
268
  function makeAttrib(attrib, value) {
269
- var formObj = document.forms[0];
270
- var valueElm = formObj.elements[attrib];
269
+ var formObj = document.forms[0];
270
+ var valueElm = formObj.elements[attrib];
271
271
 
272
- if (typeof(value) == "undefined" || value == null) {
273
- value = "";
272
+ if (typeof(value) == "undefined" || value == null) {
273
+ value = "";
274
274
 
275
- if (valueElm)
276
- value = valueElm.value;
277
- }
275
+ if (valueElm)
276
+ value = valueElm.value;
277
+ }
278
278
 
279
- if (value == "")
280
- return "";
279
+ if (value == "")
280
+ return "";
281
281
 
282
- // XML encode it
283
- value = value.replace(/&/g, '&amp;');
284
- value = value.replace(/\"/g, '&quot;');
285
- value = value.replace(/</g, '&lt;');
286
- value = value.replace(/>/g, '&gt;');
282
+ // XML encode it
283
+ value = value.replace(/&/g, '&amp;');
284
+ value = value.replace(/\"/g, '&quot;');
285
+ value = value.replace(/</g, '&lt;');
286
+ value = value.replace(/>/g, '&gt;');
287
287
 
288
- return ' ' + attrib + '="' + value + '"';
288
+ return ' ' + attrib + '="' + value + '"';
289
289
  }
290
290
 
291
291
  function init() {
292
- tinyMCEPopup.resizeToInnerSize();
293
-
294
- document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
295
- document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
296
- document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
297
- document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
298
-
299
- var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
300
- var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
301
- var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
302
- var inst = tinyMCEPopup.editor, dom = inst.dom;
303
- var formObj = document.forms[0];
304
- var elm = dom.getParent(inst.selection.getNode(), "table");
305
-
306
- action = tinyMCEPopup.getWindowArg('action');
307
-
308
- if (!action)
309
- action = elm ? "update" : "insert";
310
-
311
- if (elm && action != "insert") {
312
- var rowsAr = elm.rows;
313
- var cols = 0;
314
- for (var i=0; i<rowsAr.length; i++)
315
- if (rowsAr[i].cells.length > cols)
316
- cols = rowsAr[i].cells.length;
317
-
318
- cols = cols;
319
- rows = rowsAr.length;
320
-
321
- st = dom.parseStyle(dom.getAttrib(elm, "style"));
322
- border = trimSize(getStyle(elm, 'border', 'borderWidth'));
323
- cellpadding = dom.getAttrib(elm, 'cellpadding', "");
324
- cellspacing = dom.getAttrib(elm, 'cellspacing', "");
325
- width = trimSize(getStyle(elm, 'width', 'width'));
326
- height = trimSize(getStyle(elm, 'height', 'height'));
327
- bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
328
- bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
329
- align = dom.getAttrib(elm, 'align', align);
330
- frame = dom.getAttrib(elm, 'frame');
331
- rules = dom.getAttrib(elm, 'rules');
332
- className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
333
- id = dom.getAttrib(elm, 'id');
334
- summary = dom.getAttrib(elm, 'summary');
335
- style = dom.serializeStyle(st);
336
- dir = dom.getAttrib(elm, 'dir');
337
- lang = dom.getAttrib(elm, 'lang');
338
- background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
339
- formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
340
-
341
- orgTableWidth = width;
342
- orgTableHeight = height;
343
-
344
- action = "update";
345
- formObj.insert.value = inst.getLang('update');
346
- }
347
-
348
- addClassesToList('class', "table_styles");
349
- TinyMCE_EditableSelects.init();
350
-
351
- // Update form
352
- selectByValue(formObj, 'align', align);
353
- selectByValue(formObj, 'tframe', frame);
354
- selectByValue(formObj, 'rules', rules);
355
- selectByValue(formObj, 'class', className, true, true);
356
- formObj.cols.value = cols;
357
- formObj.rows.value = rows;
358
- formObj.border.value = border;
359
- formObj.cellpadding.value = cellpadding;
360
- formObj.cellspacing.value = cellspacing;
361
- formObj.width.value = width;
362
- formObj.height.value = height;
363
- formObj.bordercolor.value = bordercolor;
364
- formObj.bgcolor.value = bgcolor;
365
- formObj.id.value = id;
366
- formObj.summary.value = summary;
367
- formObj.style.value = style;
368
- formObj.dir.value = dir;
369
- formObj.lang.value = lang;
370
- formObj.backgroundimage.value = background;
371
-
372
- updateColor('bordercolor_pick', 'bordercolor');
373
- updateColor('bgcolor_pick', 'bgcolor');
374
-
375
- // Resize some elements
376
- if (isVisible('backgroundimagebrowser'))
377
- document.getElementById('backgroundimage').style.width = '180px';
378
-
379
- // Disable some fields in update mode
380
- if (action == "update") {
381
- formObj.cols.disabled = true;
382
- formObj.rows.disabled = true;
383
- }
292
+ tinyMCEPopup.resizeToInnerSize();
293
+
294
+ document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser', 'backgroundimage', 'image', 'table');
295
+ document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser', 'backgroundimage', 'image', 'table');
296
+ document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick', 'bordercolor');
297
+ document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick', 'bgcolor');
298
+
299
+ var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
300
+ var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
301
+ var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
302
+ var inst = tinyMCEPopup.editor, dom = inst.dom;
303
+ var formObj = document.forms[0];
304
+ var elm = dom.getParent(inst.selection.getNode(), "table");
305
+
306
+ action = tinyMCEPopup.getWindowArg('action');
307
+
308
+ if (!action)
309
+ action = elm ? "update" : "insert";
310
+
311
+ if (elm && action != "insert") {
312
+ var rowsAr = elm.rows;
313
+ var cols = 0;
314
+ for (var i = 0; i < rowsAr.length; i++)
315
+ if (rowsAr[i].cells.length > cols)
316
+ cols = rowsAr[i].cells.length;
317
+
318
+ cols = cols;
319
+ rows = rowsAr.length;
320
+
321
+ st = dom.parseStyle(dom.getAttrib(elm, "style"));
322
+ border = trimSize(getStyle(elm, 'border', 'borderWidth'));
323
+ cellpadding = dom.getAttrib(elm, 'cellpadding', "");
324
+ cellspacing = dom.getAttrib(elm, 'cellspacing', "");
325
+ width = trimSize(getStyle(elm, 'width', 'width'));
326
+ height = trimSize(getStyle(elm, 'height', 'height'));
327
+ bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
328
+ bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
329
+ align = dom.getAttrib(elm, 'align', align);
330
+ frame = dom.getAttrib(elm, 'frame');
331
+ rules = dom.getAttrib(elm, 'rules');
332
+ className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
333
+ id = dom.getAttrib(elm, 'id');
334
+ summary = dom.getAttrib(elm, 'summary');
335
+ style = dom.serializeStyle(st);
336
+ dir = dom.getAttrib(elm, 'dir');
337
+ lang = dom.getAttrib(elm, 'lang');
338
+ background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
339
+ formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
340
+
341
+ orgTableWidth = width;
342
+ orgTableHeight = height;
343
+
344
+ action = "update";
345
+ formObj.insert.value = inst.getLang('update');
346
+ }
347
+
348
+ addClassesToList('class', "table_styles");
349
+ TinyMCE_EditableSelects.init();
350
+
351
+ // Update form
352
+ selectByValue(formObj, 'align', align);
353
+ selectByValue(formObj, 'tframe', frame);
354
+ selectByValue(formObj, 'rules', rules);
355
+ selectByValue(formObj, 'class', className, true, true);
356
+ formObj.cols.value = cols;
357
+ formObj.rows.value = rows;
358
+ formObj.border.value = border;
359
+ formObj.cellpadding.value = cellpadding;
360
+ formObj.cellspacing.value = cellspacing;
361
+ formObj.width.value = width;
362
+ formObj.height.value = height;
363
+ formObj.bordercolor.value = bordercolor;
364
+ formObj.bgcolor.value = bgcolor;
365
+ formObj.id.value = id;
366
+ formObj.summary.value = summary;
367
+ formObj.style.value = style;
368
+ formObj.dir.value = dir;
369
+ formObj.lang.value = lang;
370
+ formObj.backgroundimage.value = background;
371
+
372
+ updateColor('bordercolor_pick', 'bordercolor');
373
+ updateColor('bgcolor_pick', 'bgcolor');
374
+
375
+ // Resize some elements
376
+ if (isVisible('backgroundimagebrowser'))
377
+ document.getElementById('backgroundimage').style.width = '180px';
378
+
379
+ // Disable some fields in update mode
380
+ if (action == "update") {
381
+ formObj.cols.disabled = true;
382
+ formObj.rows.disabled = true;
383
+ }
384
384
  }
385
385
 
386
386
  function changedSize() {
387
- var formObj = document.forms[0];
388
- var st = dom.parseStyle(formObj.style.value);
389
-
390
- /* var width = formObj.width.value;
391
- if (width != "")
392
- st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
393
- else
394
- st['width'] = "";*/
395
-
396
- var height = formObj.height.value;
397
- if (height != "")
398
- st['height'] = getCSSSize(height);
399
- else
400
- st['height'] = "";
401
-
402
- formObj.style.value = dom.serializeStyle(st);
387
+ var formObj = document.forms[0];
388
+ var st = dom.parseStyle(formObj.style.value);
389
+
390
+ /* var width = formObj.width.value;
391
+ if (width != "")
392
+ st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
393
+ else
394
+ st['width'] = "";*/
395
+
396
+ var height = formObj.height.value;
397
+ if (height != "")
398
+ st['height'] = getCSSSize(height);
399
+ else
400
+ st['height'] = "";
401
+
402
+ formObj.style.value = dom.serializeStyle(st);
403
403
  }
404
404
 
405
405
  function isCssSize(value) {
406
- return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);
406
+ return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);
407
407
  }
408
408
 
409
409
  function cssSize(value, def) {
410
- value = tinymce.trim(value || def);
410
+ value = tinymce.trim(value || def);
411
411
 
412
- if (!isCssSize(value)) {
413
- return parseInt(value, 10) + 'px';
414
- }
412
+ if (!isCssSize(value)) {
413
+ return parseInt(value, 10) + 'px';
414
+ }
415
415
 
416
- return value;
416
+ return value;
417
417
  }
418
418
 
419
419
  function changedBackgroundImage() {
420
- var formObj = document.forms[0];
421
- var st = dom.parseStyle(formObj.style.value);
420
+ var formObj = document.forms[0];
421
+ var st = dom.parseStyle(formObj.style.value);
422
422
 
423
- st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
423
+ st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
424
424
 
425
- formObj.style.value = dom.serializeStyle(st);
425
+ formObj.style.value = dom.serializeStyle(st);
426
426
  }
427
427
 
428
428
  function changedBorder() {
429
- var formObj = document.forms[0];
430
- var st = dom.parseStyle(formObj.style.value);
431
-
432
- // Update border width if the element has a color
433
- if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))
434
- st['border-width'] = cssSize(formObj.border.value);
435
- else {
436
- if (!formObj.border.value) {
437
- st['border'] = '';
438
- st['border-width'] = '';
439
- }
440
- }
441
-
442
- formObj.style.value = dom.serializeStyle(st);
429
+ var formObj = document.forms[0];
430
+ var st = dom.parseStyle(formObj.style.value);
431
+
432
+ // Update border width if the element has a color
433
+ if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))
434
+ st['border-width'] = cssSize(formObj.border.value);
435
+ else {
436
+ if (!formObj.border.value) {
437
+ st['border'] = '';
438
+ st['border-width'] = '';
439
+ }
440
+ }
441
+
442
+ formObj.style.value = dom.serializeStyle(st);
443
443
  }
444
444
 
445
445
  function changedColor() {
446
- var formObj = document.forms[0];
447
- var st = dom.parseStyle(formObj.style.value);
446
+ var formObj = document.forms[0];
447
+ var st = dom.parseStyle(formObj.style.value);
448
448
 
449
- st['background-color'] = formObj.bgcolor.value;
449
+ st['background-color'] = formObj.bgcolor.value;
450
450
 
451
- if (formObj.bordercolor.value != "") {
452
- st['border-color'] = formObj.bordercolor.value;
451
+ if (formObj.bordercolor.value != "") {
452
+ st['border-color'] = formObj.bordercolor.value;
453
453
 
454
- // Add border-width if it's missing
455
- if (!st['border-width'])
456
- st['border-width'] = cssSize(formObj.border.value, 1);
457
- }
454
+ // Add border-width if it's missing
455
+ if (!st['border-width'])
456
+ st['border-width'] = cssSize(formObj.border.value, 1);
457
+ }
458
458
 
459
- formObj.style.value = dom.serializeStyle(st);
459
+ formObj.style.value = dom.serializeStyle(st);
460
460
  }
461
461
 
462
462
  function changedStyle() {
463
- var formObj = document.forms[0];
464
- var st = dom.parseStyle(formObj.style.value);
463
+ var formObj = document.forms[0];
464
+ var st = dom.parseStyle(formObj.style.value);
465
465
 
466
- if (st['background-image'])
467
- formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
468
- else
469
- formObj.backgroundimage.value = '';
466
+ if (st['background-image'])
467
+ formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
468
+ else
469
+ formObj.backgroundimage.value = '';
470
470
 
471
- if (st['width'])
472
- formObj.width.value = trimSize(st['width']);
471
+ if (st['width'])
472
+ formObj.width.value = trimSize(st['width']);
473
473
 
474
- if (st['height'])
475
- formObj.height.value = trimSize(st['height']);
474
+ if (st['height'])
475
+ formObj.height.value = trimSize(st['height']);
476
476
 
477
- if (st['background-color']) {
478
- formObj.bgcolor.value = st['background-color'];
479
- updateColor('bgcolor_pick','bgcolor');
480
- }
477
+ if (st['background-color']) {
478
+ formObj.bgcolor.value = st['background-color'];
479
+ updateColor('bgcolor_pick', 'bgcolor');
480
+ }
481
481
 
482
- if (st['border-color']) {
483
- formObj.bordercolor.value = st['border-color'];
484
- updateColor('bordercolor_pick','bordercolor');
485
- }
482
+ if (st['border-color']) {
483
+ formObj.bordercolor.value = st['border-color'];
484
+ updateColor('bordercolor_pick', 'bordercolor');
485
+ }
486
486
  }
487
487
 
488
488
  tinyMCEPopup.onInit.add(init);