alchemy_cms 5.2.0 → 6.0.0.b3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (289) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +6 -14
  3. data/.gitignore +0 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +114 -5
  7. data/Gemfile +8 -1
  8. data/README.md +5 -2
  9. data/alchemy_cms.gemspec +78 -65
  10. data/app/assets/javascripts/alchemy/admin.js +0 -2
  11. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +0 -27
  12. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +2 -1
  13. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +1 -1
  14. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +0 -25
  15. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -1
  16. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -0
  17. data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +1 -1
  18. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
  19. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  20. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +40 -27
  21. data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
  22. data/app/assets/stylesheets/alchemy/_extends.scss +15 -2
  23. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  24. data/app/assets/stylesheets/alchemy/archive.scss +20 -5
  25. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  26. data/app/assets/stylesheets/alchemy/elements.scss +73 -61
  27. data/app/assets/stylesheets/alchemy/images.scss +8 -0
  28. data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
  29. data/app/assets/stylesheets/alchemy/page-select.scss +1 -0
  30. data/app/controllers/alchemy/admin/attachments_controller.rb +8 -4
  31. data/app/controllers/alchemy/admin/base_controller.rb +5 -7
  32. data/app/controllers/alchemy/admin/elements_controller.rb +59 -34
  33. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  34. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  35. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  36. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  37. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  38. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  39. data/app/controllers/alchemy/admin/pages_controller.rb +7 -22
  40. data/app/controllers/alchemy/admin/pictures_controller.rb +56 -17
  41. data/app/controllers/alchemy/admin/resources_controller.rb +84 -10
  42. data/app/controllers/alchemy/api/elements_controller.rb +13 -4
  43. data/app/controllers/alchemy/api/pages_controller.rb +4 -3
  44. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  45. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  46. data/app/decorators/alchemy/element_editor.rb +26 -1
  47. data/app/decorators/alchemy/ingredient_editor.rb +158 -0
  48. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  49. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  50. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  51. data/app/helpers/alchemy/elements_block_helper.rb +23 -6
  52. data/app/helpers/alchemy/elements_helper.rb +12 -5
  53. data/app/helpers/alchemy/pages_helper.rb +3 -11
  54. data/app/jobs/alchemy/base_job.rb +11 -0
  55. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  56. data/app/models/alchemy/attachment.rb +24 -7
  57. data/app/models/alchemy/content.rb +1 -6
  58. data/app/models/alchemy/content/factory.rb +23 -27
  59. data/app/models/alchemy/element.rb +39 -72
  60. data/app/models/alchemy/element/definitions.rb +29 -27
  61. data/app/models/alchemy/element/element_contents.rb +131 -122
  62. data/app/models/alchemy/element/element_essences.rb +111 -98
  63. data/app/models/alchemy/element/element_ingredients.rb +184 -0
  64. data/app/models/alchemy/element/presenters.rb +104 -85
  65. data/app/models/alchemy/elements_repository.rb +126 -0
  66. data/app/models/alchemy/essence_audio.rb +12 -0
  67. data/app/models/alchemy/essence_headline.rb +40 -0
  68. data/app/models/alchemy/essence_picture.rb +4 -116
  69. data/app/models/alchemy/essence_richtext.rb +12 -0
  70. data/app/models/alchemy/essence_video.rb +12 -0
  71. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  72. data/app/models/alchemy/ingredient.rb +183 -0
  73. data/app/models/alchemy/ingredient_validator.rb +97 -0
  74. data/app/models/alchemy/ingredients/audio.rb +29 -0
  75. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  76. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  77. data/app/models/alchemy/ingredients/file.rb +30 -0
  78. data/app/models/alchemy/ingredients/headline.rb +42 -0
  79. data/app/models/alchemy/ingredients/html.rb +19 -0
  80. data/app/models/alchemy/ingredients/link.rb +16 -0
  81. data/app/models/alchemy/ingredients/node.rb +23 -0
  82. data/app/models/alchemy/ingredients/page.rb +23 -0
  83. data/app/models/alchemy/ingredients/picture.rb +41 -0
  84. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  85. data/app/models/alchemy/ingredients/select.rb +10 -0
  86. data/app/models/alchemy/ingredients/text.rb +17 -0
  87. data/app/models/alchemy/ingredients/video.rb +33 -0
  88. data/app/models/alchemy/language.rb +0 -11
  89. data/app/models/alchemy/page.rb +76 -33
  90. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  91. data/app/models/alchemy/page/page_elements.rb +186 -205
  92. data/app/models/alchemy/page/page_naming.rb +66 -64
  93. data/app/models/alchemy/page/page_natures.rb +139 -142
  94. data/app/models/alchemy/page/page_scopes.rb +117 -102
  95. data/app/models/alchemy/page/publisher.rb +50 -0
  96. data/app/models/alchemy/page/url_path.rb +1 -1
  97. data/app/models/alchemy/page_version.rb +58 -0
  98. data/app/models/alchemy/picture.rb +18 -40
  99. data/app/models/alchemy/picture/calculations.rb +2 -8
  100. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  101. data/app/models/alchemy/picture/transformations.rb +24 -96
  102. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  103. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  104. data/app/presenters/alchemy/picture_view.rb +88 -0
  105. data/app/serializers/alchemy/element_serializer.rb +5 -0
  106. data/app/serializers/alchemy/page_tree_serializer.rb +3 -2
  107. data/app/services/alchemy/delete_elements.rb +44 -0
  108. data/app/services/alchemy/duplicate_element.rb +56 -0
  109. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +2 -3
  110. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  111. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  112. data/app/views/alchemy/admin/attachments/index.html.erb +2 -3
  113. data/app/views/alchemy/admin/crop.html.erb +36 -0
  114. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  115. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  116. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  117. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  118. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  119. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  120. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +2 -6
  121. data/app/views/alchemy/admin/elements/fold.js.erb +2 -2
  122. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  123. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  124. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  125. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  126. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  127. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  128. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  129. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  130. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  131. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  132. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  133. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  134. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  135. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  136. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  137. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  138. data/app/views/alchemy/admin/pages/_form.html.erb +0 -6
  139. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  140. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  141. data/app/views/alchemy/admin/pages/_toolbar.html.erb +1 -1
  142. data/app/views/alchemy/admin/pages/edit.html.erb +36 -24
  143. data/app/views/alchemy/admin/pages/index.html.erb +2 -9
  144. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  145. data/app/views/alchemy/admin/partials/_routes.html.erb +7 -11
  146. data/app/views/alchemy/admin/partials/_search_form.html.erb +9 -0
  147. data/app/views/alchemy/admin/pictures/_archive.html.erb +1 -1
  148. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +1 -1
  149. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +5 -7
  150. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  151. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  152. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  153. data/app/views/alchemy/admin/pictures/index.html.erb +8 -3
  154. data/app/views/alchemy/admin/resources/_filter.html.erb +12 -0
  155. data/app/views/alchemy/admin/resources/_filter_bar.html.erb +14 -17
  156. data/app/views/alchemy/admin/resources/_form.html.erb +3 -0
  157. data/app/views/alchemy/admin/resources/_table_header.html.erb +15 -0
  158. data/app/views/alchemy/admin/resources/index.html.erb +3 -11
  159. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  160. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  161. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  162. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  163. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  164. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  165. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  166. data/app/views/alchemy/essences/_essence_picture_view.html.erb +3 -3
  167. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  168. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  169. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  170. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  171. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  172. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  173. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  174. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  175. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  176. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  177. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  178. data/app/views/alchemy/ingredients/_file_editor.html.erb +52 -0
  179. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  180. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  181. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  182. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  183. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  184. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  185. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  186. data/app/views/alchemy/ingredients/_node_editor.html.erb +26 -0
  187. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  188. data/app/views/alchemy/ingredients/_page_editor.html.erb +25 -0
  189. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  190. data/app/views/alchemy/ingredients/_picture_editor.html.erb +60 -0
  191. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  192. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  193. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  194. data/app/views/alchemy/ingredients/_select_editor.html.erb +30 -0
  195. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  196. data/app/views/alchemy/ingredients/_text_editor.html.erb +20 -0
  197. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  198. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  199. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  200. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  201. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  202. data/config/brakeman.ignore +66 -159
  203. data/config/initializers/dragonfly.rb +10 -0
  204. data/config/locales/alchemy.en.yml +108 -64
  205. data/config/routes.rb +17 -22
  206. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  207. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  208. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  209. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  210. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  211. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  212. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  213. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  214. data/lib/alchemy/admin/preview_url.rb +2 -0
  215. data/lib/alchemy/deprecation.rb +1 -1
  216. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  217. data/lib/alchemy/dragonfly/processors/crop_resize.rb +35 -0
  218. data/lib/alchemy/elements_finder.rb +14 -60
  219. data/lib/alchemy/essence.rb +1 -2
  220. data/lib/alchemy/forms/builder.rb +21 -1
  221. data/lib/alchemy/hints.rb +8 -4
  222. data/lib/alchemy/page_layout.rb +0 -13
  223. data/lib/alchemy/permissions.rb +30 -29
  224. data/lib/alchemy/resource.rb +13 -3
  225. data/lib/alchemy/resource_filter.rb +40 -0
  226. data/lib/alchemy/resources_helper.rb +1 -16
  227. data/lib/alchemy/tasks/tidy.rb +29 -0
  228. data/lib/alchemy/test_support.rb +2 -11
  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 +75 -0
  240. data/lib/alchemy/tinymce.rb +17 -0
  241. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  242. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  243. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +62 -0
  244. data/lib/alchemy/version.rb +1 -1
  245. data/lib/alchemy_cms.rb +1 -0
  246. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  247. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  248. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  249. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  250. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  251. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  252. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  253. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  254. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  255. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  256. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  257. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  258. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  259. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  260. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  261. data/lib/tasks/alchemy/thumbnails.rake +4 -2
  262. data/lib/tasks/alchemy/tidy.rake +12 -0
  263. data/lib/tasks/alchemy/upgrade.rake +26 -0
  264. data/package.json +3 -2
  265. data/package/admin.js +11 -1
  266. data/package/src/__tests__/i18n.spec.js +23 -0
  267. data/package/src/file_editors.js +28 -0
  268. data/package/src/i18n.js +1 -3
  269. data/package/src/image_cropper.js +103 -0
  270. data/package/src/image_loader.js +58 -0
  271. data/package/src/node_tree.js +5 -5
  272. data/package/src/picture_editors.js +169 -0
  273. data/package/src/utils/__tests__/ajax.spec.js +20 -12
  274. data/package/src/utils/ajax.js +8 -3
  275. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  276. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  277. metadata +292 -55
  278. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  279. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  280. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  281. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  282. data/app/views/alchemy/admin/attachments/_filter_bar.html.erb +0 -29
  283. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  284. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  285. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  286. data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +0 -30
  287. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  288. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  289. data/lib/alchemy/test_support/factories.rb +0 -16
