alchemy_cms 5.1.4 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (284) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +7 -14
  3. data/.gitignore +0 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +112 -5
  7. data/Gemfile +5 -2
  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/_variables.scss +2 -0
  23. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  24. data/app/assets/stylesheets/alchemy/archive.scss +4 -4
  25. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  26. data/app/assets/stylesheets/alchemy/elements.scss +111 -66
  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 +6 -2
  31. data/app/controllers/alchemy/admin/base_controller.rb +5 -6
  32. data/app/controllers/alchemy/admin/elements_controller.rb +58 -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 +6 -13
  40. data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
  41. data/app/controllers/alchemy/api/elements_controller.rb +10 -5
  42. data/app/controllers/alchemy/api/pages_controller.rb +3 -4
  43. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  44. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  45. data/app/decorators/alchemy/content_editor.rb +64 -0
  46. data/app/decorators/alchemy/element_editor.rb +24 -1
  47. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  48. data/app/helpers/alchemy/admin/contents_helper.rb +3 -8
  49. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  50. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  51. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  52. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  53. data/app/helpers/alchemy/elements_helper.rb +12 -23
  54. data/app/helpers/alchemy/pages_helper.rb +3 -9
  55. data/app/jobs/alchemy/base_job.rb +11 -0
  56. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  57. data/app/models/alchemy/attachment.rb +4 -0
  58. data/app/models/alchemy/content.rb +5 -3
  59. data/app/models/alchemy/content/factory.rb +23 -27
  60. data/app/models/alchemy/element.rb +72 -67
  61. data/app/models/alchemy/element/definitions.rb +26 -41
  62. data/app/models/alchemy/element/element_contents.rb +131 -122
  63. data/app/models/alchemy/element/element_essences.rb +100 -98
  64. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  65. data/app/models/alchemy/element/presenters.rb +89 -87
  66. data/app/models/alchemy/elements_repository.rb +126 -0
  67. data/app/models/alchemy/essence_audio.rb +12 -0
  68. data/app/models/alchemy/essence_headline.rb +40 -0
  69. data/app/models/alchemy/essence_picture.rb +4 -116
  70. data/app/models/alchemy/essence_richtext.rb +12 -0
  71. data/app/models/alchemy/essence_video.rb +12 -0
  72. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  73. data/app/models/alchemy/ingredient.rb +219 -0
  74. data/app/models/alchemy/ingredient_validator.rb +97 -0
  75. data/app/models/alchemy/ingredients/audio.rb +29 -0
  76. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  77. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  78. data/app/models/alchemy/ingredients/file.rb +30 -0
  79. data/app/models/alchemy/ingredients/headline.rb +42 -0
  80. data/app/models/alchemy/ingredients/html.rb +19 -0
  81. data/app/models/alchemy/ingredients/link.rb +16 -0
  82. data/app/models/alchemy/ingredients/node.rb +23 -0
  83. data/app/models/alchemy/ingredients/page.rb +23 -0
  84. data/app/models/alchemy/ingredients/picture.rb +41 -0
  85. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  86. data/app/models/alchemy/ingredients/select.rb +10 -0
  87. data/app/models/alchemy/ingredients/text.rb +17 -0
  88. data/app/models/alchemy/ingredients/video.rb +33 -0
  89. data/app/models/alchemy/language.rb +0 -11
  90. data/app/models/alchemy/page.rb +66 -32
  91. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  92. data/app/models/alchemy/page/page_elements.rb +187 -199
  93. data/app/models/alchemy/page/page_naming.rb +66 -64
  94. data/app/models/alchemy/page/page_natures.rb +139 -142
  95. data/app/models/alchemy/page/page_scopes.rb +113 -102
  96. data/app/models/alchemy/page/publisher.rb +50 -0
  97. data/app/models/alchemy/page/url_path.rb +1 -1
  98. data/app/models/alchemy/page_version.rb +58 -0
  99. data/app/models/alchemy/picture.rb +3 -1
  100. data/app/models/alchemy/picture/calculations.rb +2 -8
  101. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  102. data/app/models/alchemy/picture/transformations.rb +24 -96
  103. data/app/models/alchemy/picture_variant.rb +1 -1
  104. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  105. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  106. data/app/presenters/alchemy/picture_view.rb +88 -0
  107. data/app/serializers/alchemy/element_serializer.rb +5 -0
  108. data/app/serializers/alchemy/page_tree_serializer.rb +3 -2
  109. data/app/services/alchemy/delete_elements.rb +44 -0
  110. data/app/services/alchemy/duplicate_element.rb +56 -0
  111. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  112. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  113. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  114. data/app/views/alchemy/admin/crop.html.erb +36 -0
  115. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  116. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  117. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  118. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +3 -1
  119. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  120. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  121. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  122. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  123. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  124. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  125. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  126. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  127. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  128. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  129. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  130. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  131. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  132. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  133. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  134. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  135. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  136. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  137. data/app/views/alchemy/admin/pages/_form.html.erb +0 -6
  138. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  139. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  140. data/app/views/alchemy/admin/pages/edit.html.erb +36 -24
  141. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  142. data/app/views/alchemy/admin/partials/_routes.html.erb +7 -11
  143. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  144. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  145. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  146. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  147. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  148. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  149. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  150. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  151. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  152. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  153. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  154. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  155. data/app/views/alchemy/essences/_essence_picture_view.html.erb +3 -3
  156. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  157. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  158. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  159. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  160. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  161. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  162. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  163. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  164. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  165. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  166. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  167. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  168. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  169. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  170. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  171. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  172. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  173. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  174. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  175. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  176. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  177. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  178. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  179. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  180. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  181. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  182. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  183. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  184. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  185. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  186. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  187. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  188. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  189. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  190. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  191. data/config/brakeman.ignore +212 -17
  192. data/config/initializers/dragonfly.rb +10 -0
  193. data/config/locales/alchemy.en.yml +63 -39
  194. data/config/routes.rb +17 -22
  195. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  196. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  197. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  198. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  199. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  200. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  201. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  202. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  203. data/lib/alchemy/admin/preview_url.rb +2 -0
  204. data/lib/alchemy/deprecation.rb +1 -1
  205. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  206. data/lib/alchemy/dragonfly/processors/crop_resize.rb +35 -0
  207. data/lib/alchemy/element_definition.rb +70 -0
  208. data/lib/alchemy/elements_finder.rb +14 -56
  209. data/lib/alchemy/essence.rb +5 -6
  210. data/lib/alchemy/filetypes.rb +13 -0
  211. data/lib/alchemy/forms/builder.rb +1 -1
  212. data/lib/alchemy/hints.rb +8 -4
  213. data/lib/alchemy/i18n.rb +4 -5
  214. data/lib/alchemy/page_layout.rb +0 -12
  215. data/lib/alchemy/permissions.rb +30 -29
  216. data/lib/alchemy/resource.rb +13 -3
  217. data/lib/alchemy/tasks/tidy.rb +29 -0
  218. data/lib/alchemy/test_support.rb +9 -0
  219. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -4
  220. data/lib/alchemy/test_support/factories/attachment_factory.rb +0 -2
  221. data/lib/alchemy/test_support/factories/content_factory.rb +0 -6
  222. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +0 -2
  223. data/lib/alchemy/test_support/factories/element_factory.rb +8 -11
  224. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  225. data/lib/alchemy/test_support/factories/essence_file_factory.rb +0 -3
  226. data/lib/alchemy/test_support/factories/essence_page_factory.rb +0 -3
  227. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +0 -4
  228. data/lib/alchemy/test_support/factories/essence_text_factory.rb +0 -2
  229. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  230. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  231. data/lib/alchemy/test_support/factories/language_factory.rb +0 -3
  232. data/lib/alchemy/test_support/factories/node_factory.rb +0 -4
  233. data/lib/alchemy/test_support/factories/page_factory.rb +20 -4
  234. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  235. data/lib/alchemy/test_support/factories/picture_factory.rb +0 -2
  236. data/lib/alchemy/test_support/factories/picture_thumb_factory.rb +0 -3
  237. data/lib/alchemy/test_support/factories/site_factory.rb +0 -2
  238. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  239. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  240. data/lib/alchemy/test_support/integration_helpers.rb +5 -5
  241. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  242. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  243. data/lib/alchemy/tinymce.rb +17 -0
  244. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  245. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  246. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  247. data/lib/alchemy/version.rb +1 -1
  248. data/lib/alchemy_cms.rb +1 -0
  249. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  250. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  251. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  252. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  253. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  254. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  255. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  256. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  257. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  258. data/lib/tasks/alchemy/thumbnails.rake +2 -0
  259. data/lib/tasks/alchemy/tidy.rake +12 -0
  260. data/lib/tasks/alchemy/upgrade.rake +26 -0
  261. data/package.json +2 -1
  262. data/package/admin.js +11 -1
  263. data/package/src/__tests__/i18n.spec.js +23 -0
  264. data/package/src/file_editors.js +28 -0
  265. data/package/src/i18n.js +1 -3
  266. data/package/src/image_cropper.js +103 -0
  267. data/package/src/image_loader.js +58 -0
  268. data/package/src/node_tree.js +5 -5
  269. data/package/src/picture_editors.js +169 -0
  270. data/package/src/utils/__tests__/ajax.spec.js +20 -12
  271. data/package/src/utils/ajax.js +8 -3
  272. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  273. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  274. metadata +290 -52
  275. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  276. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  277. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  278. data/app/controllers/alchemy/admin/trash_controller.rb +0 -42
  279. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  280. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  281. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  282. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  283. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  284. data/lib/alchemy/test_support/factories.rb +0 -5
