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
@@ -1,54 +1,54 @@
1
1
  /*
2
- * jquery-in-place-edit plugin
3
- *
4
- * Copyright (c) 2008 Christian Hellsten
5
- *
6
- * Plugin homepage:
7
- * http://aktagon.com/projects/jquery/in-place-edit/
8
- * http://github.com/christianhellsten/jquery-in-place-edit/
9
- *
10
- * Examples:
11
- * http://aktagon.com/projects/jquery/in-place-edit/examples/
12
- *
13
- * Repository:
14
- * git://github.com/christianhellsten/jquery-in-place-edit.git
15
- *
16
- * Version 1.0.2
17
- *
18
- * Tested with:
19
- * Windows: Firefox 2, Firefox 3, Internet Explorer 6, Internet Explorer 7
20
- * Linux: Firefox 2, Firefox 3, Opera
21
- * Mac: Firefox 2, Firefox 3, Opera
22
- *
23
- *
24
- * Licensed under the MIT license:
25
- * http://www.opensource.org/licenses/mit-license.php
26
- *
27
- */
28
- (function($) {
29
-
30
- $.fn.inPlaceEdit = function(options) {
31
-
2
+ * jquery-in-place-edit plugin
3
+ *
4
+ * Copyright (c) 2008 Christian Hellsten
5
+ *
6
+ * Plugin homepage:
7
+ * http://aktagon.com/projects/jquery/in-place-edit/
8
+ * http://github.com/christianhellsten/jquery-in-place-edit/
9
+ *
10
+ * Examples:
11
+ * http://aktagon.com/projects/jquery/in-place-edit/examples/
12
+ *
13
+ * Repository:
14
+ * git://github.com/christianhellsten/jquery-in-place-edit.git
15
+ *
16
+ * Version 1.0.2
17
+ *
18
+ * Tested with:
19
+ * Windows: Firefox 2, Firefox 3, Internet Explorer 6, Internet Explorer 7
20
+ * Linux: Firefox 2, Firefox 3, Opera
21
+ * Mac: Firefox 2, Firefox 3, Opera
22
+ *
23
+ *
24
+ * Licensed under the MIT license:
25
+ * http://www.opensource.org/licenses/mit-license.php
26
+ *
27
+ */
28
+ (function ($) {
29
+
30
+ $.fn.inPlaceEdit = function (options) {
31
+
32
32
  // Add click handler to all matching elements
33
- return this.each(function() {
33
+ return this.each(function () {
34
34
  // Use default options, if necessary
35
35
  var settings = $.extend({}, $.fn.inPlaceEdit.defaults, options);
36
-
36
+
37
37
  var element = $(this);
38
-
39
- element.click(function() {
38
+
39
+ element.click(function () {
40
40
  element.data('skipBlur', false)
41
-
41
+
42
42
  // Prevent multiple clicks, and check if inplace editing is disabled
43
43
  if (element.hasClass("editing") || element.hasClass("disabled")) {
44
- return;
44
+ return;
45
45
  }
46
-
46
+
47
47
  element.addClass("editing");
48
-
48
+
49
49
  element.old_value = element.html(); // Store old HTML so we can revert to it later
50
-
51
- if(typeof(settings.html) == 'string') { // There are two types of form templates: strings and DOM elements
50
+
51
+ if (typeof(settings.html) == 'string') { // There are two types of form templates: strings and DOM elements
52
52
  element.html(settings.html); // Replace current HTML with given HTML
53
53
  }
54
54
  else {
@@ -56,55 +56,55 @@
56
56
  var form_template = settings.html.children(':first').clone(true);
57
57
  form_template.appendTo(element); // Clone event handlers too
58
58
  }
59
-
59
+
60
60
  $('.field', element).val(element.old_value); // Set field value to old HTML
61
61
  $('.field', element).focus(); // Set focus to input field
62
62
  $('.field', element).select(); // Select all text in field
63
-
63
+
64
64
  // On blur: cancel action
65
- if(settings.onBlurDisabled == false) {
66
- $('.field', element).blur(function() {
65
+ if (settings.onBlurDisabled == false) {
66
+ $('.field', element).blur(function () {
67
67
  // Prevent cancel from being triggered when clicking Save & Cancel button
68
68
  var skipBlur = element.data('skipBlur')
69
-
70
- if(skipBlur != true) {
69
+
70
+ if (skipBlur != true) {
71
71
  element.timeout = setTimeout(cancel, 50);
72
72
  }
73
-
73
+
74
74
  element.data('skipBlur', false)
75
75
  });
76
76
  }
77
-
77
+
78
78
  // On save: revert to old HTML and submit
79
- $('.save-button', element).click(function() {
79
+ $('.save-button', element).click(function () {
80
80
  return submit();
81
81
  });
82
-
83
- $('.save-button', element).mousedown(function() {
82
+
83
+ $('.save-button', element).mousedown(function () {
84
84
  element.data('skipBlur', true)
85
85
  });
86
-
87
- $('.cancel-button', element).mousedown(function() {
86
+
87
+ $('.cancel-button', element).mousedown(function () {
88
88
  element.data('skipBlur', true)
89
89
  });
90
-
90
+
91
91
  // On cancel: revert to old HTML
92
- $('.cancel-button', element).click(function() {
92
+ $('.cancel-button', element).click(function () {
93
93
  return cancel();
94
94
  });
95
-
95
+
96
96
  // On keyup: submit (ESC) or cancel (enter)
97
- if(settings.onKeyupDisabled == false) {
98
- $('.field', element).keyup(function(event) {
97
+ if (settings.onKeyupDisabled == false) {
98
+ $('.field', element).keyup(function (event) {
99
99
  var keycode = event.which;
100
100
  var type = this.tagName.toLowerCase();
101
-
102
- if(keycode == 27 && settings.escapeKeyDisabled == false) { // escape
101
+
102
+ if (keycode == 27 && settings.escapeKeyDisabled == false) { // escape
103
103
  return cancel();
104
104
  }
105
- else if(keycode == 13) { // enter
105
+ else if (keycode == 13) { // enter
106
106
  // Don't submit on enter if this is a textarea
107
- if(type != "textarea") {
107
+ if (type != "textarea") {
108
108
  return submit();
109
109
  }
110
110
  }
@@ -112,54 +112,55 @@
112
112
  });
113
113
  }
114
114
  });
115
-
115
+
116
116
  // Add hover class on mouseover
117
- element.mouseover(function() {
117
+ element.mouseover(function () {
118
118
  element.addClass("hover");
119
119
  });
120
-
120
+
121
121
  // Remove hover class on mouseout
122
- element.mouseout(function() {
122
+ element.mouseout(function () {
123
123
  element.removeClass("hover");
124
124
  });
125
-
125
+
126
126
  function cancel() {
127
127
  element.html(element.old_value);
128
-
128
+
129
129
  element.removeClass("hover editing");
130
-
131
- if(options.cancel) {
130
+
131
+ if (options.cancel) {
132
132
  options.cancel.apply(element, [element]);
133
133
  }
134
134
  return false; // Stop propagation
135
- };
136
-
135
+ }
136
+
137
137
  function submit() {
138
138
  clearTimeout(element.timeout);
139
-
139
+
140
140
  var id = element.attr('id');
141
141
  var value = $('.field', element).val();
142
-
143
- if(options.submit) {
142
+
143
+ if (options.submit) {
144
144
  options.submit.apply(element, [element, id, value, element.old_value]);
145
145
  }
146
-
146
+
147
147
  element.removeClass("hover editing");
148
-
148
+
149
149
  element.html(value);
150
-
150
+
151
151
  return false; // Stop propagation
152
- };
152
+ }
153
+
153
154
  });
154
-
155
+
155
156
  };
156
-
157
+
157
158
  // Default (overridable) settings
158
159
  $.fn.inPlaceEdit.defaults = {
159
- onBlurDisabled : false,
160
- onKeyupDisabled : false,
161
- escapeKeyDisabled : false,
162
- html : ' \
160
+ onBlurDisabled:false,
161
+ onKeyupDisabled:false,
162
+ escapeKeyDisabled:false,
163
+ html:' \
163
164
  <div class="inplace-edit"> \
164
165
  <input type="text" value="" class="field" /> \
165
166
  <div class="buttons"> \
@@ -4,388 +4,391 @@
4
4
  * http://mjsarfatti.com/sandbox/nestedSortable
5
5
  *
6
6
  * Depends:
7
- * jquery.ui.sortable.js 1.8+
7
+ * jquery.ui.sortable.js 1.8+
8
8
  *
9
9
  * License CC BY-SA 3.0
10
10
  * Copyright 2010-2011, Manuele J Sarfatti
11
11
  */
12
12
 
13
- (function($) {
13
+ (function ($) {
14
14
 
15
- $.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
15
+ $.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
16
16
 
17
- options: {
18
- tabSize: 20,
19
- disableNesting: 'ui-nestedSortable-no-nesting',
20
- errorClass: 'ui-nestedSortable-error',
21
- listType: 'ol',
22
- maxLevels: 0,
23
- revertOnError: 1
24
- },
25
-
26
- _create: function() {
27
- this.element.data('sortable', this.element.data('nestedSortable'));
28
- return $.ui.sortable.prototype._create.apply(this, arguments);
29
- },
30
-
31
- destroy: function() {
32
- this.element
33
- .removeData("nestedSortable")
34
- .unbind(".nestedSortable");
35
- return $.ui.sortable.prototype.destroy.apply(this, arguments);
36
- },
37
-
38
- _mouseDrag: function(event) {
39
-
40
- //Compute the helpers position
41
- this.position = this._generatePosition(event);
42
- this.positionAbs = this._convertPositionTo("absolute");
43
-
44
- if (!this.lastPositionAbs) {
45
- this.lastPositionAbs = this.positionAbs;
46
- }
47
-
48
- //Do scrolling
49
- if(this.options.scroll) {
50
- var o = this.options, scrolled = false;
51
- if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
52
-
53
- if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
54
- this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
55
- else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
56
- this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
57
-
58
- if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
59
- this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
60
- else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
61
- this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
62
-
63
- } else {
64
-
65
- if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
66
- scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
67
- else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
68
- scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
69
-
70
- if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
71
- scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
72
- else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
73
- scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
74
-
75
- }
76
-
77
- if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
78
- $.ui.ddmanager.prepareOffsets(this, event);
79
- }
80
-
81
- //Regenerate the absolute position used for position checks
82
- this.positionAbs = this._convertPositionTo("absolute");
83
-
84
- //Set the helper position
85
- if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
86
- if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
87
-
88
- //Rearrange
89
- for (var i = this.items.length - 1; i >= 0; i--) {
90
-
91
- //Cache variables and intersection, continue if no intersection
92
- var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
93
- if (!intersection) continue;
94
-
95
- if(itemElement != this.currentItem[0] //cannot intersect with itself
96
- && this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
97
- && !$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
98
- && (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
99
- //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
100
- ) {
101
-
102
- $(itemElement).mouseenter();
103
-
104
- this.direction = intersection == 1 ? "down" : "up";
105
-
106
- if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
107
- $(itemElement).mouseleave();
108
- this._rearrange(event, item);
109
- } else {
110
- break;
111
- }
112
-
113
- // Clear emtpy ul's/ol's
114
- this._clearEmpty(itemElement);
115
-
116
- this._trigger("change", event, this._uiHash());
117
- break;
118
- }
119
- }
120
-
121
- var parentItem = (this.placeholder[0].parentNode.parentNode
122
- && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
123
- ? $(this.placeholder[0].parentNode.parentNode)
124
- : null,
125
- level = this._getLevel(this.placeholder),
126
- childLevels = this._getChildLevels(this.helper),
127
- previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
128
-
129
- if (previousItem != null) {
130
- while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
131
- if (previousItem[0].previousSibling) {
132
- previousItem = $(previousItem[0].previousSibling);
133
- } else {
134
- previousItem = null;
135
- break;
136
- }
137
- }
138
- }
139
-
140
- newList = document.createElement(o.listType);
141
-
142
- this.beyondMaxLevels = 0;
143
-
144
- // If the item is moved to the left, send it to its parent level
145
- if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
146
- parentItem.after(this.placeholder[0]);
147
- this._clearEmpty(parentItem[0]);
148
- this._trigger("change", event, this._uiHash());
149
- }
150
- // If the item is below another one and is moved to the right, make it a children of it
151
- else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
152
- this._isAllowed(previousItem, level+childLevels+1);
153
- if (!previousItem.children(o.listType).length) {
154
- previousItem[0].appendChild(newList);
155
- }
156
- previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
157
- this._trigger("change", event, this._uiHash());
158
- }
159
- else {
160
- this._isAllowed(parentItem, level+childLevels);
161
- }
162
-
163
- //Post events to containers
164
- this._contactContainers(event);
165
-
166
- //Interconnect with droppables
167
- if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
168
-
169
- //Call callbacks
170
- this._trigger('sort', event, this._uiHash());
171
-
172
- this.lastPositionAbs = this.positionAbs;
173
- return false;
174
-
175
- },
176
-
177
- _mouseStop: function(event, noPropagation) {
178
-
179
- // If the item is in a position not allowed, send it back
180
- if (this.beyondMaxLevels) {
181
-
182
- this.placeholder.removeClass(this.options.errorClass);
183
-
184
- if (this.options.revertOnError) {
185
- if (this.domPosition.prev) {
186
- $(this.domPosition.prev).after(this.placeholder);
187
- } else {
188
- $(this.domPosition.parent).prepend(this.placeholder);
189
- }
190
- this._trigger("revert", event, this._uiHash());
191
- } else {
192
- var parent = this.placeholder.parent().closest(this.options.items);
193
-
194
- for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
195
- parent = parent.parent().closest(this.options.items);
196
- }
197
-
198
- parent.after(this.placeholder);
199
- this._trigger("change", event, this._uiHash());
200
- }
201
-
202
- }
203
-
204
- // Clean last empty ul/ol
205
- for (var i = this.items.length - 1; i >= 0; i--) {
206
- var item = this.items[i].item[0];
207
- this._clearEmpty(item);
208
- }
209
-
210
- $.ui.sortable.prototype._mouseStop.apply(this, arguments);
211
-
212
- },
213
-
214
- serialize: function(o) {
215
-
216
- var items = this._getItemsAsjQuery(o && o.connected),
217
- str = []; o = o || {};
218
-
219
- $(items).each(function() {
220
- var res = ($(o.item || this).attr(o.attribute || 'id') || '')
221
- .match(o.expression || (/(.+)[-=_](.+)/)),
222
- pid = ($(o.item || this).parent(o.listType)
223
- .parent('li')
224
- .attr(o.attribute || 'id') || '')
225
- .match(o.expression || (/(.+)[-=_](.+)/));
226
-
227
- if (res) {
228
- str.push((o.key || res[1] + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
229
- + '='
230
- + (pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
231
- }
232
- });
233
-
234
- if(!str.length && o.key) {
235
- str.push(o.key + '=');
236
- }
237
-
238
- return str.join('&');
239
-
240
- },
241
-
242
- toHierarchy: function(o) {
243
-
244
- o = o || {};
245
- var sDepth = o.startDepthCount || 0,
246
- ret = [];
247
-
248
- $(this.element).children('li').each(function () {
249
- var level = _recursiveItems($(this));
250
- ret.push(level);
251
- });
252
-
253
- return ret;
254
-
255
- function _recursiveItems(li) {
256
- var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
257
- if (id) {
258
- var item = {"id" : id[2]};
259
- if ($(li).children(o.listType).children('li').length > 0) {
260
- item.children = [];
261
- $(li).children(o.listType).children('li').each(function() {
262
- var level = _recursiveItems($(this));
263
- item.children.push(level);
264
- });
265
- }
266
- return item;
267
- }
268
- }
269
- },
270
-
271
- toArray: function(o) {
272
-
273
- o = o || {};
274
- var sDepth = o.startDepthCount || 0,
275
- ret = [],
276
- left = 2;
277
-
278
- ret.push({
279
- "item_id": 'root',
280
- "parent_id": 'none',
281
- "depth": sDepth,
282
- "left": '1',
283
- "right": ($('li', this.element).length + 1) * 2
284
- });
285
-
286
- $(this.element).children('li').each(function () {
287
- left = _recursiveArray(this, sDepth + 1, left);
288
- });
289
-
290
- ret = ret.sort(function(a,b){ return (a.left - b.left); });
291
-
292
- return ret;
293
-
294
- function _recursiveArray(item, depth, left) {
295
-
296
- var right = left + 1,
297
- id,
298
- pid;
299
-
300
- if ($(item).children(o.listType).children('li').length > 0) {
301
- depth ++;
302
- $(item).children(o.listType).children('li').each(function () {
303
- right = _recursiveArray($(this), depth, right);
304
- });
305
- depth --;
306
- }
307
-
308
- id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
309
-
310
- if (depth === sDepth + 1) {
311
- pid = 'root';
312
- } else {
313
- var parentItem = ($(item).parent(o.listType)
314
- .parent('li')
315
- .attr(o.attribute || 'id'))
316
- .match(o.expression || (/(.+)[-=_](.+)/));
317
- pid = parentItem[2];
318
- }
319
-
320
- if (id) {
321
- ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
322
- }
323
-
324
- left = right + 1;
325
- return left;
326
- }
327
-
328
- },
329
-
330
- _clearEmpty: function(item) {
331
-
332
- var emptyList = $(item).children(this.options.listType);
333
- if (emptyList.length && !emptyList.children().length) {
334
- emptyList.remove();
335
- }
336
-
337
- },
338
-
339
- _getLevel: function(item) {
340
-
341
- var level = 1;
342
-
343
- if (this.options.listType) {
344
- var list = item.closest(this.options.listType);
345
- while (!list.is('.ui-sortable')) {
346
- level++;
347
- list = list.parent().closest(this.options.listType);
348
- }
349
- }
350
-
351
- return level;
352
- },
353
-
354
- _getChildLevels: function(parent, depth) {
355
- var self = this,
356
- o = this.options,
357
- result = 0;
358
- depth = depth || 0;
359
-
360
- $(parent).children(o.listType).children(o.items).each(function (index, child) {
361
- result = Math.max(self._getChildLevels(child, depth + 1), result);
362
- });
363
-
364
- return depth ? result + 1 : result;
365
- },
366
-
367
- _isAllowed: function(parentItem, levels) {
368
- var o = this.options;
369
- // Are we trying to nest under a no-nest or are we nesting too deep?
370
- if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
371
- if (o.maxLevels < levels && o.maxLevels != 0) {
372
- this.placeholder.addClass(o.errorClass);
373
- this.beyondMaxLevels = levels - o.maxLevels;
374
- } else {
375
- this.placeholder.removeClass(o.errorClass);
376
- this.beyondMaxLevels = 0;
377
- }
378
- } else {
379
- this.placeholder.addClass(o.errorClass);
380
- if (o.maxLevels < levels && o.maxLevels != 0) {
381
- this.beyondMaxLevels = levels - o.maxLevels;
382
- } else {
383
- this.beyondMaxLevels = 1;
384
- }
385
- }
386
- }
387
-
388
- }));
389
-
390
- $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
17
+ options:{
18
+ tabSize:20,
19
+ disableNesting:'ui-nestedSortable-no-nesting',
20
+ errorClass:'ui-nestedSortable-error',
21
+ listType:'ol',
22
+ maxLevels:0,
23
+ revertOnError:1
24
+ },
25
+
26
+ _create:function () {
27
+ this.element.data('sortable', this.element.data('nestedSortable'));
28
+ return $.ui.sortable.prototype._create.apply(this, arguments);
29
+ },
30
+
31
+ destroy:function () {
32
+ this.element
33
+ .removeData("nestedSortable")
34
+ .unbind(".nestedSortable");
35
+ return $.ui.sortable.prototype.destroy.apply(this, arguments);
36
+ },
37
+
38
+ _mouseDrag:function (event) {
39
+
40
+ //Compute the helpers position
41
+ this.position = this._generatePosition(event);
42
+ this.positionAbs = this._convertPositionTo("absolute");
43
+
44
+ if (!this.lastPositionAbs) {
45
+ this.lastPositionAbs = this.positionAbs;
46
+ }
47
+
48
+ //Do scrolling
49
+ if (this.options.scroll) {
50
+ var o = this.options, scrolled = false;
51
+ if (this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
52
+
53
+ if ((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
54
+ this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
55
+ else if (event.pageY - this.overflowOffset.top < o.scrollSensitivity)
56
+ this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
57
+
58
+ if ((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
59
+ this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
60
+ else if (event.pageX - this.overflowOffset.left < o.scrollSensitivity)
61
+ this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
62
+
63
+ } else {
64
+
65
+ if (event.pageY - $(document).scrollTop() < o.scrollSensitivity)
66
+ scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
67
+ else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
68
+ scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
69
+
70
+ if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
71
+ scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
72
+ else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
73
+ scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
74
+
75
+ }
76
+
77
+ if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
78
+ $.ui.ddmanager.prepareOffsets(this, event);
79
+ }
80
+
81
+ //Regenerate the absolute position used for position checks
82
+ this.positionAbs = this._convertPositionTo("absolute");
83
+
84
+ //Set the helper position
85
+ if (!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left + 'px';
86
+ if (!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top + 'px';
87
+
88
+ //Rearrange
89
+ for (var i = this.items.length - 1; i >= 0; i--) {
90
+
91
+ //Cache variables and intersection, continue if no intersection
92
+ var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
93
+ if (!intersection) continue;
94
+
95
+ if (itemElement != this.currentItem[0] //cannot intersect with itself
96
+ && this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
97
+ && !$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
98
+ && (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
99
+ //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
100
+ ) {
101
+
102
+ $(itemElement).mouseenter();
103
+
104
+ this.direction = intersection == 1 ? "down" : "up";
105
+
106
+ if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
107
+ $(itemElement).mouseleave();
108
+ this._rearrange(event, item);
109
+ } else {
110
+ break;
111
+ }
112
+
113
+ // Clear emtpy ul's/ol's
114
+ this._clearEmpty(itemElement);
115
+
116
+ this._trigger("change", event, this._uiHash());
117
+ break;
118
+ }
119
+ }
120
+
121
+ var parentItem = (this.placeholder[0].parentNode.parentNode
122
+ && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
123
+ ? $(this.placeholder[0].parentNode.parentNode)
124
+ : null,
125
+ level = this._getLevel(this.placeholder),
126
+ childLevels = this._getChildLevels(this.helper),
127
+ previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
128
+
129
+ if (previousItem != null) {
130
+ while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
131
+ if (previousItem[0].previousSibling) {
132
+ previousItem = $(previousItem[0].previousSibling);
133
+ } else {
134
+ previousItem = null;
135
+ break;
136
+ }
137
+ }
138
+ }
139
+
140
+ newList = document.createElement(o.listType);
141
+
142
+ this.beyondMaxLevels = 0;
143
+
144
+ // If the item is moved to the left, send it to its parent level
145
+ if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
146
+ parentItem.after(this.placeholder[0]);
147
+ this._clearEmpty(parentItem[0]);
148
+ this._trigger("change", event, this._uiHash());
149
+ }
150
+ // If the item is below another one and is moved to the right, make it a children of it
151
+ else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
152
+ this._isAllowed(previousItem, level + childLevels + 1);
153
+ if (!previousItem.children(o.listType).length) {
154
+ previousItem[0].appendChild(newList);
155
+ }
156
+ previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
157
+ this._trigger("change", event, this._uiHash());
158
+ }
159
+ else {
160
+ this._isAllowed(parentItem, level + childLevels);
161
+ }
162
+
163
+ //Post events to containers
164
+ this._contactContainers(event);
165
+
166
+ //Interconnect with droppables
167
+ if ($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
168
+
169
+ //Call callbacks
170
+ this._trigger('sort', event, this._uiHash());
171
+
172
+ this.lastPositionAbs = this.positionAbs;
173
+ return false;
174
+
175
+ },
176
+
177
+ _mouseStop:function (event, noPropagation) {
178
+
179
+ // If the item is in a position not allowed, send it back
180
+ if (this.beyondMaxLevels) {
181
+
182
+ this.placeholder.removeClass(this.options.errorClass);
183
+
184
+ if (this.options.revertOnError) {
185
+ if (this.domPosition.prev) {
186
+ $(this.domPosition.prev).after(this.placeholder);
187
+ } else {
188
+ $(this.domPosition.parent).prepend(this.placeholder);
189
+ }
190
+ this._trigger("revert", event, this._uiHash());
191
+ } else {
192
+ var parent = this.placeholder.parent().closest(this.options.items);
193
+
194
+ for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
195
+ parent = parent.parent().closest(this.options.items);
196
+ }
197
+
198
+ parent.after(this.placeholder);
199
+ this._trigger("change", event, this._uiHash());
200
+ }
201
+
202
+ }
203
+
204
+ // Clean last empty ul/ol
205
+ for (var i = this.items.length - 1; i >= 0; i--) {
206
+ var item = this.items[i].item[0];
207
+ this._clearEmpty(item);
208
+ }
209
+
210
+ $.ui.sortable.prototype._mouseStop.apply(this, arguments);
211
+
212
+ },
213
+
214
+ serialize:function (o) {
215
+
216
+ var items = this._getItemsAsjQuery(o && o.connected),
217
+ str = [];
218
+ o = o || {};
219
+
220
+ $(items).each(function () {
221
+ var res = ($(o.item || this).attr(o.attribute || 'id') || '')
222
+ .match(o.expression || (/(.+)[-=_](.+)/)),
223
+ pid = ($(o.item || this).parent(o.listType)
224
+ .parent('li')
225
+ .attr(o.attribute || 'id') || '')
226
+ .match(o.expression || (/(.+)[-=_](.+)/));
227
+
228
+ if (res) {
229
+ str.push((o.key || res[1] + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
230
+ + '='
231
+ + (pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
232
+ }
233
+ });
234
+
235
+ if (!str.length && o.key) {
236
+ str.push(o.key + '=');
237
+ }
238
+
239
+ return str.join('&');
240
+
241
+ },
242
+
243
+ toHierarchy:function (o) {
244
+
245
+ o = o || {};
246
+ var sDepth = o.startDepthCount || 0,
247
+ ret = [];
248
+
249
+ $(this.element).children('li').each(function () {
250
+ var level = _recursiveItems($(this));
251
+ ret.push(level);
252
+ });
253
+
254
+ return ret;
255
+
256
+ function _recursiveItems(li) {
257
+ var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
258
+ if (id) {
259
+ var item = {"id":id[2]};
260
+ if ($(li).children(o.listType).children('li').length > 0) {
261
+ item.children = [];
262
+ $(li).children(o.listType).children('li').each(function () {
263
+ var level = _recursiveItems($(this));
264
+ item.children.push(level);
265
+ });
266
+ }
267
+ return item;
268
+ }
269
+ }
270
+ },
271
+
272
+ toArray:function (o) {
273
+
274
+ o = o || {};
275
+ var sDepth = o.startDepthCount || 0,
276
+ ret = [],
277
+ left = 2;
278
+
279
+ ret.push({
280
+ "item_id":'root',
281
+ "parent_id":'none',
282
+ "depth":sDepth,
283
+ "left":'1',
284
+ "right":($('li', this.element).length + 1) * 2
285
+ });
286
+
287
+ $(this.element).children('li').each(function () {
288
+ left = _recursiveArray(this, sDepth + 1, left);
289
+ });
290
+
291
+ ret = ret.sort(function (a, b) {
292
+ return (a.left - b.left);
293
+ });
294
+
295
+ return ret;
296
+
297
+ function _recursiveArray(item, depth, left) {
298
+
299
+ var right = left + 1,
300
+ id,
301
+ pid;
302
+
303
+ if ($(item).children(o.listType).children('li').length > 0) {
304
+ depth++;
305
+ $(item).children(o.listType).children('li').each(function () {
306
+ right = _recursiveArray($(this), depth, right);
307
+ });
308
+ depth--;
309
+ }
310
+
311
+ id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
312
+
313
+ if (depth === sDepth + 1) {
314
+ pid = 'root';
315
+ } else {
316
+ var parentItem = ($(item).parent(o.listType)
317
+ .parent('li')
318
+ .attr(o.attribute || 'id'))
319
+ .match(o.expression || (/(.+)[-=_](.+)/));
320
+ pid = parentItem[2];
321
+ }
322
+
323
+ if (id) {
324
+ ret.push({"item_id":id[2], "parent_id":pid, "depth":depth, "left":left, "right":right});
325
+ }
326
+
327
+ left = right + 1;
328
+ return left;
329
+ }
330
+
331
+ },
332
+
333
+ _clearEmpty:function (item) {
334
+
335
+ var emptyList = $(item).children(this.options.listType);
336
+ if (emptyList.length && !emptyList.children().length) {
337
+ emptyList.remove();
338
+ }
339
+
340
+ },
341
+
342
+ _getLevel:function (item) {
343
+
344
+ var level = 1;
345
+
346
+ if (this.options.listType) {
347
+ var list = item.closest(this.options.listType);
348
+ while (!list.is('.ui-sortable')) {
349
+ level++;
350
+ list = list.parent().closest(this.options.listType);
351
+ }
352
+ }
353
+
354
+ return level;
355
+ },
356
+
357
+ _getChildLevels:function (parent, depth) {
358
+ var self = this,
359
+ o = this.options,
360
+ result = 0;
361
+ depth = depth || 0;
362
+
363
+ $(parent).children(o.listType).children(o.items).each(function (index, child) {
364
+ result = Math.max(self._getChildLevels(child, depth + 1), result);
365
+ });
366
+
367
+ return depth ? result + 1 : result;
368
+ },
369
+
370
+ _isAllowed:function (parentItem, levels) {
371
+ var o = this.options;
372
+ // Are we trying to nest under a no-nest or are we nesting too deep?
373
+ if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
374
+ if (o.maxLevels < levels && o.maxLevels != 0) {
375
+ this.placeholder.addClass(o.errorClass);
376
+ this.beyondMaxLevels = levels - o.maxLevels;
377
+ } else {
378
+ this.placeholder.removeClass(o.errorClass);
379
+ this.beyondMaxLevels = 0;
380
+ }
381
+ } else {
382
+ this.placeholder.addClass(o.errorClass);
383
+ if (o.maxLevels < levels && o.maxLevels != 0) {
384
+ this.beyondMaxLevels = levels - o.maxLevels;
385
+ } else {
386
+ this.beyondMaxLevels = 1;
387
+ }
388
+ }
389
+ }
390
+
391
+ }));
392
+
393
+ $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
391
394
  })(jQuery);