@@ -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
+ })()
@@ -6,7 +6,7 @@
6
6
  file_attribute: 'image_file',
7
7
  redirect_url: alchemy.admin_pictures_path(
8
8
  size: @size,
9
- filter: 'last_upload'
9
+ filter: { misc: 'last_upload' }
10
10
  ) %>
11
11
  <div class="toolbar_spacer"></div>
12
12
  <% end %>
@@ -67,7 +67,7 @@
67
67
  </div>
68
68
 
69
69
  <%= render 'alchemy/admin/partials/search_form',
70
- additional_params: [:filter, :tagged_with, :size] %>
70
+ additional_params: [:size] %>
71
71
  <% end %>
72
72
 
73
73
  <div id="picture_archive" class="resources-table-wrapper with_tag_filter">
@@ -75,7 +75,12 @@
75
75
  <h2>
76
76
  <%= @pictures.total_count %>
77
77
  <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
78
- <%= Alchemy.t("picture_library.filter.#{search_filter_params[:filter]}") if search_filter_params[:filter].present? %>
78
+ <% if search_filter_params[:filter].present? %>
79
+ <%= Alchemy.t("filtered_by") %>
80
+ <% search_filter_params[:filter].each do |k, v| %>
81
+ <span class="applied-filter"><%= Alchemy.t("filters.picture.#{k}.values.#{v}") %></span>
82
+ <% end %>
83
+ <% end %>
79
84
  </h2>