@@ -31,7 +31,6 @@
31
31
  //= require alchemy/alchemy.growler
32
32
  //= require alchemy/alchemy.gui
33
33
  //= require alchemy/alchemy.hotkeys
34
- //= require alchemy/alchemy.image_cropper
35
34
  //= require alchemy/alchemy.image_overlay
36
35
  //= require alchemy/alchemy.string_extension
37
36
  //= require alchemy/alchemy.link_dialog
@@ -44,6 +43,5 @@
44
43
  //= require alchemy/alchemy.spinner
45
44
  //= require alchemy/alchemy.tinymce
46
45
  //= require alchemy/alchemy.tooltips
47
- //= require alchemy/alchemy.trash_window
48
46
  //= require alchemy/page_select
49
47
  //= require alchemy/node_select
@@ -42,33 +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', ->
58
- spinner.stop()
59
- $parent.html('<span class="icon warn"/>')
60
-
61
- # Removes the picture from essence picture thumbnail
62
- removePicture: (selector) ->
63
- $form_field = $(selector)
64
- $element = $form_field.closest(".element-editor")
65
- $content = $form_field.closest(".content_editor")
66
- if $form_field[0]
67
- $form_field.val ""
68
- $content.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
69
- Alchemy.setElementDirty $element
70
- false
71
-
72
45
  # Initializes all select tag with .alchemy_selectbox class as select2 instance
