alchemy_cms 5.3.5 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (300) 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 -75
  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/nodes_controller.rb +0 -1
  51. data/app/controllers/alchemy/api/pages_controller.rb +3 -15
  52. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  53. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  54. data/app/decorators/alchemy/element_editor.rb +23 -1
  55. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  56. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  57. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  58. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  59. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  60. data/app/helpers/alchemy/elements_helper.rb +14 -7
  61. data/app/helpers/alchemy/pages_helper.rb +3 -11
  62. data/app/jobs/alchemy/base_job.rb +11 -0
  63. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  64. data/app/models/alchemy/attachment.rb +1 -1
  65. data/app/models/alchemy/content/factory.rb +23 -27
  66. data/app/models/alchemy/content.rb +1 -6
  67. data/app/models/alchemy/element/definitions.rb +29 -27
  68. data/app/models/alchemy/element/element_contents.rb +131 -122
  69. data/app/models/alchemy/element/element_essences.rb +100 -98
  70. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  71. data/app/models/alchemy/element/presenters.rb +89 -87
  72. data/app/models/alchemy/element.rb +40 -73
  73. data/app/models/alchemy/elements_repository.rb +126 -0
  74. data/app/models/alchemy/essence_audio.rb +12 -0
  75. data/app/models/alchemy/essence_headline.rb +40 -0
  76. data/app/models/alchemy/essence_picture.rb +4 -116
  77. data/app/models/alchemy/essence_richtext.rb +12 -0
  78. data/app/models/alchemy/essence_video.rb +12 -0
  79. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  80. data/app/models/alchemy/ingredient.rb +219 -0
  81. data/app/models/alchemy/ingredient_validator.rb +97 -0
  82. data/app/models/alchemy/ingredients/audio.rb +29 -0
  83. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  84. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  85. data/app/models/alchemy/ingredients/file.rb +30 -0
  86. data/app/models/alchemy/ingredients/headline.rb +42 -0
  87. data/app/models/alchemy/ingredients/html.rb +19 -0
  88. data/app/models/alchemy/ingredients/link.rb +16 -0
  89. data/app/models/alchemy/ingredients/node.rb +23 -0
  90. data/app/models/alchemy/ingredients/page.rb +23 -0
  91. data/app/models/alchemy/ingredients/picture.rb +41 -0
  92. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  93. data/app/models/alchemy/ingredients/select.rb +10 -0
  94. data/app/models/alchemy/ingredients/text.rb +17 -0
  95. data/app/models/alchemy/ingredients/video.rb +33 -0
  96. data/app/models/alchemy/language.rb +0 -11
  97. data/app/models/alchemy/node.rb +1 -1
  98. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  99. data/app/models/alchemy/page/page_elements.rb +186 -205
  100. data/app/models/alchemy/page/page_naming.rb +66 -64
  101. data/app/models/alchemy/page/page_natures.rb +139 -142
  102. data/app/models/alchemy/page/page_scopes.rb +113 -102
  103. data/app/models/alchemy/page/publisher.rb +50 -0
  104. data/app/models/alchemy/page/url_path.rb +1 -1
  105. data/app/models/alchemy/page.rb +69 -36
  106. data/app/models/alchemy/page_version.rb +58 -0
  107. data/app/models/alchemy/picture/calculations.rb +2 -8
  108. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  109. data/app/models/alchemy/picture/transformations.rb +23 -95
  110. data/app/models/alchemy/picture.rb +5 -3
  111. data/app/models/alchemy/picture_variant.rb +1 -3
  112. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  113. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  114. data/app/presenters/alchemy/picture_view.rb +88 -0
  115. data/app/serializers/alchemy/element_serializer.rb +5 -0
  116. data/app/serializers/alchemy/page_serializer.rb +1 -7
  117. data/app/serializers/alchemy/page_tree_serializer.rb +6 -5
  118. data/app/services/alchemy/delete_elements.rb +44 -0
  119. data/app/services/alchemy/duplicate_element.rb +56 -0
  120. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  121. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  122. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  123. data/app/views/alchemy/admin/crop.html.erb +36 -0
  124. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  125. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  126. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  127. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  128. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  129. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  130. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  131. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  132. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  133. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  134. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  135. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  136. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  137. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  138. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  139. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  140. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  141. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  142. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  143. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  144. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  145. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  146. data/app/views/alchemy/admin/pages/_form.html.erb +0 -25
  147. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  148. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +5 -16
  149. data/app/views/alchemy/admin/pages/_page.html.erb +133 -111
  150. data/app/views/alchemy/admin/pages/_sitemap.html.erb +16 -10
  151. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  152. data/app/views/alchemy/admin/pages/_toolbar.html.erb +12 -0
  153. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  154. data/app/views/alchemy/admin/pages/fold.js.erb +2 -0
  155. data/app/views/alchemy/admin/pages/index.html.erb +1 -1
  156. data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
  157. data/app/views/alchemy/admin/pages/update.js.erb +0 -7
  158. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  159. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -19
  160. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  161. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  162. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  163. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  164. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  165. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  166. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  167. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  168. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  169. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  170. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  171. data/app/views/alchemy/essences/_essence_node_editor.html.erb +1 -1
  172. data/app/views/alchemy/essences/_essence_page_editor.html.erb +1 -1
  173. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  174. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  175. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  176. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  177. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  178. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  179. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  180. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  181. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  182. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  183. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  184. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  185. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  186. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  187. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  188. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  189. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  190. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  191. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  192. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  193. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  194. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  195. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  196. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  197. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  198. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  199. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  200. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  201. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  202. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  203. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  204. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  205. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  206. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  207. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  208. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  209. data/config/alchemy/config.yml +0 -1
  210. data/config/brakeman.ignore +66 -159
  211. data/config/initializers/dragonfly.rb +2 -2
  212. data/config/locales/alchemy.en.yml +26 -15
  213. data/config/routes.rb +19 -26
  214. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  215. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  216. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  217. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  218. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  219. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  220. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  221. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  222. data/lib/alchemy/admin/preview_url.rb +2 -0
  223. data/lib/alchemy/deprecation.rb +1 -1
  224. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  225. data/lib/alchemy/elements_finder.rb +14 -60
  226. data/lib/alchemy/engine.rb +1 -19
  227. data/lib/alchemy/essence.rb +1 -2
  228. data/lib/alchemy/hints.rb +8 -4
  229. data/lib/alchemy/page_layout.rb +0 -13
  230. data/lib/alchemy/permissions.rb +31 -29
  231. data/lib/alchemy/resource.rb +13 -3
  232. data/lib/alchemy/tasks/tidy.rb +29 -0
  233. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  234. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  235. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  236. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  237. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  238. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  239. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  240. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  241. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  242. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  243. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  244. data/lib/alchemy/test_support.rb +2 -11
  245. data/lib/alchemy/tinymce.rb +17 -0
  246. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  247. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  248. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  249. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  250. data/lib/alchemy/version.rb +1 -1
  251. data/lib/alchemy_cms.rb +0 -1
  252. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  253. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  254. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  255. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  256. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  257. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  258. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  259. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  260. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  261. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  262. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  263. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  264. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  265. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  266. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  267. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  268. data/lib/tasks/alchemy/tidy.rake +12 -0
  269. data/lib/tasks/alchemy/upgrade.rake +21 -15
  270. data/package/admin.js +8 -4
  271. data/package/src/file_editors.js +28 -0
  272. data/package/src/image_cropper.js +103 -0
  273. data/package/src/image_loader.js +58 -0
  274. data/package/src/node_tree.js +8 -8
  275. data/package/src/picture_editors.js +169 -0
  276. data/package/src/utils/__tests__/ajax.spec.js +16 -52
  277. data/package/src/utils/ajax.js +0 -12
  278. data/package.json +3 -2
  279. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  280. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +434 -0
  281. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  282. metadata +291 -54
  283. data/.rspec +0 -1
  284. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  285. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  286. data/app/assets/javascripts/alchemy/templates/page_folder.hbs +0 -3
  287. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  288. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  289. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  290. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  291. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  292. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  293. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  294. data/lib/alchemy/dragonfly/processors/thumbnail.rb +0 -27
  295. data/lib/alchemy/error_tracking/airbrake_handler.rb +0 -13
  296. data/lib/alchemy/error_tracking.rb +0 -14
  297. data/lib/alchemy/test_support/factories.rb +0 -20
  298. data/package/src/page_publication_fields.js +0 -27
  299. data/package/src/page_sorter.js +0 -62
  300. data/package/src/sitemap.js +0 -148
