alchemy_cms 5.3.4 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (295) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +6 -14
  3. data/.gitignore +1 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +80 -69
  7. data/Gemfile +4 -2
  8. data/README.md +5 -2
  9. data/Rakefile +0 -18
  10. data/alchemy_cms.gemspec +78 -65
  11. data/app/assets/javascripts/alchemy/admin.js +2 -2
  12. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +0 -30
  13. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +2 -1
  14. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +2 -7
  15. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +0 -25
  16. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -1
  17. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -0
  18. data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +1 -1
  19. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
  20. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  21. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +40 -29
  22. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +24 -0
  23. data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +119 -0
  24. data/app/assets/javascripts/alchemy/page_select.js +8 -13
  25. data/app/assets/javascripts/alchemy/templates/index.js +0 -1
  26. data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
  27. data/app/assets/javascripts/alchemy/templates/page.hbs +7 -17
  28. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  29. data/app/assets/stylesheets/alchemy/archive.scss +4 -8
  30. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  31. data/app/assets/stylesheets/alchemy/elements.scss +73 -61
  32. data/app/assets/stylesheets/alchemy/images.scss +8 -0
  33. data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
  34. data/app/assets/stylesheets/alchemy/page-select.scss +5 -29
  35. data/app/assets/stylesheets/alchemy/sitemap.scss +7 -9
  36. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  37. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  38. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -2
  39. data/app/controllers/alchemy/admin/base_controller.rb +8 -16
  40. data/app/controllers/alchemy/admin/elements_controller.rb +58 -34
  41. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  42. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  43. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  44. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  45. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  46. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  47. data/app/controllers/alchemy/admin/pages_controller.rb +19 -23
  48. data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
  49. data/app/controllers/alchemy/api/elements_controller.rb +10 -5
  50. data/app/controllers/alchemy/api/pages_controller.rb +3 -15
  51. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  52. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  53. data/app/decorators/alchemy/element_editor.rb +23 -1
  54. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  55. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  56. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  57. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  58. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  59. data/app/helpers/alchemy/elements_helper.rb +14 -7
  60. data/app/helpers/alchemy/pages_helper.rb +3 -11
  61. data/app/jobs/alchemy/base_job.rb +11 -0
  62. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  63. data/app/models/alchemy/attachment.rb +1 -1
  64. data/app/models/alchemy/content/factory.rb +23 -27
  65. data/app/models/alchemy/content.rb +1 -6
  66. data/app/models/alchemy/element/definitions.rb +29 -27
  67. data/app/models/alchemy/element/element_contents.rb +131 -122
  68. data/app/models/alchemy/element/element_essences.rb +100 -98
  69. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  70. data/app/models/alchemy/element/presenters.rb +89 -87
  71. data/app/models/alchemy/element.rb +40 -73
  72. data/app/models/alchemy/elements_repository.rb +126 -0
  73. data/app/models/alchemy/essence_audio.rb +12 -0
  74. data/app/models/alchemy/essence_headline.rb +40 -0
  75. data/app/models/alchemy/essence_picture.rb +4 -116
  76. data/app/models/alchemy/essence_richtext.rb +12 -0
  77. data/app/models/alchemy/essence_video.rb +12 -0
  78. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  79. data/app/models/alchemy/ingredient.rb +219 -0
  80. data/app/models/alchemy/ingredient_validator.rb +97 -0
  81. data/app/models/alchemy/ingredients/audio.rb +29 -0
  82. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  83. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  84. data/app/models/alchemy/ingredients/file.rb +30 -0
  85. data/app/models/alchemy/ingredients/headline.rb +42 -0
  86. data/app/models/alchemy/ingredients/html.rb +19 -0
  87. data/app/models/alchemy/ingredients/link.rb +16 -0
  88. data/app/models/alchemy/ingredients/node.rb +23 -0
  89. data/app/models/alchemy/ingredients/page.rb +23 -0
  90. data/app/models/alchemy/ingredients/picture.rb +41 -0
  91. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  92. data/app/models/alchemy/ingredients/select.rb +10 -0
  93. data/app/models/alchemy/ingredients/text.rb +17 -0
  94. data/app/models/alchemy/ingredients/video.rb +33 -0
  95. data/app/models/alchemy/language.rb +0 -11
  96. data/app/models/alchemy/node.rb +1 -1
  97. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  98. data/app/models/alchemy/page/page_elements.rb +186 -205
  99. data/app/models/alchemy/page/page_naming.rb +66 -64
  100. data/app/models/alchemy/page/page_natures.rb +139 -142
  101. data/app/models/alchemy/page/page_scopes.rb +113 -102
  102. data/app/models/alchemy/page/publisher.rb +50 -0
  103. data/app/models/alchemy/page/url_path.rb +1 -1
  104. data/app/models/alchemy/page.rb +69 -36
  105. data/app/models/alchemy/page_version.rb +58 -0
  106. data/app/models/alchemy/picture/calculations.rb +2 -8
  107. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  108. data/app/models/alchemy/picture/transformations.rb +21 -93
  109. data/app/models/alchemy/picture.rb +4 -2
  110. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  111. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  112. data/app/presenters/alchemy/picture_view.rb +88 -0
  113. data/app/serializers/alchemy/element_serializer.rb +5 -0
  114. data/app/serializers/alchemy/page_serializer.rb +1 -7
  115. data/app/serializers/alchemy/page_tree_serializer.rb +6 -5
  116. data/app/services/alchemy/delete_elements.rb +44 -0
  117. data/app/services/alchemy/duplicate_element.rb +56 -0
  118. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  119. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  120. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  121. data/app/views/alchemy/admin/crop.html.erb +36 -0
  122. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  123. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  124. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  125. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  126. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  127. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  128. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  129. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  130. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  131. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  132. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  133. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  134. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  135. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  136. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  137. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  138. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  139. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  140. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  141. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  142. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  143. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  144. data/app/views/alchemy/admin/pages/_form.html.erb +0 -25
  145. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  146. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +5 -16
  147. data/app/views/alchemy/admin/pages/_page.html.erb +133 -111
  148. data/app/views/alchemy/admin/pages/_sitemap.html.erb +16 -10
  149. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  150. data/app/views/alchemy/admin/pages/_toolbar.html.erb +12 -0
  151. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  152. data/app/views/alchemy/admin/pages/fold.js.erb +2 -0
  153. data/app/views/alchemy/admin/pages/index.html.erb +1 -1
  154. data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
  155. data/app/views/alchemy/admin/pages/update.js.erb +0 -7
  156. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  157. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -19
  158. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  159. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  160. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  161. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  162. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  163. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  164. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  165. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  166. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  167. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  168. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  169. data/app/views/alchemy/essences/_essence_page_editor.html.erb +1 -1
  170. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  171. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  172. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  173. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  174. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  175. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  176. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  177. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  178. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  179. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  180. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  181. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  182. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  183. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  184. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  185. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  186. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  187. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  188. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  189. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  190. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  191. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  192. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  193. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  194. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  195. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  196. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  197. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  198. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  199. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  200. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  201. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  202. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  203. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  204. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  205. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  206. data/config/brakeman.ignore +66 -159
  207. data/config/initializers/dragonfly.rb +2 -0
  208. data/config/locales/alchemy.en.yml +26 -15
  209. data/config/routes.rb +19 -26
  210. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  211. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  212. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  213. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  214. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  215. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  216. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  217. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  218. data/lib/alchemy/admin/preview_url.rb +2 -0
  219. data/lib/alchemy/deprecation.rb +1 -1
  220. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  221. data/lib/alchemy/elements_finder.rb +14 -60
  222. data/lib/alchemy/engine.rb +1 -8
  223. data/lib/alchemy/essence.rb +1 -2
  224. data/lib/alchemy/hints.rb +8 -4
  225. data/lib/alchemy/page_layout.rb +0 -13
  226. data/lib/alchemy/permissions.rb +31 -29
  227. data/lib/alchemy/resource.rb +13 -3
  228. data/lib/alchemy/tasks/tidy.rb +29 -0
  229. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  230. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  231. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  232. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  233. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  234. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  235. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  236. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  237. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  238. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  239. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  240. data/lib/alchemy/test_support.rb +2 -11
  241. data/lib/alchemy/tinymce.rb +17 -0
  242. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  243. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  244. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  245. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  246. data/lib/alchemy/version.rb +1 -1
  247. data/lib/alchemy_cms.rb +0 -1
  248. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  249. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  250. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  251. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  252. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  253. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  254. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  255. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  256. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  257. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  258. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  259. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  260. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  261. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  262. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  263. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  264. data/lib/tasks/alchemy/tidy.rake +12 -0
  265. data/lib/tasks/alchemy/upgrade.rake +21 -15
  266. data/package/admin.js +8 -4
  267. data/package/src/file_editors.js +28 -0
  268. data/package/src/image_cropper.js +103 -0
  269. data/package/src/image_loader.js +58 -0
  270. data/package/src/node_tree.js +8 -8
  271. data/package/src/picture_editors.js +169 -0
  272. data/package/src/utils/__tests__/ajax.spec.js +16 -52
  273. data/package/src/utils/ajax.js +0 -12
  274. data/package.json +3 -2
  275. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  276. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +434 -0
  277. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  278. metadata +291 -53
  279. data/.rspec +0 -1
  280. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  281. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  282. data/app/assets/javascripts/alchemy/templates/page_folder.hbs +0 -3
  283. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  284. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  285. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  286. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  287. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  288. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  289. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  290. data/lib/alchemy/error_tracking/airbrake_handler.rb +0 -13
  291. data/lib/alchemy/error_tracking.rb +0 -14
  292. data/lib/alchemy/test_support/factories.rb +0 -20
  293. data/package/src/page_publication_fields.js +0 -27
  294. data/package/src/page_sorter.js +0 -62
  295. data/package/src/sitemap.js +0 -148