73
46
  # Pass a jQuery scope to only init a subset of selectboxes.
74
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
@@ -251,7 +251,7 @@ window.Alchemy.openDialog = (url, options) ->
251
251
  # See Alchemy.Dialog for further options you can add to the data attribute
252
252
  #
253
253
  window.Alchemy.watchForDialogs = (scope = '#alchemy') ->
254
- $(scope).on 'click', '[data-alchemy-dialog]', (event) ->
254
+ $(scope).on 'click', '[data-alchemy-dialog]:not(.disabled)', (event) ->
255
255
  $this = $(this)
256
256
  url = $this.attr('href')
257
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 =
@@ -136,7 +142,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
136
142
  if @link_object.editor
137
143
  @setTinyMCELink(url, title, target)
138
144
  else
139
- @setEssenceLink(url, title, target)
145
+ @setLinkFields(url, title, target)
140
146
 
141
147
  # Sets a link in TinyMCE editor.
142
148
  setTinyMCELink: (url, title, target) ->
@@ -151,14 +157,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
151
157
  true
152
158
 
153
159
  # Sets a link on an Essence (e.g. EssencePicture).
154
- setEssenceLink: (url, title, target) ->
155
- content_id = @$link_object.data('content-id')
156
- $("#contents_#{content_id}_link").val(url).change()
157
- $("#contents_#{content_id}_link_title").val(title)
158
- $("#contents_#{content_id}_link_class_name").val(@link_type)
159
- $("#contents_#{content_id}_link_target").val(target)
160
- @$link_object.addClass('linked')
161
- @$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
162
170
 