@@ -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))),
@@ -5,33 +5,22 @@
5
5
  return '<%= alchemy.admin_picture_path(id: 1) %>'.replace(/1/, id);
6
6
  },
7
7
 
8
- admin_trash_path: function(page_id) {
9
- var url = '<%= alchemy.admin_trash_path %>';
10
- if (page_id) url += '?page_id=' + page_id;
11
- return url;
12
- },
13
-
14
8
  fold_admin_element_path: function(id) {
15
9
  return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
16
10
  },
17
11
 
18
- toggle_folded_api_node_path: function(id) {
19
- return '<%= alchemy.toggle_folded_api_node_path(id: 1) %>'.replace(/1/, id);
20
- },
21
-
22
- move_api_node_path: function(id) {
23
- return '<%= alchemy.move_api_node_path(id: 1) %>'.replace(/1/, id);
24
- },
25
-
26
- move_admin_page_path: function(id) {
27
- return '<%= alchemy.move_api_page_path(id: 1) %>'.replace(/1/, id);
28
- },
12
+ node: {
13
+ toggle_folded_api_path: function(id) {
14
+ return '<%= alchemy.toggle_folded_api_node_path(id: 1) %>'.replace(/1/, id);
15
+ },
29
16
 
30
- fold_admin_page_path: function(id) {
31
- return '<%= alchemy.fold_admin_page_path(id: 1) %>'.replace(/1/, id);
17
+ move_api_path: function(id) {
18
+ return '<%= alchemy.move_api_node_path(id: 1) %>'.replace(/1/, id);
19
+ },
32
20
  },
33
21
 
34
22
  order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
23
+ order_admin_pages_path: '<%= alchemy.order_admin_pages_path %>',
35
24
  link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>',
36
25
  api_pages_path: '<%= alchemy.api_pages_path %>',
37
26
  api_elements_path: '<%= alchemy.api_elements_path %>'
@@ -8,8 +8,7 @@
8
8
  redirect_url: alchemy.admin_pictures_path(
9
9
  size: search_filter_params[:size],
10
10
  filter: 'last_upload',
11
- content_id: @content.try(:id),
12
- element_id: @element.try(:id)
11
+ form_field_id: @form_field_id
13
12
  ) %>
14
13
  <div class="toolbar_spacer"></div>
15
14
  <% end %>
@@ -19,8 +18,7 @@
19
18
  render_icon('search-minus'),
20
19
  alchemy.admin_pictures_path({
21
20
  size: "small",
22
- content_id: @content,
23
- element_id: @element,
21
+ form_field_id: @form_field_id,
24
22
  q: search_filter_params[:q],
25
23
  filter: search_filter_params[:filter],
26
24
  tagged_with: search_filter_params[:tagged_with]
@@ -35,8 +33,7 @@
35
33
  render_icon('search'),
36
34
  alchemy.admin_pictures_path({
37
35
  size: "medium",
38
- content_id: @content,
39
- element_id: @element,
36
+ form_field_id: @form_field_id,
40
37
  q: search_filter_params[:q],
41
38
  filter: search_filter_params[:filter],
42
39
  tagged_with: search_filter_params[:tagged_with]
@@ -51,8 +48,7 @@
51
48
  render_icon('search-plus'),
52
49
  alchemy.admin_pictures_path({
53
50
  size: "large",
54
- content_id: @content,
55
- element_id: @element,
51
+ form_field_id: @form_field_id,
56
52
  q: search_filter_params[:q],
57
53
  filter: search_filter_params[:filter],
58
54
  tagged_with: search_filter_params[:tagged_with]
@@ -44,7 +44,6 @@
44
44
  <% end %>
45
45
  <p>
46
46
  <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
47
- <em><%= Alchemy::Element.human_attribute_name(:trashed) if element.trashed? %></em>
48
47
  </p>
49
48
  </li>
50
49
  <% end %>
@@ -1,12 +1,12 @@
1
- <div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="picture_to_assign_<%= picture_to_assign.id %>">
1
+ <div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="assignable_<%= picture_to_assign.id %>">
2
2
  <%= link_to(
3
3
  image_tag(
4
4
  picture_to_assign.url(size: preview_size(size), flatten: true) || "alchemy/missing-image.svg",
5
5
  alt: picture_to_assign.name
6
6
  ),
7
- alchemy.assign_admin_essence_pictures_path(
8
- picture_id: picture_to_assign.id,
9
- content_id: @content
7
+ alchemy.assign_admin_picture_path(
8
+ id: picture_to_assign.id,
9
+ form_field_id: @form_field_id
10
10
  ),
11
11
  remote: true,
12
12
  onclick: '$(self).attr("href", "#").off("click"); return false',
@@ -0,0 +1,10 @@
1
+ (function () {
2
+ var $form_field = $("#<%= @form_field_id -%>")
3
+ $("#assignable_<%= @assignable_id %> a").attr("href", "#").off("click")
4
+ $form_field.val("<%= @assignable_id %>")
5
+ $form_field.attr("data-image-file-width", <%= @picture.image_file_width %>)
6
+ $form_field.attr("data-image-file-height", <%= @picture.image_file_height %>)
7
+ Alchemy.closeCurrentDialog(function() {
8
+ Alchemy.setElementDirty($form_field.closest(".element-editor"))
9
+ })
10
+ })()
@@ -2,6 +2,7 @@
2
2
  <% resource_handler.editable_attributes.each do |attribute| %>
3
3
  <% if relation = attribute[:relation] %>
4
4
  <%= f.association relation[:name].to_sym,
5
+ collection: relation[:collection],
5
6
  label_method: relation[:attr_method],
6
7
  include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
7
8
  input_html: {class: 'alchemy_selectbox'} %>
@@ -0,0 +1,4 @@
1
+ <%= render(
2
+ "alchemy/essences/essence_file_editor",
3
+ essence_file_editor: essence_audio_editor
4
+ ) %>
@@ -0,0 +1,15 @@
1
+ <% content = local_assigns[:content] || local_assigns[:essence_audio_view] %>
2
+ <%- if content.ingredient -%>
3
+ <%= content_tag :audio,
4
+ controls: content.essence.controls,
5
+ autoplay: content.essence.autoplay,
6
+ loop: content.essence.loop,
7
+ muted: content.essence.muted do %>
8
+ <%= tag :source,
9
+ src: alchemy.show_attachment_path(
10
+ content.ingredient,
11
+ format: content.ingredient.suffix
12
+ ),
13
+ type: content.ingredient.file_mime_type %>
14
+ <% end %>
15
+ <%- end -%>
@@ -1,6 +1,6 @@
1
1
  <% dialog_link = link_to_dialog render_icon(:file, style: 'regular'),
2
2
  alchemy.admin_attachments_path(
3
- content_id: essence_file_editor.id,
3
+ form_field_id: essence_file_editor.form_field_id(:attachment_id),
4
4
  only: essence_file_editor.settings[:only],
5
5
  except: essence_file_editor.settings[:except]
6
6
  ),
@@ -22,17 +22,26 @@
22
22
  <div class="file_icon">
23
23
  <%= render_icon(essence_file_editor.ingredient.icon_css_class) %>
24
24
  </div>
25
- <% else %>
26
- <%= dialog_link %>
27
25
  <% end %>
28
26
  <div class="file_name">
29
- <%= essence_file_editor.ingredient.try(:name) ||
30
- ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
27
+ <%= essence_file_editor.ingredient.try(:name) %>
31
28
  </div>
29
+ <%= link_to render_icon(:times), "#",
30
+ class: [
31
+ "remove_file_link",
32
+ essence_file_editor.ingredient ? nil : "hidden"
33
+ ],
34
+ data: {
35
+ form_field_id: essence_file_editor.form_field_id(:attachment_id)
36
+ } %>
32
37
  <div class="essence_file_tools">
33
38
  <%= dialog_link %>
34
39
  <%= link_to_dialog render_icon(:edit),
35
- alchemy.edit_admin_essence_file_path(id: essence_file_editor.essence.id),
40
+ alchemy.polymorphic_url([
41
+ :edit,
42
+ :admin,
43
+ essence_file_editor.essence
44
+ ]),
36
45
  {
37
46
  title: Alchemy.t(:edit_file_properties),
38
47
  size: '400x215'
@@ -0,0 +1,36 @@
1
+ <%= content_tag :div,
2
+ id: essence_headline_editor.dom_id,
3
+ class: essence_headline_editor.css_classes,
4
+ data: essence_headline_editor.data_attributes do %>
5
+ <%= content_label(essence_headline_editor) %>
6
+ <%= text_field_tag(
7
+ essence_headline_editor.form_field_name,
8
+ essence_headline_editor.essence.body,
9
+ id: essence_headline_editor.form_field_id
10
+ ) %>
11
+
12
+ <div class="input-row">
13
+ <% essence = essence_headline_editor.essence %>
14
+ <% if essence.level_options.length > 1 %>
15
+ <div class="input-column">
16
+ <%= label_tag Alchemy::EssenceHeadline.human_attribute_name(:level) %>
17
+ <%= select_tag(
18
+ essence_headline_editor.form_field_name(:level),
19
+ options_for_select(essence_headline_editor.essence.level_options, essence_headline_editor.essence.level),
20
+ class: "alchemy_selectbox full_width"
21
+ ) %>
22
+ </div>
23
+ <% end %>
24
+
25
+ <% if essence.size_options.length > 1 %>
26
+ <div class="input-column">
27
+ <%= label_tag Alchemy::EssenceHeadline.human_attribute_name(:size) %>
28
+ <%= select_tag(
29
+ essence_headline_editor.form_field_name(:size),
30
+ options_for_select(essence_headline_editor.essence.size_options, essence_headline_editor.essence.size),
31
+ class: "alchemy_selectbox full_width"
32
+ ) %>
33
+ </div>
34
+ <% end %>
35
+ </div>
36
+ <% end %>
@@ -0,0 +1,10 @@
1
+ <% content = local_assigns[:content] || local_assigns[:essence_headline_view] %>
2
+ <%- html_options = local_assigns.fetch(:html_options, {}) -%>
3
+
4
+ <%= content_tag "h#{content.essence.level}",
5
+ content.essence.ingredient,
6
+ class: [
7
+ content.essence.size ? "h#{content.essence.size}" : nil,
8
+ html_options[:class]
9
+ ]
10
+ %>
@@ -10,13 +10,17 @@
10
10
  disabled: true
11
11
  %>
12
12
  <%= hidden_field_tag essence_link_editor.form_field_name(:link),
13
- essence_link_editor.essence.link %>
13
+ essence_link_editor.essence.link,
14
+ "data-link-value": true %>
14
15
  <%= hidden_field_tag essence_link_editor.form_field_name(:link_title),
15
- essence_link_editor.essence.link_title %>
16
+ essence_link_editor.essence.link_title,
17
+ "data-link-title": true %>
16
18
  <%= hidden_field_tag essence_link_editor.form_field_name(:link_class_name),
17
- essence_link_editor.essence.link_class_name %>
19
+ essence_link_editor.essence.link_class_name,
20
+ "data-link-class": true %>
18
21
  <%= hidden_field_tag essence_link_editor.form_field_name(:link_target),
19
- essence_link_editor.essence.link_target %>
22
+ essence_link_editor.essence.link_target,
23
+ "data-link-target": true %>
20
24
  <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_link_editor.content %>
21
25
  <% end %>
22
26
  <script type="text/javascript" charset="utf-8">
@@ -17,7 +17,7 @@
17
17
  }) %>
18
18
  $('#<%= essence_node_editor.form_field_id %>').alchemyNodeSelect({
19
19
  placeholder: "<%= Alchemy.t(:search_node) %>",
20
- url: "<%= alchemy.api_nodes_path(language_id: essence_node_editor.page&.language_id) %>",
20
+ url: "<%= alchemy.api_nodes_path %>",
21
21
  query_params: <%== query_params.to_json %>,
22
22
  <% if essence_node_editor.essence.node %>
23
23
  <% serialized_node = ActiveModelSerializers::SerializableResource.new(essence_node_editor.essence.node, include: :ancestors) %>
@@ -14,7 +14,7 @@
14
14
  <script>
15
15
  $('#<%= essence_page_editor.form_field_id %>').alchemyPageSelect({
16
16
  placeholder: "<%= Alchemy.t(:search_page) %>",
17
- url: "<%= alchemy.api_pages_path language_id: essence_page_editor.page&.language_id %>",
17
+ url: "<%= alchemy.api_pages_path %>",
18
18
  query_params: <%== essence_page_editor.settings[:query_params].to_json %>,
19
19
  <% if essence_page_editor.essence.page %>
20
20
  initialSelection: {
@@ -5,11 +5,18 @@
5
5
  class: essence_picture_editor.css_classes,
6
6
  data: essence_picture_editor.data_attributes do %>
7
7
  <%= content_label(essence_picture_editor) %>
8
- <div class="picture_thumbnail">
9
- <span class="picture_tool delete">
10
- <%= link_to render_icon(:times), '#',
11
- onclick: "return Alchemy.removePicture('##{essence_picture_editor.form_field_id(:picture_id)}');" %>
12
- </span>
8
+ <%= content_tag :div,
9
+ data: {
10
+ target_size: essence_picture_editor.essence.content.settings[:size] || [
11
+ essence_picture_editor.essence.image_file_width.to_i,
12
+ essence_picture_editor.essence.image_file_height.to_i
13
+ ].join("x"),
14
+ image_cropper: essence_picture_editor.essence.thumbnail_url_options[:crop],
15
+ },
16
+ class: "picture_thumbnail" do %>
17
+ <a class="picture_tool delete">
18
+ <%= render_icon(:times) %>
19
+ </a>
13
20
  <div class="picture_image">
14
21
  <div class="thumbnail_background">
15
22
  <%- if essence_picture_editor.ingredient -%>
@@ -27,18 +34,26 @@
27
34
  <%- end -%>
28
35
  <div class="edit_images_bottom">
29
36
  <%= render 'alchemy/essences/shared/essence_picture_tools', {
30
- content: essence_picture_editor.content
37
+ essence_picture_editor: essence_picture_editor
31
38
  } %>
32
39
  </div>
33
- </div>
40
+ <% end %>
34
41
  <%= hidden_field_tag essence_picture_editor.form_field_name(:picture_id),
35
- essence_picture_editor.ingredient.try!(:id) %>
42
+ essence_picture_editor.ingredient&.id, data: {
43
+ picture_id: true,
44
+ image_file_width: essence_picture_editor.ingredient&.image_file_width,
45
+ image_file_height: essence_picture_editor.ingredient&.image_file_height
46
+ } %>
36
47
  <%= hidden_field_tag essence_picture_editor.form_field_name(:link),
37
- essence_picture_editor.essence.link %>
48
+ essence_picture_editor.essence.link, data: { link_value: true }%>
38
49
  <%= hidden_field_tag essence_picture_editor.form_field_name(:link_title),
39
- essence_picture_editor.essence.link_title %>
50
+ essence_picture_editor.essence.link_title, data: { link_title: true } %>
40
51
  <%= hidden_field_tag essence_picture_editor.form_field_name(:link_class_name),
41
- essence_picture_editor.essence.link_class_name %>
52
+ essence_picture_editor.essence.link_class_name, data: { link_class: true } %>
42
53
  <%= hidden_field_tag essence_picture_editor.form_field_name(:link_target),
43
- essence_picture_editor.essence.link_target %>
54
+ essence_picture_editor.essence.link_target, data: { link_target: true } %>
55
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:crop_from),
56
+ essence_picture_editor.essence.crop_from, data: { crop_from: true } %>
57
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:crop_size),
58
+ essence_picture_editor.essence.crop_size, data: { crop_size: true } %>
44
59
  <% end %>
@@ -12,10 +12,18 @@
12
12
  type: essence_text_editor.settings[:input_type] || "text"
13
13
  ) %>
14
14
  <% if essence_text_editor.settings[:linkable] %>
15
- <%= hidden_field_tag essence_text_editor.form_field_name(:link), essence_text_editor.essence.link %>
16
- <%= hidden_field_tag essence_text_editor.form_field_name(:link_title), essence_text_editor.essence.link_title %>
17
- <%= hidden_field_tag essence_text_editor.form_field_name(:link_class_name), essence_text_editor.essence.link_class_name %>
18
- <%= hidden_field_tag essence_text_editor.form_field_name(:link_target), essence_text_editor.essence.link_target %>
15
+ <%= hidden_field_tag essence_text_editor.form_field_name(:link),
16
+ essence_text_editor.essence.link,
17
+ "data-link-value": true %>
18
+ <%= hidden_field_tag essence_text_editor.form_field_name(:link_title),
19
+ essence_text_editor.essence.link_title,
20
+ "data-link-title": true %>
21
+ <%= hidden_field_tag essence_text_editor.form_field_name(:link_class_name),
22
+ essence_text_editor.essence.link_class_name,
23
+ "data-link-class": true %>
24
+ <%= hidden_field_tag essence_text_editor.form_field_name(:link_target),
25
+ essence_text_editor.essence.link_target,
26
+ "data-link-target": true %>
19
27
  <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_text_editor.content %>
20
28
  <% end %>
21
29
  <% end %>
@@ -0,0 +1,4 @@
1
+ <%= render(
2
+ "alchemy/essences/essence_file_editor",
3
+ essence_file_editor: essence_video_editor
4
+ ) %>
@@ -0,0 +1,18 @@
1
+ <% content = local_assigns[:content] || local_assigns[:essence_video_view] %>
2
+ <%- if content.ingredient -%>
3
+ <%= content_tag :video,
4
+ controls: content.essence.controls,
5
+ autoplay: content.essence.autoplay,
6
+ loop: content.essence.loop,
7
+ muted: content.essence.muted,
8
+ preload: content.essence.preload.presence,
9
+ width: content.essence.width.presence,
10
+ height: content.essence.height.presence do %>
11
+ <%= tag :source,
12
+ src: alchemy.show_attachment_path(
13
+ content.ingredient,
14
+ format: content.ingredient.suffix
15
+ ),
16
+ type: content.ingredient.file_mime_type %>
17
+ <% end %>
18
+ <%- end -%>
@@ -1,22 +1,27 @@
1
+ <% content = essence_picture_editor.essence.content %>
1
2
  <% linkable = content.settings[:linkable] != false %>
3
+ <% croppable = content.essence && content.essence.allow_image_cropping? %>
2
4
 
3
- <% if content.essence && content.essence.allow_image_cropping? %>
4
- <%= link_to_dialog render_icon(:crop),
5
- alchemy.crop_admin_essence_picture_path(content.essence), {
6
- size: "1080x615",
7
- title: Alchemy.t('Edit Picturemask'),
8
- image_loader: false,
9
- padding: false
10
- }, {title: Alchemy.t('Edit Picturemask')} %>
11
- <%- else -%>
12
- <a href="#" class="disabled" tabindex="-1"><%= render_icon(:crop) %></a>
13
- <%- end -%>
5
+ <%= link_to_dialog render_icon(:crop),
6
+ alchemy.crop_admin_essence_picture_path(content.essence, {
7
+ crop_from_form_field_id: essence_picture_editor.form_field_id(:crop_from),
8
+ crop_size_form_field_id: essence_picture_editor.form_field_id(:crop_size),
9
+ picture_id: content.essence.picture_id
10
+ }), {
11
+ size: "1080x615",
12
+ title: Alchemy.t('Edit Picturemask'),
13
+ image_loader: false,
14
+ padding: false
15
+ }, {
16
+ title: Alchemy.t('Edit Picturemask'),
17
+ class: croppable ? "crop_link" : "disabled crop_link",
18
+ tabindex: croppable ? nil : "-1",
19
+ onclick: "return false"
20
+ } %>
14
21
 
15
22
  <%= link_to_dialog render_icon('file-image', style: 'regular'),
16
23
  alchemy.admin_pictures_path(
17
- element_id: content.element,
18
- content_id: content.id,
19
- swap: true
24
+ form_field_id: essence_picture_editor.form_field_id(:picture_id)
20
25
  ),
21
26
  {
22
27
  title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
@@ -29,14 +34,14 @@
29
34
  onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
30
35
  class: content.linked? ? 'linked' : nil,
31
36
  title: Alchemy.t(:link_image),
32
- 'data-content-id' => content.id,
37
+ "data-parent-selector": "##{content.dom_id}",
33
38
  id: "edit_link_#{content.id}"
34
39
  } do %>
35
40
  <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>
36
41
  <% end %>
37
42
 
38
43
  <%= link_to_if linkable, render_icon(:unlink), '', {
39
- onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
44
+ onclick: "return Alchemy.LinkDialog.removeLink(this, '##{content.dom_id}')",
40
45
  class: content.linked? ? 'linked' : 'disabled',
41
46
  tabindex: content.linked? ? nil : '-1',
42
47
  title: Alchemy.t(:unlink)