alchemy_cms 5.3.8 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (302) 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 -88
  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 +41 -30
  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/selects.scss +4 -0
  36. data/app/assets/stylesheets/alchemy/sitemap.scss +7 -9
  37. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  38. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  39. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -2
  40. data/app/controllers/alchemy/admin/base_controller.rb +8 -16
  41. data/app/controllers/alchemy/admin/elements_controller.rb +58 -34
  42. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  43. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  44. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  45. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  46. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  47. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  48. data/app/controllers/alchemy/admin/pages_controller.rb +19 -23
  49. data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
  50. data/app/controllers/alchemy/api/elements_controller.rb +10 -5
  51. data/app/controllers/alchemy/api/nodes_controller.rb +0 -1
  52. data/app/controllers/alchemy/api/pages_controller.rb +5 -12
  53. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  54. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  55. data/app/decorators/alchemy/element_editor.rb +23 -1
  56. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  57. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  58. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  59. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  60. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  61. data/app/helpers/alchemy/elements_helper.rb +14 -7
  62. data/app/helpers/alchemy/pages_helper.rb +3 -11
  63. data/app/jobs/alchemy/base_job.rb +11 -0
  64. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  65. data/app/models/alchemy/attachment.rb +1 -1
  66. data/app/models/alchemy/content/factory.rb +23 -27
  67. data/app/models/alchemy/content.rb +1 -6
  68. data/app/models/alchemy/element/definitions.rb +29 -27
  69. data/app/models/alchemy/element/element_contents.rb +131 -122
  70. data/app/models/alchemy/element/element_essences.rb +100 -98
  71. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  72. data/app/models/alchemy/element/presenters.rb +89 -87
  73. data/app/models/alchemy/element.rb +40 -73
  74. data/app/models/alchemy/elements_repository.rb +126 -0
  75. data/app/models/alchemy/essence_audio.rb +12 -0
  76. data/app/models/alchemy/essence_headline.rb +40 -0
  77. data/app/models/alchemy/essence_picture.rb +4 -116
  78. data/app/models/alchemy/essence_richtext.rb +12 -0
  79. data/app/models/alchemy/essence_video.rb +12 -0
  80. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  81. data/app/models/alchemy/ingredient.rb +219 -0
  82. data/app/models/alchemy/ingredient_validator.rb +97 -0
  83. data/app/models/alchemy/ingredients/audio.rb +29 -0
  84. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  85. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  86. data/app/models/alchemy/ingredients/file.rb +30 -0
  87. data/app/models/alchemy/ingredients/headline.rb +42 -0
  88. data/app/models/alchemy/ingredients/html.rb +19 -0
  89. data/app/models/alchemy/ingredients/link.rb +16 -0
  90. data/app/models/alchemy/ingredients/node.rb +23 -0
  91. data/app/models/alchemy/ingredients/page.rb +23 -0
  92. data/app/models/alchemy/ingredients/picture.rb +41 -0
  93. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  94. data/app/models/alchemy/ingredients/select.rb +10 -0
  95. data/app/models/alchemy/ingredients/text.rb +17 -0
  96. data/app/models/alchemy/ingredients/video.rb +33 -0
  97. data/app/models/alchemy/language.rb +0 -11
  98. data/app/models/alchemy/node.rb +1 -1
  99. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  100. data/app/models/alchemy/page/page_elements.rb +186 -205
  101. data/app/models/alchemy/page/page_naming.rb +66 -64
  102. data/app/models/alchemy/page/page_natures.rb +139 -142
  103. data/app/models/alchemy/page/page_scopes.rb +113 -102
  104. data/app/models/alchemy/page/publisher.rb +50 -0
  105. data/app/models/alchemy/page/url_path.rb +1 -1
  106. data/app/models/alchemy/page.rb +69 -42
  107. data/app/models/alchemy/page_version.rb +58 -0
  108. data/app/models/alchemy/picture/calculations.rb +2 -8
  109. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  110. data/app/models/alchemy/picture/transformations.rb +23 -95
  111. data/app/models/alchemy/picture.rb +5 -3
  112. data/app/models/alchemy/picture_variant.rb +1 -3
  113. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  114. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  115. data/app/presenters/alchemy/picture_view.rb +88 -0
  116. data/app/serializers/alchemy/element_serializer.rb +5 -0
  117. data/app/serializers/alchemy/page_serializer.rb +1 -7
  118. data/app/serializers/alchemy/page_tree_serializer.rb +6 -5
  119. data/app/services/alchemy/delete_elements.rb +44 -0
  120. data/app/services/alchemy/duplicate_element.rb +56 -0
  121. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  122. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  123. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  124. data/app/views/alchemy/admin/crop.html.erb +36 -0
  125. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  126. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  127. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  128. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  129. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  130. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  131. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  132. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  133. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  134. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  135. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  136. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  137. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  138. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  139. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  140. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  141. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  142. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  143. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  144. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  145. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  146. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  147. data/app/views/alchemy/admin/pages/_form.html.erb +0 -25
  148. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  149. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +5 -16
  150. data/app/views/alchemy/admin/pages/_page.html.erb +133 -111
  151. data/app/views/alchemy/admin/pages/_sitemap.html.erb +16 -10
  152. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  153. data/app/views/alchemy/admin/pages/_toolbar.html.erb +12 -0
  154. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  155. data/app/views/alchemy/admin/pages/fold.js.erb +2 -0
  156. data/app/views/alchemy/admin/pages/index.html.erb +1 -1
  157. data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
  158. data/app/views/alchemy/admin/pages/update.js.erb +1 -8
  159. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  160. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -19
  161. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  162. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  163. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  164. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  165. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  166. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  167. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  168. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  169. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  170. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  171. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  172. data/app/views/alchemy/essences/_essence_node_editor.html.erb +1 -1
  173. data/app/views/alchemy/essences/_essence_page_editor.html.erb +1 -1
  174. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  175. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  176. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  177. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  178. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  179. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  180. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  181. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  182. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  183. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  184. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  185. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  186. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  187. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  188. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  189. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  190. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  191. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  192. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  193. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  194. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  195. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  196. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  197. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  198. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  199. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  200. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  201. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  202. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  203. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  204. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  205. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  206. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  207. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  208. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  209. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  210. data/config/alchemy/config.yml +0 -1
  211. data/config/brakeman.ignore +66 -159
  212. data/config/initializers/dragonfly.rb +2 -2
  213. data/config/locales/alchemy.en.yml +26 -15
  214. data/config/routes.rb +19 -26
  215. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  216. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  217. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  218. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  219. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  220. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  221. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  222. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  223. data/lib/alchemy/admin/preview_url.rb +2 -0
  224. data/lib/alchemy/deprecation.rb +1 -1
  225. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  226. data/lib/alchemy/elements_finder.rb +14 -60
  227. data/lib/alchemy/engine.rb +1 -19
  228. data/lib/alchemy/essence.rb +1 -2
  229. data/lib/alchemy/hints.rb +1 -1
  230. data/lib/alchemy/page_layout.rb +2 -19
  231. data/lib/alchemy/permissions.rb +15 -15
  232. data/lib/alchemy/resource.rb +13 -3
  233. data/lib/alchemy/tasks/tidy.rb +29 -0
  234. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  235. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  236. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  237. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  238. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  239. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  240. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  241. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  242. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  243. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  244. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  245. data/lib/alchemy/test_support.rb +2 -11
  246. data/lib/alchemy/tinymce.rb +17 -0
  247. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  248. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  249. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  250. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  251. data/lib/alchemy/version.rb +1 -1
  252. data/lib/alchemy_cms.rb +0 -1
  253. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  254. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  255. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  256. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  257. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  258. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  259. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  260. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  261. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  262. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  263. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  264. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  265. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  266. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  267. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  268. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  269. data/lib/tasks/alchemy/tidy.rake +12 -0
  270. data/lib/tasks/alchemy/upgrade.rake +21 -15
  271. data/package/admin.js +8 -4
  272. data/package/src/file_editors.js +28 -0
  273. data/package/src/image_cropper.js +103 -0
  274. data/package/src/image_loader.js +58 -0
  275. data/package/src/node_tree.js +8 -8
  276. data/package/src/picture_editors.js +169 -0
  277. data/package/src/utils/__tests__/ajax.spec.js +16 -52
  278. data/package/src/utils/ajax.js +0 -12
  279. data/package.json +3 -2
  280. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  281. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +434 -0
  282. data/vendor/assets/stylesheets/alchemy_admin/select2.scss +1 -1
  283. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  284. metadata +291 -54
  285. data/.rspec +0 -1
  286. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  287. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  288. data/app/assets/javascripts/alchemy/templates/page_folder.hbs +0 -3
  289. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  290. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  291. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  292. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  293. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  294. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  295. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  296. data/lib/alchemy/dragonfly/processors/thumbnail.rb +0 -27
  297. data/lib/alchemy/error_tracking/airbrake_handler.rb +0 -13
  298. data/lib/alchemy/error_tracking.rb +0 -14
  299. data/lib/alchemy/test_support/factories.rb +0 -20
  300. data/package/src/page_publication_fields.js +0 -27
  301. data/package/src/page_sorter.js +0 -62
  302. data/package/src/sitemap.js +0 -148