80
85
  </div>
81
86
  <%= render 'archive' %>
@@ -0,0 +1,12 @@
1
+ <label>
2
+ <h3><%= Alchemy.t("name", scope: ["filters", resource_name, filter.name]) || Alchemy.t('Filter') %></h3>
3
+ <%= select_tag(
4
+ filter.name,
5
+ options_for_select(
6
+ filter.options_for_select, params[:filter].try(:[], filter.name)
7
+ ),
8
+ include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
9
+ data: { remote: !!request.xhr? },
10
+ class: 'alchemy_selectbox'
11
+ ) %>
12
+ </label>
@@ -1,28 +1,25 @@
1
1
  <div id="filter_bar">
2
- <label>
3
- <h3><%= local_assigns[:label] || Alchemy.t('Filter') %></h3>
4
- <%= select_tag(
5
- 'resource_filter',
6
- options_for_select(
7
- resource_filter_select, search_filter_params[:filter]
8
- ),
9
- include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
10
- data: { remote: !!request.xhr? },
11
- class: 'alchemy_selectbox'
12
- ) %>
13
- </label>
2
+ <%= render partial: "filter", collection: resource_filters_for_select %>
14
3
  </div>
15
4
 
16
5
  <script type="text/javascript">
17
6
  $(function() {
18
- $('#resource_filter').on('change', function(e) {
7
+ $('select', '#filter_bar').on('change', function(e) {
19
8
  var $this = $(this);
20
- var url = '<%= local_assigns[:url] || resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
9
+ var filter_param = 'filter['+$this.attr('name')+']';
10
+ var path = '<%= resources_path(resource_handler.namespaced_resources_name) %>';
11
+ var params = new URLSearchParams('<%= raw search_filter_params.to_query %>');
12
+
13
+ if ($this.val() === "") {
14
+ params.delete(filter_param);
15
+ } else {
16
+ params.set(filter_param, $this.val());
17
+ }
18
+
21
19
  if ($this.data('remote') === true) {
22
- $.get(url, {filter: $this.val()}, null, 'script');
20
+ $.get(path, params.toString(), null, 'script');
23
21
  } else {
24
- delimiter = url.match(/\?/) ? '&' : '?';
25
- Turbolinks.visit(url + delimiter + 'filter=' + encodeURIComponent($this.val()));
22
+ Turbolinks.visit(path + '?' + params.toString());
26
23
  }
27
24
  return false;
28
25
  });
@@ -2,9 +2,12 @@
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'} %>
9
+ <% elsif attribute[:type].in? %i[date time datetime] %>
10
+ <%= f.datepicker attribute[:name], resource_attribute_field_options(attribute) %>
8
11
  <% else %>
9
12
  <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
10
13
  <% end %>
@@ -1,4 +1,19 @@
1
1
  <div class="resources-header">
2
+ <% if search_filter_params[:filter].present? %>
3
+ <b><%= Alchemy.t("filtered_by") %></b>
4
+ <% search_filter_params[:filter].each do |k, v| %>
5
+ <%- tmp_params = search_filter_params.dup -%>
6
+ <%- tmp_params[:filter] = tmp_params[:filter].except(k) -%>
7
+ <%- dismiss_filter_url = resource_url_proxy.url_for(
8
+ { action: 'index' }.merge(tmp_params.except(:page))
9
+ ) -%>
10
+ <div class="applied-filter">
11
+ <%= Alchemy.t("filters.#{resource_handler.resource_name}.#{k}.values.#{v}", default: v) %>
12
+ <%= link_to render_icon(:times, size: 'xs'), dismiss_filter_url, class: 'dismiss-filter' %>
13
+ </div>
14
+ <% end %>
15
+ <% end %>
16
+
2
17
  <h2>
3
18
  <%= resources_instance_variable.total_count %>
4
19
  <%= resource_model.model_name.human(count: resources_instance_variable.total_count) %>
@@ -21,10 +21,7 @@
21
21
  dialog: false,
22
22
  if_permitted_to: [:index, resource_model]
23
23
  ) %>
24
- <%= render 'alchemy/admin/partials/search_form', additional_params: [
25
- resource_has_filters ? :filter : nil,
26
- resource_has_tags ? :tagged_with : nil
27
- ].compact %>
24
+ <%= render 'alchemy/admin/partials/search_form' %>
28
25
  <% end %>
29
26
 
30
27
  <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
@@ -33,13 +30,8 @@
33
30
 
34
31
  <% if resource_has_tags || resource_has_filters %>
35
32
  <div id="library_sidebar">
36
- <% if resource_has_filters %>
37
- <%= render 'filter_bar' %>
38
- <% end %>
39
-
40
- <% if resource_has_tags %>
41
- <%= render 'tag_list' %>
42
- <% end %>
33
+ <%= render 'filter_bar' if resource_has_filters %>
34
+ <%= render 'tag_list' if resource_has_tags %>
43
35
  </div>
44
36
  <% end %>
45
37
  </div>
@@ -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">
@@ -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 %>
@@ -1,6 +1,6 @@
1
1
  <% content = local_assigns[:content] || local_assigns[:essence_picture_view] %>
2
2
  <%= Alchemy::EssencePictureView.new(
3
3
  content,
4
- local_assigns[:options],
5
- local_assigns[:html_options]
6
- ).render %>
4
+ local_assigns[:options] || {},
5
+ local_assigns[:html_options] || {}
6
+ ).render %>
@@ -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 -%>