@@ -17,6 +17,6 @@
17
17
  <%= text_field_tag "anchor_link_title", '', class: 'link_title' %>
18
18
  </div>
19
19
  <div class="submit">
20
- <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'anchor' %>
20
+ <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'anchor' } %>
21
21
  </div>
22
22
  <% end %>
@@ -26,6 +26,6 @@
26
26
  class: 'alchemy_selectbox link_target' %>
27
27
  </div>
28
28
  <div class="submit">
29
- <%= link_to Alchemy.t(:apply), '#', class: 'create-link button', 'data-link-type' => 'external' %>
29
+ <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'external' } %>
30
30
  </div>
31
31
  <% end %>
@@ -26,6 +26,6 @@
26
26
  class: 'alchemy_selectbox link_target' %>
27
27
  </div>
28
28
  <div class="submit">
29
- <%= link_to Alchemy.t(:apply), '#', class: 'create-link button', 'data-link-type' => 'file' %>
29
+ <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'file' } %>
30
30
  </div>
31
31
  <% end %>
@@ -1,14 +1,4 @@
1
1
  <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
2
- <% unless @page.language_root? || @page.layoutpage %>
3
- <%= f.input :parent_id, required: true, input_html: { class: 'alchemy_selectbox' } %>
4
- <% end %>
5
-
6
- <%= f.input :page_layout,
7
- collection: @page_layouts,
8
- label: page_layout_label(@page),
9
- include_blank: Alchemy.t('Please choose'),
10
- input_html: {class: 'alchemy_selectbox'} %>
11
-
12
2
  <div class="input check_boxes">