@@ -42,36 +42,6 @@ $.extend Alchemy,
42
42
  $overlay.hide()
43
43
  return
44
44
 
45
- # Shows spinner while loading images and
46
- # fades the image after its been loaded
47
- ImageLoader: (scope = document, options = {fill: '#fff'}) ->
48
- $('img', scope).each ->
49
- if !this.complete
50
- image = $(this).hide()
51
- $parent = image.parent()
52
- spinner = new Alchemy.Spinner('small', options)
53
- spinner.spin $parent[0]
54
- image.on 'load', ->
55
- spinner.stop()
56
- image.fadeIn 400
57
- image.on 'error', (evt) ->
58
- message = "Could not load #{this.src}"
59
- spinner.stop()
60
- console.error(message, evt)
61
- $parent.html('<span class="icon fas fa-exclamation-triangle" title="' + message + '" />')
62
- return
63
-
64
- # Removes the picture from essence picture thumbnail
65
- removePicture: (selector) ->
66
- $form_field = $(selector)
67
- $element = $form_field.closest(".element-editor")
68
- $content = $form_field.closest(".content_editor")
69
- if $form_field[0]
70
- $form_field.val ""
71
- $content.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
72
- Alchemy.setElementDirty $element
73
- false
74
-
75
45
  # Initializes all select tag with .alchemy_selectbox class as select2 instance