163
171
  # Selects the correct tab for link type and fills all fields.
164
172
  selectTab: ->
@@ -205,12 +213,11 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
205
213
  # Creates a temporay $('a') object that holds all values on it.
206
214
  createTempLink: ->
207
215
  @$tmp_link = $('<a/>')
208
- content_id = @$link_object.data('content-id')
209
- @$tmp_link.attr 'href', $("#contents_#{content_id}_link").val()
210
- @$tmp_link.attr 'title', $("#contents_#{content_id}_link_title").val()
211
- @$tmp_link.attr 'data-link-target', $("#contents_#{content_id}_link_target").val()
212
- @$tmp_link.attr 'target', if $("#contents_#{content_id}_link_target").val() == 'blank' then '_blank' else null
213
- @$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)
214
221
  @$tmp_link
215
222
 
216
223
  # Validates url for beginning with an protocol.
@@ -228,7 +235,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
228
235
  # Populates the internal anchors select
229
236
  initAnchorLinks: ->
230
237
  frame = document.getElementById('alchemy_preview_window')
231
- elements = frame.contentDocument.getElementsByTagName('*')
238
+ elements = frame.contentDocument?.getElementsByTagName('*') || []
232
239
  if elements.length > 0
233
240
  for element in elements
234
241
  if element.id
@@ -240,15 +247,21 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
240
247
  # Public class methods
241
248
 
242
249
  # Removes link from Essence.
243
- @removeLink = (link, content_id) ->
244
- $link = $(link)
245
- $("#contents_#{content_id}_link").val('').change()
246
- $("#contents_#{content_id}_link_title").val('')
247
- $("#contents_#{content_id}_link_class_name").val('')
248
- $("#contents_#{content_id}_link_target").val('')
249
- if $link.hasClass('linked')
250
- Alchemy.setElementDirty $(link).closest('.element-editor')
251
- $link.removeClass('linked').addClass('disabled').attr('tabindex', '-1')
252
- $link.blur()
253
- $('#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")
254
267
  false
@@ -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>
@@ -145,6 +145,8 @@ $elements-window-min-width: 400px !default;
145
145
  $element-header-bg-color: $medium-gray !default;
146
146
  $element-header-active-bg-color: $dark-blue !default;
147
147
  $element-header-active-color: $white !default;
148
+ $element-header-deprecated-bg-color: rgba(253, 213, 175, 0.25) !default;
149
+ $element-deprecated-border-color: rgb(253, 213, 175) !default;
148
150
  $top-menu-height: 75px !default;
149
151
 
150
152
  $tabs-height: 31px !default;
@@ -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";
@@ -43,10 +43,9 @@ div#image_assign_filter_and_image_sizing {
43
43
  width: 160px;
44
44
 
45
45
  img {
46
- width: auto;
47
- height: auto;
48
- max-width: 100%;
49
- max-height: 100%;
46
+ width: 100%;
47
+ height: 100%;
48
+ object-fit: contain;
50
49
  }
51
50
 
52
51
  .picture_name {
@@ -141,6 +140,7 @@ div.assign_image_list_image {
141
140
  }
142
141
 
143
142
  &.delete {
143
+ cursor: pointer;
144
144
  right: $default-padding;
145
145
  }
146
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
 
@@ -45,13 +45,13 @@
45
45
  }
46
46
 
47
47
  > .message {
48
- margin: 2*$default-margin
48
+ margin: 2 * $default-margin;
49
49
  }
50
50
  }