13
3
  <label class="control-label"><%= Alchemy.t(:page_status) %></label>
14
4
  <div class="control_group">
@@ -47,18 +37,3 @@
47
37
 
48
38
  <%= f.submit Alchemy.t(:save) %>
49
39
  <% end %>
50
-
51
- <script>
52
- $('#page_parent_id').alchemyPageSelect({
53
- placeholder: "<%= Alchemy.t(:search_page) %>",
54
- url: "<%= alchemy.api_pages_path %>",
55
- allowClear: false,
56
- <% if @page.parent %>
57
- initialSelection: {
58
- id: <%= @page.parent.id %>,
59
- text: "<%= @page.parent.name %>",
60
- url_path: "<%= @page.parent.url_path %>"
61
- }
62
- <% end %>
63
- })
64
- </script>
@@ -30,6 +30,6 @@
30
30
  class: 'alchemy_selectbox link_target' %>
31
31
  </div>
32
32
  <div class="submit">
33
- <%= link_to Alchemy.t(:apply), '', class: 'create-link button', 'data-link-type' => 'internal' %>
33
+ <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'internal' } %>
34
34
  </div>
35
35
  <% end %>
@@ -3,7 +3,11 @@
3
3
  <%= f.hidden_field(:parent_id) %>
4
4
  <% else %>
5
5
  <% @page.parent = @current_language.root_page %>
6
- <%= f.input :parent_id, as: :string, input_html: { class: 'alchemy_selectbox' } %>
6
+ <%= f.input :parent_id,
7
+ collection: @current_language.pages.contentpages,
8
+ label_method: :name,
9
+ value_method: :id,
10
+ input_html: { class: "alchemy_selectbox" } %>
7
11
  <% end %>
8
12
  <%= f.hidden_field(:language_id) %>
9
13
  <%= f.hidden_field(:layoutpage) %>
@@ -17,18 +21,3 @@
17
21
  <%= f.input :name %>
18
22
  <%= f.submit Alchemy.t(:create) %>
19
23
  <% end %>