76
46
  # Pass a jQuery scope to only init a subset of selectboxes.
77
47
  SelectBox: (scope) ->
@@ -78,8 +78,9 @@ window.Alchemy.confirmToDeleteDialog = (url, opts) ->
78
78
  type: "DELETE"
79
79
  error: (xhr, status, error) ->
80
80
  type = if xhr.status == 403 then 'warning' else 'error'
81
- Alchemy.pleaseWaitOverlay(false)
82
81
  Alchemy.growl(xhr.responseText || error, type)
82
+ complete: () ->
83
+ Alchemy.pleaseWaitOverlay(false)
83
84
 
84
85
  $.extend(options, opts)
85
86
  Alchemy.openConfirmDialog options.message, options
@@ -82,12 +82,7 @@ class window.Alchemy.Dialog
82
82
  @dialog_body.hide()
83
83
  @dialog_body.html(data)
84
84
  @init()
85
- @dialog[0].dispatchEvent(new CustomEvent(
86
- "DialogReady.Alchemy",
87
- bubbles: true
88
- detail:
89
- body: @dialog_body[0]
90
- ))
85
+ @dialog.trigger('DialogReady.Alchemy', @dialog_body)
91
86
  if @options.ready?
92
87
  @options.ready(@dialog_body)
93
88
  @dialog_body.show('fade', 200)
@@ -256,7 +251,7 @@ window.Alchemy.openDialog = (url, options) ->
256
251
  # See Alchemy.Dialog for further options you can add to the data attribute
257
252
  #
258
253
  window.Alchemy.watchForDialogs = (scope = '#alchemy') ->
259
- $(scope).on 'click', '[data-alchemy-dialog]', (event) ->
254
+ $(scope).on 'click', '[data-alchemy-dialog]:not(.disabled)', (event) ->
260
255
  $this = $(this)