51
51
 
52
52
  #main-content-elements,
53
53
  .element-editor.is-fixed .nestable-elements {
54
- padding: 2*$default-padding $default-padding 2px;
54
+ padding: 2 * $default-padding $default-padding 2px;
55
55
  }
56
56
 
57
57
  .element-title {
@@ -124,7 +124,7 @@
124
124
  border: 1px solid $default-border-color;
125
125
  border-radius: $default-border-radius;
126
126
  background-color: $light-gray;
127
- margin-bottom: 2*$default-margin;
127
+ margin-bottom: 2 * $default-margin;
128
128
  transition: box-shadow $transition-duration;
129
129
 
130
130
  &.hidden {
@@ -165,18 +165,38 @@
165
165
  &.dirty {
166
166
  border-color: #d0c83d;
167
167
 
168
- >.element-header {
168
+ > .element-header {
169
169
  background-color: #fff8df;
170
170
  }
171
171
  }
172
172
 
173
- &.selected:not(.is-fixed), &:hover {
173
+ &.deprecated {
174
+ border-color: $element-deprecated-border-color;
175
+
176
+ > .element-header {
177
+ background-color: $element-header-deprecated-bg-color;
178
+ background-image: linear-gradient(
179
+ 45deg,
180
+ $element-header-deprecated-bg-color 25%,
181
+ $element-header-bg-color 25%,
182
+ $element-header-bg-color 50%,
183
+ $element-header-deprecated-bg-color 50%,
184
+ $element-header-deprecated-bg-color 75%,
185
+ $element-header-bg-color 75%,
186
+ $element-header-bg-color 100%
187
+ );
188
+ background-size: 28.28px 28.28px;
189
+ }
190
+ }
191
+
192
+ &.selected:not(.is-fixed),
193
+ &:hover {
174
194
  &:not(.hidden) {
175
195
  box-shadow: 0 2px 8px rgba(#9b9b9b, 0.75);
176
196
  }
177
197
  }
178
198
 
179
- &.selected:not(.is-fixed):not(.folded):not(.dirty):not(.hidden) {
199
+ &.selected:not(.is-fixed):not(.folded):not(.dirty):not(.hidden):not(.deprecated) {
180
200
  > .element-header {
181
201
  background-color: $element-header-active-bg-color;
182
202
  color: $element-header-active-color;
@@ -184,7 +204,6 @@
184
204
  }
185
205
 
186
206
  &.folded {
187
-
188
207
  .nested-elements {
189
208
  display: none;
190
209
  }
@@ -229,7 +248,7 @@
229
248
  transition: all $transition-duration;
230
249
  }
231
250
 
232
- .element-header:hover+.element-toolbar,
251
+ .element-header:hover + .element-toolbar,
233
252
  .element-toolbar:hover {
234
253
  visibility: visible;
235
254
  opacity: 1;
@@ -261,6 +280,7 @@
261
280
  }
262
281
 
263
282
  .content_editor,
283
+ .ingredient-editor,
264
284
  .picture_thumbnail {
265
285
  width: 100%;
266
286
  }
@@ -284,7 +304,7 @@
284
304
  }
285
305
 
286
306
  .element-content {
287
- margin: 2*$default-padding;
307
+ margin: 2 * $default-padding;
288
308
  }
289
309
 
290
310
  .validation_notice {
@@ -296,7 +316,7 @@
296
316
  }
297
317
 
298
318
  .message {
299
- margin: 2*$default-margin;
319
+ margin: 2 * $default-margin;
300
320
  }
301
321
 
302
322
  .foot_note {
@@ -324,7 +344,7 @@
324
344
  hr {
325
345
  height: 0;
326
346
  width: 100%;
327
- margin: 0 0 4*$default-margin 0;
347
+ margin: 0 0 4 * $default-margin 0;
328
348
  border: 0 none;
329
349
  border-top: 1px solid $medium-gray;
330
350
  opacity: 1;
@@ -333,7 +353,7 @@
333
353
 
334
354
  .element-header {
335
355
  position: relative;
336
- padding: 2*$default-padding;
356
+ padding: 2 * $default-padding;
337
357
  background-color: $element-header-bg-color;
338
358
  @extend .disable-user-select;
339
359
  cursor: pointer;
@@ -350,7 +370,7 @@
350
370
  transition: color $transition-duration;
351
371
  }
352
372
 
353
- >.hint-with-icon {
373
+ > .hint-with-icon {
354
374
  position: absolute;
355
375
  right: 32px;
356
376
  top: 10px;
@@ -386,7 +406,7 @@
386
406
 
387
407
  .element-footer {
388
408
  border-top: 1px solid $medium-gray;
389
- padding: 2*$default-padding;
409
+ padding: 2 * $default-padding;
390
410
  text-align: right;
391
411
 
392
412
  .button {
@@ -394,7 +414,8 @@
394
414
  }
395
415
  }
396
416
 
397
- .element-content-editors {
417
+ .element-content-editors,
418
+ .element-ingredient-editors {
398
419
  display: flex;
399
420
  flex-wrap: wrap;
400
421
  }
@@ -418,7 +439,8 @@
418
439
  right: 0;
419
440
 
420
441
  .icon_button {
421
- @include button-defaults($background-color: $medium-gray,
442
+ @include button-defaults(
443
+ $background-color: $medium-gray,
422
444
  $hover-color: darken($medium-gray, 5%),
423
445
  $border: 1px solid #c0c0c0,
424
446
  $box-shadow: none,
@@ -428,7 +450,8 @@
428
450
  $margin: 0,
429
451
  $border-radius: 0,
430
452
  $focus-border-color: $focus-color,
431
- $focus-box-shadow: 0 0 0 2px $focus-color);
453
+ $focus-box-shadow: 0 0 0 2px $focus-color
454
+ );
432
455
  width: 29px;
433
456
  height: $form-field-height;
434
457
 
@@ -438,9 +461,11 @@
438
461
  }
439
462
 
440
463
  &.linked.link-essence {
441
- @include linked-button($border-radius: 0,
464
+ @include linked-button(
465
+ $border-radius: 0,
442
466
  $line-height: 30px,
443
- $padding: 0);
467
+ $padding: 0
468
+ );
444
469
 
445
470
  &:focus {
446
471
  border-radius: 0;
@@ -448,9 +473,11 @@
448
473
  }
449
474
 
450
475
  &.linked.unlink-essence {
451
- @include linked-button($border-radius: 0 $default-border-radius $default-border-radius 0,
476
+ @include linked-button(
477
+ $border-radius: 0 $default-border-radius $default-border-radius 0,
452
478
  $line-height: 30px,
453
- $padding: 0);
479
+ $padding: 0
480
+ );
454
481
 
455
482
  &:focus {
456
483
  border-radius: 0 $default-border-radius $default-border-radius 0;
@@ -468,7 +495,7 @@
468
495
  height: 36px;
469
496
  border: 1px dotted $button-border-color;
470
497
  background-color: $medium-gray;
471
- margin-bottom: 2*$default-margin;
498
+ margin-bottom: 2 * $default-margin;
472
499
  border-radius: $default-border-radius;
473
500
  }
474
501
 
@@ -499,21 +526,10 @@
499
526
  }
500
527
  }
501
528
 
502
- .essence_picture {
529
+ .essence_picture,
530
+ .ingredient-editor.picture {
503
531
  position: relative;
504
532
 
505
- .picture_tool_delete {
506
- position: absolute;
507
- right: $default-margin;
508
- top: $default-margin;
509
- padding: 2px 2px 0;
510
- z-index: 2;
511
- }
512
-
513
- .picture_thumbnail:hover .picture_tool_delete {
514
- display: block;
515
- }
516
-
517
533
  .picture_thumbnail {
518
534
  display: inline-block;
519
535
  width: 160px;
@@ -522,7 +538,7 @@
522
538
  }
523
539
 
524
540
  &.validation_failed .picture_thumbnail {
525
- border-color: $error_border_color
541
+ border-color: $error_border_color;
526
542
  }
527
543
 
528
544
  .thumbnail_background .icon {
@@ -546,9 +562,15 @@
546
562
  }
547
563
  }
548
564
 
549
- .content_editor.essence_file {
550
-
565
+ .content_editor.essence_audio,
566
+ .content_editor.essence_file,
567
+ .content_editor.essence_video,
568
+ .ingredient-editor.audio,
569
+ .ingredient-editor.file,
570
+ .ingredient-editor.video {
551
571
  .file {
572
+ display: flex;
573
+ align-items: center;
552
574
  margin: 6px 0 $default-margin;
553
575
  border: $default-border;
554
576
  background-color: $white;
@@ -562,35 +584,39 @@
562
584
  }
563
585
 
564
586
  .file_icon {
565
- display: inline-block;
566
587
  text-align: center;
567
- float: left;
568
588
  width: 24px;
569
- padding: 6px 4px;
589
+ padding: $default-padding;
570
590
  }
571
591
 
572
592
  .file_name {
573
593
  white-space: nowrap;
574
594
  overflow: hidden;
575
- float: left;
576
595
  max-width: 80%;
577
- line-height: 28px;
578
596
  font-size: $small-font-size;
579
597
  text-overflow: ellipsis;
598
+ padding: $default-padding;
599
+ }
600
+
601
+ .remove_file_link {
602
+ width: 24px;
603
+ padding: $default-padding;
580
604
  }
581
605
  }
582
606
 
607
+ .file_tools,
583
608
  .essence_file_tools {
584
- height: 27px;
585
- float: right;
609
+ display: flex;
610
+ align-items: center;
611
+ margin-left: auto;
586
612
  background-color: white;
587
613
  width: 48px;
588
614
  border-radius: 0 $default-border-radius $default-border-radius 0;
589
615
 
590
616
  a {
617
+ text-align: center;
591
618
  text-decoration: none;
592
- padding: 6px $default-margin;
593
- float: left;
619
+ padding: $default-padding;
594
620
  }
595
621
  }
596
622
 
@@ -614,7 +640,8 @@ select.long {
614
640
  padding: 0;
615
641
  }
616
642
 
617
- .content_editor {
643
+ .content_editor,
644
+ .ingredient-editor {
618
645
  width: 100%;
619
646
  padding: $default-padding 0;
620
647
  position: relative;
@@ -625,7 +652,6 @@ select.long {
625
652
  }
626
653
 
627
654
  &.missing {
628
-
629
655
  .message {
630
656
  margin: 0;
631
657
  @include clearfix;
@@ -656,13 +682,12 @@ select.long {
656
682
  }
657
683
 
658
684
  &.validation_failed {
659
-
660
- label {
661
- color: $error_text_color
685
+ > label {
686
+ color: $error_text_color;
662
687
  }
663
688
 
664
689
  input {
665
- @extend %field-with-error
690
+ @extend %field-with-error;
666
691
  }
667
692
 
668
693
  .tinymce_container {
@@ -670,6 +695,24 @@ select.long {
670
695
  }
671
696
  }
672
697
 
698
+ &.deprecated {
699
+ border-radius: $default-border-radius;
700
+ background-color: $element-header-deprecated-bg-color;
701
+ background-image: linear-gradient(
702
+ 45deg,
703
+ $element-header-deprecated-bg-color 25%,
704
+ $element-header-bg-color 25%,
705
+ $element-header-bg-color 50%,
706
+ $element-header-deprecated-bg-color 50%,
707
+ $element-header-deprecated-bg-color 75%,
708
+ $element-header-bg-color 75%,
709
+ $element-header-bg-color 100%
710
+ );
711
+ background-size: 28.28px 28.28px;
712
+ padding-left: 2px;
713
+ padding-right: 2px;
714
+ }
715
+
673
716
  label {
674
717
  display: block;
675
718
  margin: $default-margin 0;
@@ -690,10 +733,10 @@ select.long {
690
733
  }
691
734
  }
692
735
 
693
- &.essence_select {
694
-
736
+ &.essence_select,
737
+ &.select {
695
738
  label {
696
- margin-bottom: 2*$default-margin
739
+ margin-bottom: 2 * $default-margin;
697
740
  }
698
741
 
699
742
  .select2-container {
@@ -705,6 +748,7 @@ select.long {
705
748
  }
706
749
  }
707
750
 
751
+ select.ingredient-editor-select,
708
752
  select.essence_editor_select {
709
753
  border-radius: $default-border-radius;
710
754
  background: white;
@@ -732,12 +776,14 @@ select.long {
732
776
  }
733
777
  }
734
778
 
735
- &.essence_picture {
779
+ &.essence_picture,
780
+ &.picture {
736
781
  width: 50%;
737
782
  padding-left: 1px; // Compensate the box shadow
738
783
  padding-right: $default-padding;
739
784
 
740
- +.essence_picture {
785
+ + .essence_picture,
786
+ + .picture {
741
787
  padding-left: $default-padding;
742
788
  padding-right: 1px; // Compensate the box shadow
743
789
  }
@@ -775,7 +821,7 @@ textarea.has_tinymce {
775
821
  margin-top: 8px;
776
822
  margin-bottom: 8px;
777
823
  background-color: $error_background_color;
778
- padding: 2*$default-padding;
824
+ padding: 2 * $default-padding;
779
825
  list-style-type: none;
780
826
  border-radius: $default-border-radius;
781
827
  color: $error_text_color;
@@ -789,10 +835,12 @@ textarea.has_tinymce {
789
835
 
790
836
  .content_editor .hint-with-icon,
791
837
  .content_editor .with-hint,
838
+ .ingredient-editor .hint-with-icon,
839
+ .ingredient-editor .with-hint,
792
840
  .element-handle .hint-with-icon {
793
841
  margin: 0;
794
842
 
795
- >.hint-bubble {
843
+ > .hint-bubble {
796
844
  left: -7px;
797
845
  transform: none;
798
846
 
@@ -802,19 +850,15 @@ textarea.has_tinymce {
802
850
  }
803
851
  }
804
852
 
805
- .element-handle .hint-with-icon {
806
- top: -1px;
807
- }
808
-
809
853
  .is-fixed {
810
854
  &.with-contents {
811
- >.element-footer {
855
+ > .element-footer {
812
856
  border-top: 0;
813
857
  border-bottom: 1px solid $medium-gray;
814
858
  }
815
859
  }
816
860
 
817
- >.nestable-elements .add-nestable-element-button {
861
+ > .nestable-elements .add-nestable-element-button {
818
862
  width: 100%;
819
863
  text-align: center;
820
864
  }
@@ -852,6 +896,7 @@ textarea.has_tinymce {
852
896
  }
853
897
  }
854
898
 
899
+ .ingredient-date--label,
855
900
  .essence_date--label {
856
901
  position: absolute;
857
902
  right: 7px;