20
-
21
- <script>
22
- $('input[type="text"]#page_parent_id').alchemyPageSelect({
23
- placeholder: "<%= Alchemy.t(:search_page) %>",
24
- url: "<%= alchemy.api_pages_path %>",
25
- allowClear: false,
26
- <% if @page.parent %>
27
- initialSelection: {
28
- id: <%= @page.parent.id %>,
29
- text: "<%= @page.parent.name %>",
30
- url_path: "<%= @page.parent.url_path %>"
31
- }
32
- <% end %>
33
- })
34
- </script>
@@ -1,7 +1,24 @@
1
- <li id="page_{{id}}" class="sitemap-item {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}" data-page-id="{{id}}" data-folded="{{folded}}">
1
+ <li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}">
2
2
  <div class="sitemap_page{{#if locked}} locked{{/if}}" name="{{name}}">
3
- <div class="sitemap_left_images">
4
- <span class="page_folder"></span>
3
+ <div class="sitemap_left_images<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>">
4
+ <% unless @sorting %>
5
+ {{#unless root_or_leaf}}
6
+ <%= link_to(
7
+ alchemy.fold_admin_page_path(page),
8
+ remote: true,
9
+ method: :post,
10
+ class: "page_folder",
11
+ title: "{{#if folded}}#{Alchemy.t('Show childpages')}{{else}}#{Alchemy.t('Hide childpages')}{{/if}}",
12
+ id: "fold_button_{{id}}"
13
+ ) do %>
14
+ {{#if folded}}
15
+ <i class="far fa-plus-square fa-fw"></i>
16
+ {{else}}
17
+ <i class="far fa-minus-square fa-fw"></i>
18
+ {{/if}}
19
+ <% end %>
20
+ {{/unless}}
21
+ <% end %>
5
22
  {{#if definition_missing}}
6
23
  <%= page_layout_missing_warning %>
7
24
  {{else}}
@@ -14,121 +31,121 @@
14
31
  </span>
15
32
  </span>
16
33
  {{else}}
17
- <span class="{{#unless root}}handle{{/unless}}">
18
34
  <i class="icon far fa-file fa-lg"></i>
19
- </span>
20
35
  {{/if}}
21
36
  {{else}}
22
37
  <span class="with-hint">
23
38
  <i class="icon fas fa-ban fa-fw"></i>
24
39
  <span class="hint-bubble">
25
- <%= Alchemy.t("Your user role does not allow you to edit this page") %>
40
+ <%= Alchemy.t('Your user role does not allow you to edit this page') %>
26
41
  </span>
27
42
  </span>
28
43
  {{/if}}
29
44
  {{/if}}
30
45
  </div>
31
46
  <div class="sitemap_right_tools">
32
- {{#if permissions.info}}
33
- <div class="button_with_label sitemap_tool">
34
- <%= link_to_dialog(
35
- render_icon("info-circle"),
36
- alchemy.info_admin_page_path(id: "__ID__"),
37
- {
38
- title: Alchemy.t(:page_infos),
39
- size: "520x290"
40
- }
41
- ) %>
42
- <label class="center"><%= Alchemy.t(:page_infos) %></label>
43
- {{else}}
44
- <div class="sitemap_tool disabled with-hint">
45
- <%= render_icon("info-circle") %>
46
- <span class="hint-bubble">
47
- <%= Alchemy.t("Your user role does not allow you to edit this page") %>
48
- </span>
49
- {{/if}}
50
- </div>
51
- {{#if permissions.configure}}
52
- <div class="button_with_label sitemap_tool">
53
- <%= link_to_dialog(
54
- render_icon(:cog),
55
- alchemy.configure_admin_page_path(id: "__ID__"),
56
- {
57
- title: Alchemy.t(:edit_page_properties),
58
- size: "450x680"
59
- }
60
- ) -%>
61
- <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
62
- {{else}}
63
- <div class="sitemap_tool disabled with-hint">
64
- <%= render_icon(:cog) %>
65
- <span class="hint-bubble">
66
- <%= Alchemy.t("Your user role does not allow you to edit this page") %>
67
- </span>
68
- {{/if}}
69
- </div>
70
- {{#if permissions.copy}}
71
- <div class="button_with_label sitemap_tool">
72
- <%= link_to(
73
- render_icon(:copy),
74
- alchemy.insert_admin_clipboard_path(
75
- remarkable_type: :pages,
76
- remarkable_id: "__ID__",
77
- ),
78
- remote: true,
79
- method: :post
80
- ) %>
81
- <label class="center"><%= Alchemy.t(:copy_page) %></label>
82
- {{else}}
83
- <div class="sitemap_tool disabled with-hint">
84
- <%= render_icon(:copy) %>
85
- <span class="hint-bubble">
86
- <%= Alchemy.t("Your user role does not allow you to edit this page") %>
87
- </span>
88
- {{/if}}
89
- </div>
90
- {{#if permissions.destroy}}
91
- <div class="button_with_label sitemap_tool">
92
- <%= link_to_confirm_dialog(
93
- render_icon(:minus),
94
- Alchemy.t(:confirm_to_delete_page),
95
- url_for(
96
- controller: "pages",
97
- action: "destroy",
98
- id: "__ID__"
99
- )
100
- ) -%>
101
- <label class="center"><%= Alchemy.t(:delete_page) %></label>
102
- {{else}}
103
- <div class="sitemap_tool disabled with-hint">
104
- <%= render_icon(:minus) %>
105
- <span class="hint-bubble">
106
- <%= Alchemy.t("Your user role does not allow you to edit this page") %>
107
- </span>
108
- {{/if}}
109
- </div>
110
- {{#if permissions.create}}
111
- <div class="button_with_label sitemap_tool">
112
- <%= link_to_dialog(
113
- render_icon(:plus),
114
- alchemy.new_admin_page_path(parent_id: "__ID__"),
115
- {
116
- title: Alchemy.t(:create_page),
117
- size: "340x165",
118
- overflow: true
119
- }
120
- ) -%>
121
- <label class="left"><%= Alchemy.t(:create_page) %></label>
122
- {{else}}
123
- <div class="sitemap_tool disabled with-hint">
124
- <%= render_icon(:plus) %>
125
- <span class="hint-bubble">
126
- <%= Alchemy.t("Your user role does not allow you to edit this page") %>
127
- </span>
128
- {{/if}}
129
- </div>
47
+ <%- unless @sorting -%>
48
+ {{#if permissions.info}}
49
+ <div class="button_with_label sitemap_tool">
50
+ <%= link_to_dialog(
51
+ render_icon('info-circle'),
52
+ alchemy.info_admin_page_path(page),
53
+ {
54
+ title: Alchemy.t(:page_infos),
55
+ size: '520x290'
56
+ }
57
+ ) %>
58
+ <label class="center"><%= Alchemy.t(:page_infos) %></label>
59
+ {{else}}
60
+ <div class="sitemap_tool disabled with-hint">
61
+ <%= render_icon('info-circle') %>
62
+ <span class="hint-bubble">
63
+ <%= Alchemy.t('Your user role does not allow you to edit this page') %>
64
+ </span>
65
+ {{/if}}
66
+ </div>
67
+ {{#if permissions.configure}}
68
+ <div class="button_with_label sitemap_tool">
69
+ <%= link_to_dialog(
70
+ render_icon(:cog),
71
+ alchemy.configure_admin_page_path(page),
72
+ {
73
+ title: Alchemy.t(:edit_page_properties),
74
+ size: '450x680'
75
+ }
76
+ ) -%>
77
+ <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
78
+ {{else}}
79
+ <div class="sitemap_tool disabled with-hint">
80
+ <%= render_icon(:cog) %>
81
+ <span class="hint-bubble">
82
+ <%= Alchemy.t('Your user role does not allow you to edit this page') %>
83
+ </span>
84
+ {{/if}}
85
+ </div>
86
+ {{#if permissions.copy}}
87
+ <div class="button_with_label sitemap_tool">
88
+ <%= link_to(
89
+ render_icon(:copy),
90
+ alchemy.insert_admin_clipboard_path(
91
+ remarkable_type: page.class.name.demodulize.underscore.pluralize,
92
+ remarkable_id: '__ID__',
93
+ ).gsub('__ID__', '{{id}}'),
94
+ remote: true,
95
+ method: 'post'
96
+ ) %>
97
+ <label class="center"><%= Alchemy.t(:copy_page) %></label>
98
+ {{else}}
99
+ <div class="sitemap_tool disabled with-hint">
100
+ <%= render_icon(:copy) %>
101
+ <span class="hint-bubble">
102
+ <%= Alchemy.t('Your user role does not allow you to edit this page') %>
103
+ </span>
104
+ {{/if}}
105
+ </div>
106
+ {{#if permissions.destroy}}
107
+ <div class="button_with_label sitemap_tool">
108
+ <%= link_to_confirm_dialog(
109
+ render_icon(:minus),
110
+ Alchemy.t(:confirm_to_delete_page),
111
+ url_for(
112
+ controller: 'pages',
113
+ action: 'destroy',
114
+ id: '__ID__'
115
+ ).gsub('__ID__', '{{id}}')
116
+ ) -%>
117
+ <label class="center"><%= Alchemy.t(:delete_page) %></label>
118
+ {{else}}
119
+ <div class="sitemap_tool disabled with-hint">
120
+ <%= render_icon(:minus) %>
121
+ <span class="hint-bubble">
122
+ <%= Alchemy.t('Your user role does not allow you to edit this page') %>
123
+ </span>
124
+ {{/if}}
125
+ </div>
126
+ {{#if permissions.create}}
127
+ <div class="button_with_label sitemap_tool">
128
+ <%= link_to_dialog(
129
+ render_icon(:plus),
130
+ alchemy.new_admin_page_path(parent_id: '__ID__').gsub('__ID__', '{{id}}'),
131
+ {
132
+ title: Alchemy.t(:create_page),
133
+ size: '340x165',
134
+ overflow: true
135
+ }
136
+ ) -%>
137
+ <label class="left"><%= Alchemy.t(:create_page) %></label>
138
+ {{else}}
139
+ <div class="sitemap_tool disabled with-hint">
140
+ <%= render_icon(:plus) %>
141
+ <span class="hint-bubble">
142
+ <%= Alchemy.t('Your user role does not allow you to edit this page') %>
143
+ </span>
144
+ {{/if}}
145
+ </div>
146
+ <%- end -%>
130
147
  </div>
131
- <div class="page_infos">
148
+ <div class="page_infos" id="page_<%= page.id %>_infos">
132
149
  <span class="page_status with-hint">
133
150
  <i class="icon fas fa-fw fa-compass {{#unless public}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
134
151
  <span class="hint-bubble">{{status_titles.public}}</span>
@@ -143,18 +160,23 @@
143
160
  </div>
144
161
  <div class="sitemap_sitename">
145
162
  {{#if permissions.edit_content}}
146
- <%= link_to(
147
- "{{name}}",
148
- alchemy.edit_admin_page_path(id: "__ID__"),
163
+ <%= link_to_unless(
164
+ @sorting,
165
+ '{{name}}',
166
+ alchemy.edit_admin_page_path(page),
149
167
  title: Alchemy.t(:edit_page),
150
168
  class: "sitemap_pagename_link"
151
- ) -%>
169
+ ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
152
170
  {{else}}
153
- <%= content_tag("span", "{{name}}", class: "sitemap_pagename_link") %>
171
+ <%= content_tag('span', '{{name}}', class: "sitemap_pagename_link") %>
154
172
  {{/if}}
155
173
  </div>
156
174
  </div>
157
- <ul id="page_{{id}}_children" class="children" data-parent-id="{{id}}">
175
+ {{#if children}}
176
+ <% unless @sorting %>{{#unless folded}}<% end %>
177
+ <ul id="page_{{id}}_children" class="level_{{level}}_children">
158
178
  {{> list}}
159
179
  </ul>
180
+ <% unless @sorting %>{{/unless}}<% end %>
181
+ {{/if}}
160
182
  </li>
@@ -1,14 +1,15 @@
1
- <h4 id="sitemap_heading">
2
- <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
3
- <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
4
- <span class="page_status"><%= Alchemy.t(:page_status) %></span>
5
- </h4>
6
-
7
1
  <div id="sitemap-wrapper">
2
+ <h4 id="sitemap_heading">
3
+ <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
4
+ <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
5
+ <span class="page_status"><%= Alchemy.t(:page_status) %></span>
6
+ </h4>
7
+
8
+ <p class="loading"></p>
8
9
  </div>
9
10
 
10
11
  <script id="sitemap-template" type="text/x-handlebars-template">
11
- <ul id="sitemap" class="list">
12
+ <ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
12
13
  {{> list}}
13
14
  </ul>
14
15
  </script>
@@ -21,10 +22,15 @@
21
22
 
22
23
  <script type="text/javascript">
23
24
  $(function() {
24
- Alchemy.currentSitemap = new Alchemy.Sitemap({
25
+ Alchemy.Sitemap.init({
25
26
  url: '<%= alchemy.tree_admin_pages_path %>',
26
- page_root_id: <%= @page_root.id %>
27
+ page_root_id: <%= @page_root.id %>,
28
+ full: <%= full %>
29
+ <% if @sorting %>
30
+ ,ready: function () {
31
+ Alchemy.PageSorter();
32
+ }
33
+ <% end %>
27
34
  });
28
- Alchemy.PagePublicationFields();
29
35
  });
30
36
  </script>
@@ -1,7 +1,10 @@
1
1
  <script>
2
2
  // Populate custom tinymce configurations
3
- <% Alchemy::Tinymce.custom_config_contents(@page).each do |content| %>
4
- Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] %>"] = {
3
+ <% (
4
+ Alchemy::Tinymce.custom_config_contents(@page) +
5
+ Alchemy::Tinymce.custom_config_ingredients(@page)
6
+ ).each do |content| %>
7
+ Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] || content['role'] %>"] = {
5
8
  <% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
6
9
  <%= k %>: <%== v.to_json %>,
7
10
  <% end %>
@@ -28,6 +28,18 @@
28
28
  <label><%= Alchemy.t("Flush page cache") %></label>
29
29
  </div>
30
30
  <% end %>
31
+ <% if can?(:sort, Alchemy::Page) %>
32
+ <div class="button_with_label">
33
+ <%= link_to(
34
+ render_icon(:random),
35
+ alchemy.sort_admin_pages_path,
36
+ method: :get,
37
+ class: "icon_button",
38
+ title: Alchemy.t("Sort pages")
39
+ ) %>
40
+ <label><%= Alchemy.t("Sort pages") %></label>
41
+ </div>
42
+ <% end %>
31
43
  <div class="button_with_label" id="clipboard_button">
32
44
  <%= link_to_dialog(
33
45
  render_icon(clipboard_empty?("pages") ? :clipboard : :paste),
@@ -56,23 +56,44 @@
56
56
  <% end %>
57
57
  <label><%= Alchemy.t(:page_properties) %></label>
58
58
  </div>
59
- <% if can?(:publish, @page) %>
60
- <div class="button_with_label">
61
- <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
62
- <%= button_tag class: 'icon_button', title: Alchemy.t(:explain_publishing) do %>
63
- <%= render_icon('cloud-upload-alt') %>
64
- <% end %>
65
- <label><%= Alchemy.t("Publish page") %></label>
59
+ <div class="button_with_label">
60
+ <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
61
+ <%= button_tag class: 'icon_button', disabled: cannot?(:publish, @page) do %>
62
+ <%= render_icon('cloud-upload-alt') %>
66
63
  <% end %>
67
- </div>
68
- <% end %>
64
+ <label>
65
+ <% if @page.language.public? %>
66
+ <%= Alchemy.t(:explain_publishing) %>
67
+ <% elsif @page.editable_by?(current_alchemy_user) %>
68
+ <%= Alchemy.t(:publish_page_language_not_public) %>
69
+ <% else %>
70
+ <%= Alchemy.t(:publish_page_not_allowed) %>
71
+ <% end %>
72
+ </label>
73
+ <% end %>
74
+ </div>
69
75
  <% unless @page.layoutpage? %>
70
76
  <div class="button_with_label">
71
- <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
72
- <%= button_tag class: 'icon_button', disabled: !@page.public? do %>
77
+ <% if @page.public? %>
78
+ <%= link_to show_page_url(
79
+ urlname: @page.urlname,
80
+ locale: prefix_locale? ? @page.language_code : nil,
81
+ host: @page.site.host == "*" ? request.host : @page.site.host,
82
+ ),
83
+ title: Alchemy.t("Visit page"),
84
+ data: { turbolinks: false },
85
+ target: "_blank",
86
+ class: 'icon_button' do %>
73
87
  <%= render_icon('external-link-alt') %>
74
88
  <% end %>
75
89
  <label><%= Alchemy.t("Visit page") %></label>
90
+ <% else %>
91
+ <%= content_tag "a",
92
+ title: Alchemy.t(:cannot_visit_unpublic_page),
93
+ class: 'disabled icon_button' do %>
94
+ <%= render_icon('external-link-alt') %>
95
+ <% end %>
96
+ <label><%= Alchemy.t(:cannot_visit_unpublic_page) %></label>
76
97
  <% end %>
77
98
  </div>
78
99
  <% end %>
@@ -128,14 +149,14 @@
128
149
  <script type="text/javascript" charset="utf-8">
129
150
 
130
151
  $(function() {
131
- $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
152
+ $('#unlock_page_form, #publish_page_form').on('submit', function(event) {
132
153
  var not_dirty = Alchemy.checkPageDirtyness(this);
133
154
  if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
134
155
  return not_dirty;
135
156
  });
136
- Alchemy.PagePublicationFields();
157
+ Alchemy.Sitemap.watchPagePublicationState();
137
158
  Alchemy.PageLeaveObserver();
138
- Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_id: @page.id) %>', {
159
+ Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_version_id: @page_version.id) %>', {
139
160
  texts: {
140
161
  title: '<%= Alchemy.t("Elements") %>',
141
162
  dirtyTitle: '<%= Alchemy.t("Warning!") %>',
@@ -152,7 +173,7 @@
152
173
  hotkey: 'alt+n',
153
174
  iconClass: 'plus',
154
175
  onClick: function() {
155
- Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_id: @page.id) %>', {
176
+ Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_version_id: @page_version.id) %>', {
156
177
  title: '<%= Alchemy.t("New Element") %>',
157
178
  size: '320x125'
158
179
  });
@@ -169,15 +190,6 @@
169
190
  size: '400x305'
170
191
  });
171
192
  }
172
- },
173
- {
174
- title: '<%= Alchemy.t("Show trash") %>',
175
- label: '<%= Alchemy.t("Show trash") %>',
176
- iconClass: 'trash-alt<%= trash_empty?("elements") ? "" : " full" %>',
177
- buttonId: 'element_trash_button',
178
- onClick: function() {
179
- Alchemy.TrashWindow.open(<%= @page.id %>, '<%= Alchemy.t("Trash") %>');
180
- }
181
193
  }
182
194
  ]
183
195
  }, function() {
@@ -185,7 +197,7 @@
185
197
  Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
186
198
  Alchemy.ElementEditors.init();
187
199
  Alchemy.SelectBox('.element-editor');
188
- Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
200
+ Alchemy.Tinymce.init(<%= (@page.richtext_contents_ids + @page.richtext_ingredients_ids).to_json %>);
189
201
  $('#fixed-elements').tabs().tabs('paging', {
190
202
  follow: true,
191
203
  followOnSelect: true,
@@ -0,0 +1,2 @@
1
+ $('#fold_button_<%= @page.id %>').css('background', 'none');
2
+ Alchemy.Sitemap.fetch(<%= @page.id %>);
@@ -37,7 +37,7 @@
37
37
  <% else %>
38
38
  <% if @page_root %>
39
39
  <h2 id="page_filter_result"></h2>
40
- <%= render "sitemap", page_partial: "page" %>
40
+ <%= render "sitemap", page_partial: "page", full: !!@sorting %>
41
41
  <% elsif can?(:create, Alchemy::Page) %>
42
42
  <%= render partial: "create_language_form" %>
43
43
  <% else %>
@@ -0,0 +1,19 @@
1
+ <% content_for :toolbar do %>
2
+ <div class="button_with_label">
3
+ <%= link_to alchemy.admin_pages_path, class: 'icon_button' do %>
4
+ <%= render_icon 'angle-double-left' %>
5
+ <% end %>
6
+ <label><%= Alchemy.t(:cancel) %></label>
7
+ </div>
8
+ <% end %>
9
+
10
+ <div id="sort_panel">
11
+ <%= render_message do %>
12
+ <%= Alchemy.t(:explain_sitemap_dragndrop_sorting) %>
13
+ <% end %>
14
+ <div class="buttons">
15
+ <%= button_tag Alchemy.t('save order'), id: 'save_page_order' %>
16
+ </div>
17
+ </div>
18
+
19
+ <%= render 'sitemap', page_partial: 'page', full: true %>
@@ -13,13 +13,6 @@
13
13
  Alchemy.growl("<%= j @notice %>");
14
14
  Alchemy.closeCurrentDialog();
15
15
 
16
- <% elsif @page.parent_id != @old_parent_id -%>
17
-
18
- Alchemy.closeCurrentDialog(function() {
19
- Alchemy.growl("<%= j @notice %>");
20
- Alchemy.currentSitemap.load(<%= @page.get_language_root.id %>);
21
- });
22
-
23
16
  <% else -%>
24
17
 
25
18
  if (page) {
@@ -3,8 +3,7 @@
3
3
  size: @size,
4
4
  }.merge(search_filter_params.except(:q))
5
5
  ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
6
- <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id, id: nil) %>
7
- <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id, id: nil) %>
6
+ <%= hidden_field_tag :form_field_id, @form_field_id %>
8
7
  <div class="search_field">
9
8
  <button type="submit">
10
9
  <%= render_icon('search') %>
@@ -15,8 +14,7 @@
15
14
  id: nil %>
16
15
  <%= link_to render_icon(:times, size: 'xs'), url_for({
17
16
  action: 'index',
18
- element_id: @element.blank? ? '' : @element.id,
19
- content_id: @content.blank? ? '' : @content.id,
17
+ form_field_id: @form_field_id,
20
18
  size: @size,
21
19
  overlay: true
22
20
  }.merge(search_filter_params.except(:q))),