261
256
  url = $this.attr('href')
262
257
  options = $this.data('alchemy-dialog')
@@ -50,7 +50,6 @@ $.extend Alchemy,
50
50
  complete: ->
51
51
  Alchemy.initializedSortableElements = false
52
52
  $(event.target).css("cursor", "")
53
- Alchemy.TrashWindow.refresh(page_id)
54
53
  return
55
54
  start: (event, ui) ->
56
55
  $this = $(this)
@@ -78,27 +77,3 @@ $.extend Alchemy,
78
77
  $sortable_area.sortable(sortable_options)
79
78
  $sortable_area.find('.nested-elements').sortable(sortable_options)
80
79
  return
81
-
82
- DraggableTrashItems: ->
83
- $("#trash_items div.draggable").each ->
84
- $this = $(this)
85
- name = $this.data('element-name')
86
- $dropzone = $("[data-droppable-elements~='#{name}']")
87
- $this.draggable
88
- helper: "clone"
89
- iframeFix: "iframe#alchemy_preview_window"
90
- connectToSortable: $dropzone
91
- revert: "invalid"
92
- revertDuration: 200
93
- start: (event, ui) ->
94
- $dropzone.css('minHeight', 36)
95
- $(this).addClass "dragged"
96
- ui.helper.css('width', 345)
97
- return
98
- stop: (event, ui) ->
99
- $(this).removeClass "dragged"
100
- $dropzone.css('minHeight', '')
101
- ui.helper.css('width', '')
102
- return
103
- return
104
- return
@@ -237,7 +237,7 @@ Alchemy.ElementEditors =
237
237
  # private
238
238
 
239
239
  _shouldUpdateTitle: (element, event) ->
240
- editors = element.find('> .element-content .element-content-editors').children()
240
+ editors = element.find('> .element-content .element-content-editors, > .element-content .element-ingredient-editors').children()
241
241
  if @_hasParents(element)
242
242
  editors.length != 0
243
243
  else if @_isParent(element) && @_isFirstChild $(event.target)
@@ -50,6 +50,8 @@ Alchemy.ElementsWindow =
50
50
  $.get @url, (data) =>
51
51
  @element_area.html data
52
52
  Alchemy.GUI.init(@element_area)
53
+ Alchemy.fileEditors(@element_area.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
54
+ Alchemy.pictureEditors(@element_area.find(".essence_picture, .ingredient-editor.picture").selector)
53
55
  if @callback
54
56
  @callback.call()
55
57
  .fail (xhr, status, error) =>
@@ -10,7 +10,7 @@ Alchemy.FixedElements = {
10
10
  $tabs = $(this.TABS.replace(/{{label}}/, label));
11
11
 
12
12
  $('#main-content-elements').wrap($wrapper);
13
- $('#fixed-elements').prepend($tabs).tabs('paging', {
13
+ $('#fixed-elements').prepend($tabs).tabs().tabs('paging', {
14
14
  follow: true,
15
15
  followOnSelect: true
16
16
  });
@@ -22,4 +22,6 @@ Alchemy.GUI =
22
22
  initElement: ($el) ->
23
23
  Alchemy.ElementDirtyObserver($el)
24
24
  Alchemy.GUI.init($el)
25
- Alchemy.ImageLoader($el)
25
+ Alchemy.ImageLoader($el[0])
26
+ Alchemy.fileEditors($el.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
27
+ Alchemy.pictureEditors($el.find(".essence_picture, .ingredient-editor.picture").selector)
@@ -7,7 +7,7 @@ class window.Alchemy.ImageOverlay extends Alchemy.Dialog
7
7
  return
8
8
 
9
9
  init: ->
10
- Alchemy.ImageLoader(@dialog_body)
10
+ Alchemy.ImageLoader(@dialog_body[0])
11
11
  $('.zoomed-picture-background').click (e) =>
12
12
  e.stopPropagation()
13
13
  return if e.target.nodeName == 'IMG'
@@ -4,6 +4,12 @@
4
4
  class window.Alchemy.LinkDialog extends Alchemy.Dialog
5
5
 
6
6
  constructor: (@link_object) ->
7
+ parent_selector = @link_object.dataset.parentSelector
8
+ parent = document.querySelector(parent_selector)
9
+ @link_value_field = parent.querySelector("[data-link-value]")
10
+ @link_title_field = parent.querySelector("[data-link-title]")
11
+ @link_target_field = parent.querySelector("[data-link-target]")
12
+ @link_class_field = parent.querySelector("[data-link-class]")
7
13
  @url = Alchemy.routes.link_admin_pages_path
8
14
  @$link_object = $(@link_object)
9
15
  @options =
@@ -80,14 +86,12 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
80
86
  name: page.name
81
87
  url_path: page.url_path
82
88
  page_id: page.id
83
- language: page.language
84
- site: page.site
85
89
  more: meta.page * meta.per_page < meta.total_count
86
90
  initSelection: ($element, callback) =>
87
91
  urlname = $element.val()
88
92
  $.get Alchemy.routes.api_pages_path,
89
93
  q:
90
- urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?(.+?)\/?$/, '$3')
94
+ urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?/, '')
91
95
  page: 1
92
96
  per_page: 1,
93
97
  (data) =>
@@ -138,7 +142,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
138
142
  if @link_object.editor
139
143
  @setTinyMCELink(url, title, target)
140
144
  else
141
- @setEssenceLink(url, title, target)
145
+ @setLinkFields(url, title, target)
142
146
 
143
147
  # Sets a link in TinyMCE editor.
144
148
  setTinyMCELink: (url, title, target) ->
@@ -153,14 +157,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
153
157
  true
154
158
 
155
159
  # Sets a link on an Essence (e.g. EssencePicture).
156
- setEssenceLink: (url, title, target) ->
157
- content_id = @$link_object.data('content-id')
158
- $("#contents_#{content_id}_link").val(url).change()
159
- $("#contents_#{content_id}_link_title").val(title)
160
- $("#contents_#{content_id}_link_class_name").val(@link_type)
161
- $("#contents_#{content_id}_link_target").val(target)
162
- @$link_object.addClass('linked')
163
- @$link_object.next().addClass('linked').removeClass('disabled').removeAttr('tabindex')
160
+ setLinkFields: (url, title, target) ->
161
+ @link_value_field.value = url
162
+ @link_value_field.dispatchEvent(new Event("change"))
163
+ @link_title_field.value = title
164
+ @link_class_field.value = @link_type
165
+ @link_target_field.value = target
166
+ @link_object.classList.add("linked")
167
+ @link_object.nextElementSibling.classList.replace("disabled", "linked")
168
+ @link_object.nextElementSibling.removeAttribute("tabindex")
169
+ return
164
170
 
165
171
  # Selects the correct tab for link type and fills all fields.
166
172
  selectTab: ->
@@ -207,12 +213,11 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
207
213
  # Creates a temporay $('a') object that holds all values on it.
208
214
  createTempLink: ->
209
215
  @$tmp_link = $('<a/>')
210
- content_id = @$link_object.data('content-id')
211
- @$tmp_link.attr 'href', $("#contents_#{content_id}_link").val()
212
- @$tmp_link.attr 'title', $("#contents_#{content_id}_link_title").val()
213
- @$tmp_link.attr 'data-link-target', $("#contents_#{content_id}_link_target").val()
214
- @$tmp_link.attr 'target', if $("#contents_#{content_id}_link_target").val() == 'blank' then '_blank' else null
215
- @$tmp_link.addClass $("#contents_#{content_id}_link_class_name").val()
216
+ @$tmp_link.attr('href', @link_value_field.value)
217
+ @$tmp_link.attr('title', @link_title_field.value)
218
+ @$tmp_link.attr('data-link-target', @link_target_field.value)
219
+ @$tmp_link.attr('target', if @link_target_field.value == 'blank' then '_blank' else null)
220
+ @$tmp_link.addClass(@link_class_field.value)
216
221
  @$tmp_link
217
222
 
218
223
  # Validates url for beginning with an protocol.
@@ -230,7 +235,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
230
235
  # Populates the internal anchors select
231
236
  initAnchorLinks: ->
232
237
  frame = document.getElementById('alchemy_preview_window')
233
- elements = frame.contentDocument.getElementsByTagName('*')
238
+ elements = frame.contentDocument?.getElementsByTagName('*') || []
234
239
  if elements.length > 0
235
240
  for element in elements
236
241
  if element.id
@@ -242,15 +247,21 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
242
247
  # Public class methods
243
248
 
244
249
  # Removes link from Essence.
245
- @removeLink = (link, content_id) ->
246
- $link = $(link)
247
- $("#contents_#{content_id}_link").val('').change()
248
- $("#contents_#{content_id}_link_title").val('')
249
- $("#contents_#{content_id}_link_class_name").val('')
250
- $("#contents_#{content_id}_link_target").val('')
251
- if $link.hasClass('linked')
252
- Alchemy.setElementDirty $(link).closest('.element-editor')
253
- $link.removeClass('linked').addClass('disabled').attr('tabindex', '-1')
254
- $link.blur()
255
- $('#edit_link_' + content_id).removeClass('linked')
250
+ @removeLink = (link, parent_selector) ->
251
+ parent = document.querySelector(parent_selector)
252
+ link_value_field = parent.querySelector("[data-link-value]")
253
+ link_title_field = parent.querySelector("[data-link-title]")
254
+ link_target_field = parent.querySelector("[data-link-target]")
255
+ link_class_field = parent.querySelector("[data-link-class]")
256
+ link_value_field.value = ""
257
+ link_value_field.dispatchEvent(new Event("change"))
258
+ link_title_field.value = ""
259
+ link_class_field.value = ""
260
+ link_target_field.value = ""
261
+ if link.classList.contains('linked')
262
+ Alchemy.setElementDirty link.closest('.element-editor')
263
+ link.classList.replace('linked', 'disabled')
264
+ link.setAttribute('tabindex', '-1')
265
+ link.blur()
266
+ link.previousElementSibling.classList.remove("linked")
256
267
  false
@@ -0,0 +1,24 @@
1
+ Alchemy.PageSorter = function () {
2
+ var $sortables = $("ul#sitemap").find("ul.level_0_children")
3
+
4
+ $sortables.nestedSortable({
5
+ disableNesting: "no-nest",
6
+ forcePlaceholderSize: true,
7
+ handle: ".handle",
8
+ items: "li",
9
+ listType: "ul",
10
+ opacity: 0.5,
11
+ placeholder: "placeholder",
12
+ tabSize: 16,
13
+ tolerance: "pointer",
14
+ toleranceElement: "> div"
15
+ })
16
+
17
+ $("#save_page_order").click(function (e) {
18
+ e.preventDefault()
19
+ Alchemy.Buttons.disable(this)
20
+ $.post(Alchemy.routes.order_admin_pages_path, {
21
+ set: JSON.stringify($sortables.nestedSortable("toHierarchy"))
22
+ })
23
+ })
24
+ }
@@ -0,0 +1,119 @@
1
+ window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
2
+
3
+ # The admin sitemap Alchemy module
4
+ Alchemy.Sitemap =
5
+
6
+ # Storing some objects.
7
+ init: (options) ->
8
+ @search_field = $(".search_input_field")
9
+ @filter_field_clear = $('.search_field_clear')
10
+ @display = $('#page_filter_result')
11
+ @sitemap_wrapper = $('#sitemap-wrapper p.loading')
12
+ @template = Handlebars.compile($('#sitemap-template').html())
13
+ list_template_regexp = new RegExp '\/' + options.page_root_id, 'g'
14
+ list_template_html = $('#sitemap-list').html().replace(list_template_regexp, '/{{id}}')
15
+ @list_template = Handlebars.compile(list_template_html)
16
+ @items = null
17
+ @options = options
18
+ @watchPagePublicationState()
19
+ true
20
+
21
+ Handlebars.registerPartial('list', list_template_html)
22
+
23
+ @fetch()
24
+
25
+ # Fetches the sitemap from JSON
26
+ fetch: (foldingId) ->
27
+ self = Alchemy.Sitemap
28
+
29
+ if foldingId
30
+ spinner = new Alchemy.Spinner('small')
31
+ spinTarget = $('#fold_button_' + foldingId)
32
+ renderTarget = $('#page_' + foldingId)
33
+ renderTemplate = @list_template
34
+ pageId = foldingId
35
+ else
36
+ spinner = @options.spinner || new Alchemy.Spinner('medium')
37
+ spinTarget = @sitemap_wrapper
38
+ renderTarget = @sitemap_wrapper
39
+ renderTemplate = @template
40
+ pageId = @options.page_root_id
41
+
42
+ spinner.spin(spinTarget[0])
43
+
44
+ request = $.ajax url: @options.url, data:
45
+ id: pageId
46
+ full: @options.full
47
+
48
+ request.done (data) ->
49
+ # This will also remove the spinner
50
+ renderTarget.replaceWith(renderTemplate({children: data.pages}))
51
+ self.items = $(".sitemap_page", '#sitemap')
52
+ self._observe()
53
+
54
+ if self.options.ready
55
+ self.options.ready()
56
+
57
+ request.fail (jqXHR, status) ->
58
+ console.warn("Request failed: " + status)
59
+
60
+ # Filters the sitemap
61
+ filter: (term) ->
62
+ results = []
63
+ self = Alchemy.Sitemap
64
+ self.items.map ->
65
+ item = $(this)
66
+ if term != '' && item.attr('name').toLowerCase().indexOf(term) != -1
67
+ item.addClass('highlight')
68
+ item.removeClass('no-match')
69
+ results.push item
70
+ else
71
+ item.addClass('no-match')
72
+ item.removeClass('highlight')
73
+ self.filter_field_clear.show()
74
+ length = results.length
75
+ if length == 1
76
+ self.display.show().text("1 #{Alchemy.t('page_found')}")
77
+ $.scrollTo(results[0], {duration: 400, offset: -80})
78
+ else if length > 1
79
+ self.display.show().text("#{length} #{Alchemy.t('pages_found')}")
80
+ else
81
+ self.items.removeClass('no-match highlight')
82
+ self.display.hide()
83
+ $.scrollTo('0', 400)
84
+ self.filter_field_clear.hide()
85
+
86
+ # Adds onkey up observer to search field
87
+ _observe: ->
88
+ filter = @filter
89
+ @search_field.on 'keyup', ->
90
+ term = $(this).val()
91
+ filter(term.toLowerCase())
92
+ @search_field.on 'focus', ->
93
+ key.setScope('search')
94
+ @filter_field_clear.click =>
95
+ @search_field.val('')
96
+ filter('')
97
+ false
98
+
99
+ # Handles the page publication date fields
100
+ watchPagePublicationState: ->
101
+ $(document).on 'DialogReady.Alchemy', (e, $dialog) ->
102
+ $public_on_field = $('#page_public_on', $dialog)
103
+ $public_until_field = $('#page_public_until', $dialog)
104
+ $publication_date_fields = $('.page-publication-date-fields', $dialog)
105
+
106
+ $('#page_public', $dialog).click ->
107
+ $checkbox = $(this)
108
+ format = $checkbox.data('date-format')
109
+ now = new Date()
110
+ if $checkbox.is(':checked')
111
+ $publication_date_fields.removeClass('hidden')
112
+ $public_on_field[0]._flatpickr.setDate(now)
113
+ else
114
+ $publication_date_fields.addClass('hidden')
115
+ $public_on_field.val('')
116
+ $public_until_field.val('')
117
+ true
118
+
119
+ return
@@ -1,11 +1,9 @@
1
- $.fn.alchemyPageSelect = function (options) {
1
+ $.fn.alchemyPageSelect = function(options) {
2
2
  var pageTemplate = HandlebarsTemplates.page
3
3
 
4
4
  return this.select2({
5
5
  placeholder: options.placeholder,
6
- allowClear: options.hasOwnProperty("allowClear")
7
- ? options.allowClear
8
- : true,
6
+ allowClear: true,
9
7
  minimumInputLength: 3,
10
8
  initSelection: function (_$el, callback) {
11
9
  if (options.initialSelection) {
@@ -14,16 +12,13 @@ $.fn.alchemyPageSelect = function (options) {
14
12
  },
15
13
  ajax: {
16
14
  url: options.url,
17
- datatype: "json",
15
+ datatype: 'json',
18
16
  quietMillis: 300,
19
17
  data: function (term, page) {
20
18
  return {
21
- q: $.extend(
22
- {
23
- name_cont: term
24
- },
25
- options.query_params
26
- ),
19
+ q: $.extend({
20
+ name_cont: term
21
+ }, options.query_params),
27
22
  page: page
28
23
  }
29
24
  },
@@ -39,8 +34,8 @@ $.fn.alchemyPageSelect = function (options) {
39
34
  formatSelection: function (page) {
40
35
  return page.text || page.name
41
36
  },
42
- formatResult: function (page) {
43
- return pageTemplate({ page: page })
37
+ formatResult: function(page) {
38
+ return pageTemplate({page: page})
44
39
  }
45
40
  })
46
41
  }
@@ -2,4 +2,3 @@
2
2
  //= require alchemy/templates/page
3
3
  //= require alchemy/templates/node_folder
4
4
  //= require alchemy/templates/node
5
- //= require alchemy/templates/page_folder
@@ -1,3 +1,3 @@
1
- <a class="node_folder" data-node-id="{{ node.id }}">
1
+ <a class="node_folder" data-record-id="{{ node.id }}" data-record-type="{{ node.type }}">
2
2
  <i class="far fa-{{#if node.folded }}plus{{else}}minus{{/if}}-square fa-fw"></i>
3
3
  </a>
@@ -1,19 +1,9 @@
1
1
  <div class="page-select--page">
2
- <div class="page-select--top">
3
- <i class="icon far fa-file fa-lg"></i>
4
- <span class="page-select--page-name">
5
- {{ page.name }}
6
- </span>
7
- <span class="page-select--page-urlname">
8
- {{ page.url_path }}
9
- </span>
10
- </div>
11
- <div class="page-select--bottom">
12
- <span class="page-select--site-name">
13
- {{ page.site.name }}
14
- </span>
15
- <span class="page-select--language-code">
16
- {{ page.language.name }}
17
- </span>
18
- </div>
2
+ <i class="icon far fa-file fa-lg"></i>
3
+ <span class="page-select--page-name">
4
+ {{ page.name }}
5
+ </span>
6
+ <span class="page-select--page-urlname">
7
+ {{ page.url_path }}
8
+ </span>
19
9
  </div>
@@ -27,6 +27,7 @@
27
27
  @import "alchemy/frame";
28
28
  @import "alchemy/hints";
29
29
  @import "alchemy/icons";
30
+ @import "alchemy/images";
30
31
  @import "alchemy/image_library";
31
32
  @import "alchemy/labels";
32
33
  @import "alchemy/nodes";
@@ -42,7 +43,6 @@
42
43
  @import "alchemy/spinner";
43
44
  @import "alchemy/tables";
44
45
  @import "alchemy/tags";
45
- @import "alchemy/trash";
46
46
  @import "alchemy/typography";
47
47
  @import "alchemy/lists";
48
48
  @import "alchemy/upload";
@@ -33,10 +33,6 @@ div#image_assign_filter_and_image_sizing {
33
33
  background-color: $thumbnail-background-color;
34
34
  width: 100%;
35
35
  height: 120px;
36
-
37
- &:hover {
38
- text-decoration: none;
39
- }
40
36
  }
41
37
 
42
38
  .picture_thumbnail {
@@ -47,10 +43,9 @@ div#image_assign_filter_and_image_sizing {
47
43
  width: 160px;
48
44
 
49
45
  img {
50
- width: auto;
51
- height: auto;
52
- max-width: 100%;
53
- max-height: 100%;
46
+ width: 100%;
47
+ height: 100%;
48
+ object-fit: contain;
54
49
  }
55
50
 
56
51
  .picture_name {
@@ -145,6 +140,7 @@ div.assign_image_list_image {
145
140
  }
146
141
 
147
142
  &.delete {
143
+ cursor: pointer;
148
144
  right: $default-padding;
149
145
  }
150
146
 
@@ -40,10 +40,6 @@ input.button {
40
40
 
41
41
  &[disabled] {
42
42
  cursor: not-allowed;
43
-
44
- & + label {
45
- display: none;
46
- }
47
43
  }
48
44
  }
49
45