alchemy_cms 4.6.2 → 5.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (378) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +33 -1
  3. data/.github/workflows/stale.yml +1 -1
  4. data/.gitignore +20 -2
  5. data/.hound.yml +2 -1
  6. data/.prettierrc +6 -0
  7. data/.rubocop.yml +31 -10
  8. data/CHANGELOG.md +89 -3
  9. data/Gemfile +24 -22
  10. data/README.md +31 -19
  11. data/Rakefile +10 -8
  12. data/alchemy_cms.gemspec +5 -4
  13. data/app/assets/javascripts/alchemy/admin.js +1 -5
  14. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +2 -1
  15. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +0 -2
  16. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +17 -17
  17. data/app/assets/javascripts/alchemy/node_select.js +39 -0
  18. data/app/assets/javascripts/alchemy/templates/index.js +1 -0
  19. data/app/assets/javascripts/alchemy/templates/node.hbs +16 -0
  20. data/app/assets/stylesheets/alchemy/admin.scss +3 -2
  21. data/app/assets/stylesheets/alchemy/base.scss +0 -1
  22. data/app/assets/stylesheets/alchemy/elements.scss +1 -1
  23. data/app/assets/stylesheets/alchemy/forms.scss +5 -0
  24. data/app/assets/stylesheets/alchemy/node-select.scss +43 -0
  25. data/app/assets/stylesheets/alchemy/nodes.scss +1 -1
  26. data/app/assets/stylesheets/alchemy/sitemap.scss +5 -1
  27. data/app/assets/stylesheets/alchemy/tables.scss +1 -24
  28. data/app/controllers/alchemy/admin/attachments_controller.rb +8 -7
  29. data/app/controllers/alchemy/admin/base_controller.rb +13 -33
  30. data/app/controllers/alchemy/admin/clipboard_controller.rb +5 -4
  31. data/app/controllers/alchemy/admin/contents_controller.rb +1 -2
  32. data/app/controllers/alchemy/admin/dashboard_controller.rb +10 -9
  33. data/app/controllers/alchemy/admin/elements_controller.rb +20 -20
  34. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +12 -14
  35. data/app/controllers/alchemy/admin/languages_controller.rb +35 -2
  36. data/app/controllers/alchemy/admin/layoutpages_controller.rb +5 -2
  37. data/app/controllers/alchemy/admin/nodes_controller.rb +5 -4
  38. data/app/controllers/alchemy/admin/pages_controller.rb +50 -62
  39. data/app/controllers/alchemy/admin/pictures_controller.rb +16 -16
  40. data/app/controllers/alchemy/admin/resources_controller.rb +21 -13
  41. data/app/controllers/alchemy/admin/sites_controller.rb +18 -0
  42. data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
  43. data/app/controllers/alchemy/admin/tags_controller.rb +5 -3
  44. data/app/controllers/alchemy/admin/trash_controller.rb +6 -6
  45. data/app/controllers/alchemy/api/base_controller.rb +2 -2
  46. data/app/controllers/alchemy/api/contents_controller.rb +4 -4
  47. data/app/controllers/alchemy/api/elements_controller.rb +8 -8
  48. data/app/controllers/alchemy/api/nodes_controller.rb +37 -1
  49. data/app/controllers/alchemy/api/pages_controller.rb +14 -23
  50. data/app/controllers/alchemy/attachments_controller.rb +5 -5
  51. data/app/controllers/alchemy/base_controller.rb +10 -9
  52. data/app/controllers/alchemy/messages_controller.rb +16 -23
  53. data/app/controllers/alchemy/pages_controller.rb +13 -11
  54. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +3 -2
  55. data/app/controllers/concerns/alchemy/admin/current_language.rb +23 -0
  56. data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -5
  57. data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +4 -4
  58. data/app/controllers/concerns/alchemy/page_redirects.rb +2 -9
  59. data/app/controllers/concerns/alchemy/site_redirects.rb +2 -2
  60. data/app/decorators/alchemy/element_editor.rb +39 -0
  61. data/app/helpers/alchemy/admin/attachments_helper.rb +6 -6
  62. data/app/helpers/alchemy/admin/base_helper.rb +36 -35
  63. data/app/helpers/alchemy/admin/contents_helper.rb +3 -3
  64. data/app/helpers/alchemy/admin/elements_helper.rb +3 -88
  65. data/app/helpers/alchemy/admin/essences_helper.rb +8 -117
  66. data/app/helpers/alchemy/admin/form_helper.rb +1 -1
  67. data/app/helpers/alchemy/admin/navigation_helper.rb +24 -23
  68. data/app/helpers/alchemy/admin/pages_helper.rb +4 -4
  69. data/app/helpers/alchemy/admin/pictures_helper.rb +3 -3
  70. data/app/helpers/alchemy/admin/tags_helper.rb +8 -7
  71. data/app/helpers/alchemy/base_helper.rb +13 -8
  72. data/app/helpers/alchemy/elements_block_helper.rb +2 -31
  73. data/app/helpers/alchemy/elements_helper.rb +12 -58
  74. data/app/helpers/alchemy/pages_helper.rb +24 -174
  75. data/app/helpers/alchemy/url_helper.rb +2 -1
  76. data/app/mailers/alchemy/base_mailer.rb +1 -1
  77. data/app/mailers/alchemy/messages_mailer.rb +1 -1
  78. data/app/models/alchemy/attachment.rb +20 -18
  79. data/app/models/alchemy/base_record.rb +2 -5
  80. data/app/models/alchemy/content.rb +33 -38
  81. data/app/models/alchemy/content/factory.rb +24 -31
  82. data/app/models/alchemy/element.rb +45 -53
  83. data/app/models/alchemy/element/definitions.rb +4 -4
  84. data/app/models/alchemy/element/element_contents.rb +9 -6
  85. data/app/models/alchemy/element/element_essences.rb +4 -3
  86. data/app/models/alchemy/element/presenters.rb +3 -2
  87. data/app/models/alchemy/element_to_page.rb +1 -1
  88. data/app/models/alchemy/essence_boolean.rb +1 -3
  89. data/app/models/alchemy/essence_date.rb +2 -3
  90. data/app/models/alchemy/essence_file.rb +4 -4
  91. data/app/models/alchemy/essence_html.rb +1 -3
  92. data/app/models/alchemy/essence_link.rb +1 -3
  93. data/app/models/alchemy/essence_node.rb +18 -0
  94. data/app/models/alchemy/essence_page.rb +3 -16
  95. data/app/models/alchemy/essence_picture.rb +17 -16
  96. data/app/models/alchemy/essence_picture_view.rb +7 -6
  97. data/app/models/alchemy/essence_richtext.rb +1 -3
  98. data/app/models/alchemy/essence_select.rb +1 -3
  99. data/app/models/alchemy/essence_text.rb +0 -2
  100. data/app/models/alchemy/folded_page.rb +1 -0
  101. data/app/models/alchemy/language.rb +21 -35
  102. data/app/models/alchemy/language/code.rb +4 -4
  103. data/app/models/alchemy/legacy_page_url.rb +1 -1
  104. data/app/models/alchemy/message.rb +3 -3
  105. data/app/models/alchemy/node.rb +27 -4
  106. data/app/models/alchemy/page.rb +46 -127
  107. data/app/models/alchemy/page/fixed_attributes.rb +3 -2
  108. data/app/models/alchemy/page/page_elements.rb +35 -44
  109. data/app/models/alchemy/page/page_naming.rb +20 -70
  110. data/app/models/alchemy/page/page_natures.rb +7 -34
  111. data/app/models/alchemy/page/page_scopes.rb +23 -29
  112. data/app/models/alchemy/page/url_path.rb +0 -2
  113. data/app/models/alchemy/picture.rb +18 -27
  114. data/app/models/alchemy/picture/transformations.rb +9 -7
  115. data/app/models/alchemy/picture/url.rb +5 -5
  116. data/app/models/alchemy/site.rb +6 -36
  117. data/app/models/alchemy/site/layout.rb +2 -2
  118. data/app/models/concerns/alchemy/touch_elements.rb +24 -0
  119. data/app/serializers/alchemy/content_serializer.rb +0 -3
  120. data/app/serializers/alchemy/essence_boolean_serializer.rb +3 -3
  121. data/app/serializers/alchemy/essence_date_serializer.rb +3 -3
  122. data/app/serializers/alchemy/essence_file_serializer.rb +4 -2
  123. data/app/serializers/alchemy/essence_html_serializer.rb +3 -3
  124. data/app/serializers/alchemy/essence_link_serializer.rb +3 -3
  125. data/app/serializers/alchemy/essence_picture_serializer.rb +5 -4
  126. data/app/serializers/alchemy/essence_richtext_serializer.rb +3 -3
  127. data/app/serializers/alchemy/essence_select_serializer.rb +3 -3
  128. data/app/serializers/alchemy/essence_text_serializer.rb +5 -4
  129. data/app/serializers/alchemy/node_serializer.rb +2 -0
  130. data/app/serializers/alchemy/page_tree_serializer.rb +9 -13
  131. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  132. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +1 -2
  133. data/app/views/alchemy/admin/attachments/_files_list.html.erb +4 -4
  134. data/app/views/alchemy/admin/contents/create.js.erb +1 -3
  135. data/app/views/alchemy/admin/elements/_element.html.erb +9 -18
  136. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  137. data/app/views/alchemy/admin/elements/fold.js.erb +1 -1
  138. data/app/views/alchemy/admin/elements/index.html.erb +3 -3
  139. data/app/views/alchemy/admin/essence_files/assign.js.erb +1 -6
  140. data/app/views/alchemy/admin/essence_files/edit.html.erb +1 -1
  141. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +1 -7
  142. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -1
  143. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +7 -7
  144. data/app/views/alchemy/admin/essence_pictures/update.js.erb +1 -1
  145. data/app/views/alchemy/admin/languages/_form.html.erb +5 -5
  146. data/app/views/alchemy/admin/languages/_table.html.erb +3 -3
  147. data/app/views/alchemy/admin/languages/edit.html.erb +1 -0
  148. data/app/views/alchemy/admin/languages/index.html.erb +23 -4
  149. data/app/views/alchemy/admin/languages/new.html.erb +1 -0
  150. data/app/views/alchemy/admin/layoutpages/index.html.erb +3 -3
  151. data/app/views/alchemy/admin/nodes/_form.html.erb +18 -15
  152. data/app/views/alchemy/admin/nodes/_node.html.erb +1 -5
  153. data/app/views/alchemy/admin/nodes/index.html.erb +3 -4
  154. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +0 -8
  155. data/app/views/alchemy/admin/pages/_form.html.erb +0 -1
  156. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -0
  157. data/app/views/alchemy/admin/pages/_page.html.erb +11 -19
  158. data/app/views/alchemy/admin/pages/_page_infos.html.erb +0 -4
  159. data/app/views/alchemy/admin/pages/edit.html.erb +1 -1
  160. data/app/views/alchemy/admin/pages/info.html.erb +0 -9
  161. data/app/views/alchemy/admin/pages/unlock.js.erb +13 -6
  162. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +0 -2
  163. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -5
  164. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +1 -1
  165. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -2
  166. data/app/views/alchemy/admin/resources/_resource.html.erb +1 -1
  167. data/app/views/alchemy/admin/resources/_table.html.erb +2 -2
  168. data/app/views/alchemy/admin/sites/_form.html.erb +8 -0
  169. data/app/views/alchemy/admin/sites/edit.html.erb +1 -0
  170. data/app/views/alchemy/admin/sites/index.html.erb +21 -9
  171. data/app/views/alchemy/admin/sites/new.html.erb +1 -0
  172. data/app/views/alchemy/admin/tags/index.html.erb +2 -2
  173. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +10 -12
  174. data/app/views/alchemy/essences/_essence_date_editor.html.erb +11 -8
  175. data/app/views/alchemy/essences/_essence_file_editor.html.erb +16 -17
  176. data/app/views/alchemy/essences/_essence_html_editor.html.erb +8 -5
  177. data/app/views/alchemy/essences/_essence_link_editor.html.erb +18 -15
  178. data/app/views/alchemy/essences/_essence_node_editor.html.erb +27 -0
  179. data/app/views/alchemy/essences/_essence_node_view.html.erb +1 -0
  180. data/app/views/alchemy/essences/_essence_page_editor.html.erb +14 -11
  181. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +22 -20
  182. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +10 -7
  183. data/app/views/alchemy/essences/_essence_select_editor.html.erb +12 -16
  184. data/app/views/alchemy/essences/_essence_text_editor.html.erb +18 -17
  185. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +6 -11
  186. data/app/views/alchemy/pages/show.rss.builder +3 -2
  187. data/app/views/layouts/alchemy/admin.html.erb +1 -0
  188. data/babel.config.js +12 -0
  189. data/bin/rails +5 -4
  190. data/config/alchemy/config.yml +15 -18
  191. data/config/brakeman.ignore +1 -1
  192. data/config/initializers/assets.rb +2 -1
  193. data/config/initializers/dragonfly.rb +2 -1
  194. data/config/initializers/mime_types.rb +1 -0
  195. data/config/initializers/mini_profiler.rb +3 -2
  196. data/config/initializers/simple_form.rb +6 -6
  197. data/config/locales/alchemy.en.yml +23 -8
  198. data/config/routes.rb +25 -24
  199. data/config/spring.rb +3 -2
  200. data/db/migrate/20200226213334_alchemy_four_point_four.rb +313 -0
  201. data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +11 -0
  202. data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +28 -0
  203. data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +8 -0
  204. data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +27 -0
  205. data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +6 -0
  206. data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +24 -0
  207. data/lib/alchemy/admin/locale.rb +3 -1
  208. data/lib/alchemy/admin/preview_url.rb +64 -0
  209. data/lib/alchemy/auth_accessors.rb +8 -7
  210. data/lib/alchemy/cache_digests/template_tracker.rb +5 -4
  211. data/lib/alchemy/config.rb +1 -5
  212. data/lib/alchemy/configuration_methods.rb +3 -1
  213. data/lib/alchemy/controller_actions.rb +6 -5
  214. data/lib/alchemy/deprecation.rb +2 -1
  215. data/lib/alchemy/elements_finder.rb +5 -5
  216. data/lib/alchemy/engine.rb +23 -8
  217. data/lib/alchemy/errors.rb +0 -7
  218. data/lib/alchemy/essence.rb +17 -16
  219. data/lib/alchemy/filetypes.rb +5 -5
  220. data/lib/alchemy/forms/builder.rb +4 -4
  221. data/lib/alchemy/hints.rb +1 -1
  222. data/lib/alchemy/i18n.rb +2 -1
  223. data/lib/alchemy/modules.rb +12 -12
  224. data/lib/alchemy/name_conversions.rb +5 -5
  225. data/lib/alchemy/on_page_layout/callbacks_runner.rb +1 -0
  226. data/lib/alchemy/page_layout.rb +15 -12
  227. data/lib/alchemy/paths.rb +1 -1
  228. data/lib/alchemy/permissions.rb +7 -6
  229. data/lib/alchemy/resource.rb +23 -13
  230. data/lib/alchemy/resources_helper.rb +12 -18
  231. data/lib/alchemy/routing_constraints.rb +1 -1
  232. data/lib/alchemy/seeder.rb +42 -14
  233. data/lib/alchemy/shell.rb +13 -10
  234. data/lib/alchemy/taggable.rb +1 -0
  235. data/lib/alchemy/tasks/tidy.rb +4 -3
  236. data/lib/alchemy/test_support/config_stubbing.rb +1 -0
  237. data/lib/alchemy/test_support/essence_shared_examples.rb +72 -72
  238. data/lib/alchemy/test_support/factories.rb +1 -1
  239. data/lib/alchemy/test_support/factories/attachment_factory.rb +5 -5
  240. data/lib/alchemy/test_support/factories/content_factory.rb +6 -6
  241. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +7 -7
  242. data/lib/alchemy/test_support/factories/element_factory.rb +9 -9
  243. data/lib/alchemy/test_support/factories/essence_file_factory.rb +3 -3
  244. data/lib/alchemy/test_support/factories/essence_page_factory.rb +3 -3
  245. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +4 -4
  246. data/lib/alchemy/test_support/factories/essence_text_factory.rb +3 -3
  247. data/lib/alchemy/test_support/factories/language_factory.rb +16 -14
  248. data/lib/alchemy/test_support/factories/node_factory.rb +8 -8
  249. data/lib/alchemy/test_support/factories/page_factory.rb +15 -27
  250. data/lib/alchemy/test_support/factories/picture_factory.rb +5 -5
  251. data/lib/alchemy/test_support/factories/site_factory.rb +7 -6
  252. data/lib/alchemy/test_support/integration_helpers.rb +1 -0
  253. data/lib/alchemy/test_support/shared_contexts.rb +5 -4
  254. data/lib/alchemy/test_support/shared_uploader_examples.rb +4 -3
  255. data/lib/alchemy/tinymce.rb +15 -13
  256. data/lib/alchemy/upgrader.rb +8 -7
  257. data/lib/alchemy/upgrader/five_point_zero.rb +41 -0
  258. data/lib/alchemy/upgrader/tasks/element_views_updater.rb +4 -4
  259. data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +29 -0
  260. data/lib/alchemy/version.rb +1 -1
  261. data/lib/alchemy_cms.rb +52 -50
  262. data/lib/{rails/generators → generators}/alchemy/base.rb +5 -4
  263. data/lib/{rails/generators → generators}/alchemy/elements/elements_generator.rb +13 -9
  264. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.erb +0 -0
  265. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.haml +0 -0
  266. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.slim +0 -0
  267. data/lib/{rails/generators → generators}/alchemy/essence/essence_generator.rb +15 -13
  268. data/lib/generators/alchemy/essence/templates/editor.html.erb +17 -0
  269. data/lib/{rails/generators → generators}/alchemy/essence/templates/view.html.erb +0 -0
  270. data/lib/{rails/generators → generators}/alchemy/install/files/_article.html.erb +0 -0
  271. data/lib/{rails/generators → generators}/alchemy/install/files/_standard.html.erb +0 -0
  272. data/lib/{rails/generators → generators}/alchemy/install/files/alchemy.en.yml +0 -0
  273. data/lib/generators/alchemy/install/files/alchemy_admin.js +1 -0
  274. data/lib/{rails/generators → generators}/alchemy/install/files/all.css +0 -0
  275. data/lib/{rails/generators → generators}/alchemy/install/files/all.js +0 -0
  276. data/lib/{rails/generators → generators}/alchemy/install/files/application.html.erb +0 -0
  277. data/lib/{rails/generators → generators}/alchemy/install/files/article.scss +0 -0
  278. data/lib/generators/alchemy/install/install_generator.rb +110 -0
  279. data/lib/{rails/generators → generators}/alchemy/install/templates/dragonfly.rb.tt +0 -0
  280. data/lib/{rails/generators → generators}/alchemy/install/templates/elements.yml.tt +0 -0
  281. data/lib/{rails/generators → generators}/alchemy/install/templates/menus.yml.tt +0 -0
  282. data/lib/{rails/generators → generators}/alchemy/install/templates/page_layouts.yml.tt +0 -0
  283. data/lib/{rails/generators → generators}/alchemy/menus/menus_generator.rb +2 -2
  284. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.erb +1 -4
  285. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.haml +1 -4
  286. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.slim +1 -4
  287. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.erb +1 -1
  288. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.haml +1 -1
  289. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.slim +1 -1
  290. data/lib/{rails/generators → generators}/alchemy/module/module_generator.rb +3 -2
  291. data/lib/{rails/generators → generators}/alchemy/module/templates/ability.rb.tt +0 -0
  292. data/lib/{rails/generators → generators}/alchemy/module/templates/controller.rb.tt +0 -0
  293. data/lib/{rails/generators → generators}/alchemy/module/templates/module_config.rb.tt +0 -0
  294. data/lib/{rails/generators → generators}/alchemy/page_layouts/page_layouts_generator.rb +5 -4
  295. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.erb +0 -0
  296. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.haml +0 -0
  297. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.slim +0 -0
  298. data/lib/{rails/generators → generators}/alchemy/site_layouts/site_layouts_generator.rb +4 -2
  299. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.erb +0 -0
  300. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.haml +0 -0
  301. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.slim +0 -0
  302. data/lib/{rails/generators → generators}/alchemy/views/views_generator.rb +7 -6
  303. data/lib/kaminari/scoped_pagination_url_helper.rb +1 -0
  304. data/lib/tasks/alchemy/db.rake +3 -19
  305. data/lib/tasks/alchemy/install.rake +3 -2
  306. data/lib/tasks/alchemy/tidy.rake +9 -8
  307. data/lib/tasks/alchemy/upgrade.rake +18 -116
  308. data/package.json +45 -0
  309. data/package/admin.js +14 -0
  310. data/package/src/__tests__/i18n.spec.js +70 -0
  311. data/package/src/i18n.js +48 -0
  312. data/package/src/node_tree.js +72 -0
  313. data/package/src/translations.js +32 -0
  314. data/package/src/utils/__tests__/ajax.spec.js +124 -0
  315. data/package/src/utils/__tests__/events.spec.js +38 -0
  316. data/package/src/utils/ajax.js +48 -0
  317. data/package/src/utils/events.js +16 -0
  318. data/vendor/assets/fonts/fa-regular-400.eot +0 -0
  319. data/vendor/assets/fonts/fa-regular-400.svg +798 -358
  320. data/vendor/assets/fonts/fa-regular-400.ttf +0 -0
  321. data/vendor/assets/fonts/fa-regular-400.woff +0 -0
  322. data/vendor/assets/fonts/fa-regular-400.woff2 +0 -0
  323. data/vendor/assets/fonts/fa-solid-900.eot +0 -0
  324. data/vendor/assets/fonts/fa-solid-900.svg +4933 -1408
  325. data/vendor/assets/fonts/fa-solid-900.ttf +0 -0
  326. data/vendor/assets/fonts/fa-solid-900.woff +0 -0
  327. data/vendor/assets/fonts/fa-solid-900.woff2 +0 -0
  328. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +1 -2
  329. data/vendor/assets/stylesheets/fontawesome/_core.scss +5 -0
  330. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +1 -1
  331. data/vendor/assets/stylesheets/fontawesome/_icons.scss +651 -2
  332. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +0 -1
  333. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +3 -2
  334. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +1 -1
  335. data/vendor/assets/stylesheets/fontawesome/_variables.scss +662 -9
  336. data/vendor/assets/stylesheets/fontawesome/fontawesome.scss +2 -2
  337. data/vendor/assets/stylesheets/fontawesome/regular.scss +23 -0
  338. data/vendor/assets/stylesheets/fontawesome/solid.scss +24 -0
  339. metadata +110 -88
  340. data/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +0 -32
  341. data/app/assets/javascripts/alchemy/alchemy.node_tree.js +0 -66
  342. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +0 -29
  343. data/app/assets/javascripts/alchemy/alchemy.utils.js +0 -45
  344. data/app/helpers/alchemy/essences_helper.rb +0 -119
  345. data/app/models/concerns/alchemy/content_touching.rb +0 -23
  346. data/app/serializers/alchemy/legacy_element_serializer.rb +0 -15
  347. data/app/views/alchemy/admin/contents/_missing.html.erb +0 -17
  348. data/app/views/alchemy/admin/pages/_menu_fields.html.erb +0 -37
  349. data/app/views/alchemy/admin/pages/configure_external.html.erb +0 -32
  350. data/app/views/alchemy/elements/_editor_not_found.html.erb +0 -4
  351. data/app/views/alchemy/navigation/_image_link.html.erb +0 -14
  352. data/app/views/alchemy/navigation/_link.html.erb +0 -19
  353. data/app/views/alchemy/navigation/_renderer.html.erb +0 -29
  354. data/db/migrate/20180226123013_alchemy_four_point_zero.rb +0 -363
  355. data/db/migrate/20180227224537_migrate_tags_to_gutentag.rb +0 -41
  356. data/db/migrate/20180519204655_add_fixed_to_alchemy_elements.rb +0 -6
  357. data/db/migrate/20191016073858_create_alchemy_essence_pages.rb +0 -8
  358. data/db/migrate/20191029212236_create_alchemy_nodes.rb +0 -24
  359. data/db/migrate/20200226081535_add_site_id_to_alchemy_nodes.rb +0 -15
  360. data/lib/alchemy/ssl_protection.rb +0 -34
  361. data/lib/alchemy/tasks/helpers.rb +0 -81
  362. data/lib/alchemy/test_support/controller_requests.rb +0 -93
  363. data/lib/alchemy/upgrader/four_point_four.rb +0 -52
  364. data/lib/alchemy/upgrader/four_point_one.rb +0 -42
  365. data/lib/alchemy/upgrader/four_point_six.rb +0 -50
  366. data/lib/alchemy/upgrader/four_point_two.rb +0 -85
  367. data/lib/alchemy/upgrader/tasks/cells_migration.rb +0 -43
  368. data/lib/alchemy/upgrader/tasks/cells_upgrader.rb +0 -148
  369. data/lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb +0 -28
  370. data/lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb +0 -27
  371. data/lib/alchemy/upgrader/tasks/picture_gallery_migration.rb +0 -65
  372. data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb +0 -210
  373. data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +0 -15
  374. data/lib/rails/generators/alchemy/install/install_generator.rb +0 -60
  375. data/lib/tasks/alchemy/convert.rake +0 -97
  376. data/vendor/assets/javascripts/sortable/Sortable.min.js +0 -2
  377. data/vendor/assets/stylesheets/fontawesome/fa-regular.scss +0 -22
  378. data/vendor/assets/stylesheets/fontawesome/fa-solid.scss +0 -23
@@ -2,12 +2,12 @@
2
2
  <table class="list" id="<%= resource_handler.resources_name %>_list">
3
3
  <thead>
4
4
  <tr>
5
- <% resource_handler.attributes.each do |attribute| %>
5
+ <% resource_handler.sorted_attributes.each do |attribute| %>
6
6
  <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
7
7
  <%= sort_link [:resource_url_proxy, @query],
8
8
  sortable_resource_header_column(attribute),
9
9
  resource_handler.model.human_attribute_name(attribute[:name]),
10
- hide_indicator: true %>
10
+ default_order: attribute[:type].to_s =~ /date|time/ ? 'desc' : 'asc' %>
11
11
  </th>
12
12
  <% end %>
13
13
  <th class="tools"></th>
@@ -0,0 +1,8 @@
1
+ <%= alchemy_form_for site, url: alchemy.admin_sites_path(site, search_filter_params) do |f| %>
2
+ <%= f.input :host, hint: resource_handler.help_text_for(name: :host).html_safe %>
3
+ <%= f.input :name %>
4
+ <%= f.input :public %>
5
+ <%= f.input :aliases, hint: resource_handler.help_text_for(name: :aliases), input_html: {rows: 4} %>
6
+ <%= f.input :redirect_to_primary_host %>
7
+ <%= f.submit Alchemy.t(:save) %>
8
+ <% end %>
@@ -0,0 +1 @@
1
+ <%= render 'form', site: @site %>
@@ -1,8 +1,8 @@
1
1
  <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
2
2
 
3
- <% toolbar(
4
- buttons: [
5
- {
3
+ <% content_for :toolbar do %>
4
+ <div class="toolbar_buttons">
5
+ <%= toolbar_button(
6
6
  icon: :plus,
7
7
  label: label_title,
8
8
  url: new_resource_path,
@@ -10,14 +10,26 @@
10
10
  hotkey: 'alt+n',
11
11
  dialog_options: {
12
12
  title: label_title,
13
- size: resource_window_size
13
+ size: "430x415"
14
14
  },
15
15
  if_permitted_to: [:create, Alchemy::Site]
16
- }
17
- ]
18
- ) %>
16
+ ) if @sites.any? %>
17
+ </div>
18
+ <%= render 'alchemy/admin/partials/search_form' %>
19
+ <% end %>
19
20
 
20
21
  <div id="archive_all" class="resources-table-wrapper">
21
- <%= render 'alchemy/admin/resources/table_header' %>
22
- <%= render 'table' %>
22
+ <% if @sites.any? %>
23
+ <%= render 'alchemy/admin/resources/table_header' %>
24
+ <%= render 'table' %>
25
+ <% elsif search_filter_params[:q].present? %>
26
+ <%= render_message { Alchemy.t('Nothing found') } %>
27
+ <% else %>
28
+ <div class="panel no-resource-found">
29
+ <%= render_message do %>
30
+ <%== Alchemy.t('alchemy/site', scope: :no_resource_found) %>
31
+ <% end %>
32
+ <%= render 'form', site: Alchemy::Site.new(Alchemy::Config.get(:default_site).merge(public: true)) %>
33
+ </div>
34
+ <% end %>
23
35
  </div>
@@ -0,0 +1 @@
1
+ <%= render 'form', site: @site %>
@@ -23,9 +23,9 @@
23
23
  <thead>
24
24
  <tr>
25
25
  <th class="icon"></th>
26
- <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
26
+ <th class="name"><%= sort_link(@query, :name) %></th>
27
27
  <th class="count"><%= Gutentag::Tag.human_attribute_name(:taggings_types) %></th>
28
- <th class="count"><%= sort_link(@query, :taggings_count, hide_indicator: true) %></th>
28
+ <th class="count"><%= sort_link(@query, :taggings_count) %></th>
29
29
  <th class="tools"></th>
30
30
  </tr>
31
31
  </thead>
@@ -1,13 +1,11 @@
1
- <div class="content_editor essence_boolean" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
2
- <input type="hidden" value="0" name="<%= content.form_field_name %>">
3
- <%= check_box_tag content.form_field_name, 1,
4
- content.ingredient.presence || content.settings_value(
5
- :default_value, local_assigns.fetch(:options, {})
6
- ),
7
- class: local_assigns.fetch(:html_options, {})[:class],
8
- style: local_assigns.fetch(:html_options, {})[:style] %>
9
- <label for="<%= content.form_field_id %>" style="display: inline">
10
- <%= render_content_name(content) %>
1
+ <%= content_tag :div,
2
+ id: essence_boolean_editor.dom_id,
3
+ class: essence_boolean_editor.css_classes,
4
+ data: essence_boolean_editor.data_attributes do %>
5
+ <input type="hidden" value="0" name="<%= essence_boolean_editor.form_field_name %>">
6
+ <%= check_box_tag essence_boolean_editor.form_field_name, 1, essence_boolean_editor.ingredient %>
7
+ <label for="<%= essence_boolean_editor.form_field_id %>" style="display: inline">
8
+ <%= render_content_name(essence_boolean_editor) %>
11
9
  </label>
12
- <%= render_hint_for(content) %>
13
- </div>
10
+ <%= render_hint_for(essence_boolean_editor) %>
11
+ <% end %>
@@ -1,13 +1,16 @@
1
- <div class="content_editor essence_date" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
2
- <%= content_label(content) %>
1
+ <%= content_tag :div,
2
+ id: essence_date_editor.dom_id,
3
+ class: essence_date_editor.css_classes,
4
+ data: essence_date_editor.data_attributes do %>
5
+ <%= content_label(essence_date_editor) %>
3
6
  <%= alchemy_datepicker(
4
- content.essence, :date, {
5
- name: content.form_field_name,
6
- id: content.form_field_id,
7
- value: content.settings_value(:default_value, local_assigns.fetch(:options, {}))
7
+ essence_date_editor.essence, :date, {
8
+ name: essence_date_editor.form_field_name,
9
+ id: essence_date_editor.form_field_id,
10
+ value: essence_date_editor.ingredient
8
11
  }
9
12
  ) %>
10
- <label for="<%= content.form_field_id %>" class="essence_date--label">
13
+ <label for="<%= essence_date_editor.form_field_id %>" class="essence_date--label">
11
14
  <i class="icon far fa-calendar-alt fa-fw fa-lg"></i>
12
15
  </label>
13
- </div>
16
+ <% end %>
@@ -1,9 +1,8 @@
1
1
  <% dialog_link = link_to_dialog render_icon(:file, style: 'regular'),
2
2
  alchemy.admin_attachments_path(
3
- content_id: content.id,
4
- only: content.settings_value(:only, local_assigns.fetch(:options, {})),
5
- except: content.settings_value(:except, local_assigns.fetch(:options, {})),
6
- options: local_assigns.fetch(:options, {})
3
+ content_id: essence_file_editor.id,
4
+ only: essence_file_editor.settings[:only],
5
+ except: essence_file_editor.settings[:except]
7
6
  ),
8
7
  {
9
8
  title: Alchemy.t(:assign_file),
@@ -13,34 +12,34 @@
13
12
  class: 'file_icon',
14
13
  title: Alchemy.t(:assign_file) %>
15
14
 
16
- <div class="content_editor essence_file" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
17
- <%= content_label(content) %>
18
- <div class="file" id="file_<%= content.id %>">
19
- <% if content.ingredient %>
15
+ <%= content_tag :div,
16
+ id: essence_file_editor.dom_id,
17
+ class: essence_file_editor.css_classes,
18
+ data: essence_file_editor.data_attributes do %>
19
+ <%= content_label(essence_file_editor) %>
20
+ <div class="file" id="file_<%= essence_file_editor.id %>">
21
+ <% if essence_file_editor.ingredient %>
20
22
  <div class="file_icon">
21
- <%= render_icon(content.ingredient.icon_css_class) %>
23
+ <%= render_icon(essence_file_editor.ingredient.icon_css_class) %>
22
24
  </div>
23
25
  <% else %>
24
26
  <%= dialog_link %>
25
27
  <% end %>
26
28
  <div class="file_name">
27
- <%= content.ingredient.try(:name) ||
29
+ <%= essence_file_editor.ingredient.try(:name) ||
28
30
  ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
29
31
  </div>
30
32
  <div class="essence_file_tools">
31
33
  <%= dialog_link %>
32
34
  <%= link_to_dialog render_icon(:edit),
33
- alchemy.edit_admin_essence_file_path(
34
- id: content.essence.id,
35
- options: local_assigns.fetch(:options, {})
36
- ),
35
+ alchemy.edit_admin_essence_file_path(id: essence_file_editor.essence.id),
37
36
  {
38
37
  title: Alchemy.t(:edit_file_properties),
39
38
  size: '400x215'
40
39
  },
41
40
  title: Alchemy.t(:edit_file_properties) %>
42
41
  </div>
43
- <%= hidden_field_tag content.form_field_name(:attachment_id),
44
- content.ingredient && content.ingredient.id %>
42
+ <%= hidden_field_tag essence_file_editor.form_field_name(:attachment_id),
43
+ essence_file_editor.ingredient && essence_file_editor.ingredient.id %>
45
44
  </div>
46
- </div>
45
+ <% end %>
@@ -1,7 +1,10 @@
1
- <div class="content_editor essence_html_editor" data-content-id="<%= content.id %>">
2
- <%= content_label(content) %>
1
+ <%= content_tag :div,
2
+ id: essence_html_editor.dom_id,
3
+ class: essence_html_editor.css_classes,
4
+ data: essence_html_editor.data_attributes do %>
5
+ <%= content_label(essence_html_editor) %>
3
6
  <%= text_area_tag(
4
- content.form_field_name,
5
- content.ingredient
7
+ essence_html_editor.form_field_name,
8
+ essence_html_editor.ingredient
6
9
  ) %>
7
- </div>
10
+ <% end %>
@@ -1,23 +1,26 @@
1
- <div class="content_editor essence_link" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
2
- <%= content_label(content) %>
3
- <%= text_field_tag '', content.ingredient,
1
+ <%= content_tag :div,
2
+ id: essence_link_editor.dom_id,
3
+ class: essence_link_editor.css_classes,
4
+ data: essence_link_editor.data_attributes do %>
5
+ <%= content_label(essence_link_editor) %>
6
+ <%= text_field_tag '', essence_link_editor.ingredient,
4
7
  class: "thin_border text_with_icon disabled",
5
8
  name: nil,
6
9
  id: nil,
7
10
  disabled: true
8
11
  %>
9
- <%= hidden_field_tag content.form_field_name(:link),
10
- content.essence.link %>
11
- <%= hidden_field_tag content.form_field_name(:link_title),
12
- content.essence.link_title %>
13
- <%= hidden_field_tag content.form_field_name(:link_class_name),
14
- content.essence.link_class_name %>
15
- <%= hidden_field_tag content.form_field_name(:link_target),
16
- content.essence.link_target %>
17
- <%= render 'alchemy/essences/shared/linkable_essence_tools', content: content %>
18
- </div>
12
+ <%= hidden_field_tag essence_link_editor.form_field_name(:link),
13
+ essence_link_editor.essence.link %>
14
+ <%= hidden_field_tag essence_link_editor.form_field_name(:link_title),
15
+ essence_link_editor.essence.link_title %>
16
+ <%= hidden_field_tag essence_link_editor.form_field_name(:link_class_name),
17
+ essence_link_editor.essence.link_class_name %>
18
+ <%= hidden_field_tag essence_link_editor.form_field_name(:link_target),
19
+ essence_link_editor.essence.link_target %>
20
+ <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_link_editor.content %>
21
+ <% end %>
19
22
  <script type="text/javascript" charset="utf-8">
20
- $('#<%= content.form_field_id(:link) %>').on('change', function() {
21
- $('#<%= content.dom_id %> input.text_with_icon').val($(this).val());
23
+ $('#<%= essence_link_editor.form_field_id(:link) %>').on('change', function() {
24
+ $('#<%= essence_link_editor.dom_id %> input.text_with_icon').val($(this).val());
22
25
  });
23
26
  </script>
@@ -0,0 +1,27 @@
1
+ <%= content_tag :div,
2
+ id: essence_node_editor.dom_id,
3
+ class: essence_node_editor.css_classes,
4
+ data: essence_node_editor.data_attributes do %>
5
+ <%= content_label(essence_node_editor) %>
6
+ <%= text_field_tag(
7
+ essence_node_editor.form_field_name("node_id"),
8
+ essence_node_editor.essence.node_id,
9
+ id: essence_node_editor.form_field_id,
10
+ class: 'alchemy_selectbox full_width'
11
+ ) %>
12
+ <% end %>
13
+
14
+ <script>
15
+ <% query_params = essence_node_editor.settings.fetch(:query_params, {}).merge({
16
+ include: :ancestors
17
+ }) %>
18
+ $('#<%= essence_node_editor.form_field_id %>').alchemyNodeSelect({
19
+ placeholder: "<%= Alchemy.t(:search_node) %>",
20
+ url: "<%= alchemy.api_nodes_path %>",
21
+ query_params: <%== query_params.to_json %>,
22
+ <% if essence_node_editor.essence.node %>
23
+ <% serialized_node = ActiveModelSerializers::SerializableResource.new(essence_node_editor.essence.node, include: :ancestors) %>
24
+ initialSelection: <%== serialized_node.to_json %>
25
+ <% end %>
26
+ })
27
+ </script>
@@ -0,0 +1 @@
1
+ <%= render content.ingredient if content.ingredient %>
@@ -1,22 +1,25 @@
1
- <div class="content_editor essence_spree_page" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
2
- <%= content_label(content) %>
1
+ <%= content_tag :div,
2
+ id: essence_page_editor.dom_id,
3
+ class: essence_page_editor.css_classes,
4
+ data: essence_page_editor.data_attributes do %>
5
+ <%= content_label(essence_page_editor) %>
3
6
  <%= text_field_tag(
4
- content.form_field_name,
5
- content.essence.page_id,
6
- id: content.form_field_id,
7
+ essence_page_editor.form_field_name("page_id"),
8
+ essence_page_editor.essence.page_id,
9
+ id: essence_page_editor.form_field_id,
7
10
  class: 'alchemy_selectbox full_width'
8
11
  ) %>
9
- </div>
12
+ <% end %>
10
13
 
11
14
  <script>
12
- $('#<%= content.form_field_id %>').alchemyPageSelect({
15
+ $('#<%= essence_page_editor.form_field_id %>').alchemyPageSelect({
13
16
  placeholder: "<%= Alchemy.t(:search_page) %>",
14
17
  url: "<%= alchemy.api_pages_path %>",
15
- query_params: <%== content.settings[:query_params].to_json %>,
16
- <% if content.essence.page %>
18
+ query_params: <%== essence_page_editor.settings[:query_params].to_json %>,
19
+ <% if essence_page_editor.essence.page %>
17
20
  initialSelection: {
18
- id: <%= content.essence.page_id %>,
19
- text: "<%= content.essence.page.name %>"
21
+ id: <%= essence_page_editor.essence.page_id %>,
22
+ text: "<%= essence_page_editor.essence.page.name %>"
20
23
  }
21
24
  <% end %>
22
25
  })
@@ -1,42 +1,44 @@
1
1
  <% options = local_assigns.fetch(:options, {}) %>
2
2
 
3
- <%= content_tag :div, id: content.dom_id, data: {"content-id" => content.id}, class: "content_editor essence_picture" do %>
4
- <%= content_label(content) %>
3
+ <%= content_tag :div,
4
+ id: essence_picture_editor.dom_id,
5
+ class: essence_picture_editor.css_classes,
6
+ data: essence_picture_editor.data_attributes do %>
7
+ <%= content_label(essence_picture_editor) %>
5
8
  <div class="picture_thumbnail">
6
9
  <span class="picture_tool delete">
7
10
  <%= link_to render_icon(:times), '#',
8
- onclick: "return Alchemy.removePicture('##{content.form_field_id(:picture_id)}');" %>
11
+ onclick: "return Alchemy.removePicture('##{essence_picture_editor.form_field_id(:picture_id)}');" %>
9
12
  </span>
10
13
  <div class="picture_image">
11
14
  <div class="thumbnail_background">
12
- <%- if content.ingredient -%>
13
- <%= essence_picture_thumbnail(content, options) %>
15
+ <%- if essence_picture_editor.ingredient -%>
16
+ <%= essence_picture_thumbnail(essence_picture_editor) %>
14
17
  <% else %>
15
18
  <%= render_icon(:image, style: 'regular') %>
16
19
  <% end %>
17
20
  </div>
18
21
  </div>
19
- <%- if content.essence.css_class.present? -%>
22
+ <%- if essence_picture_editor.essence.css_class.present? -%>
20
23
  <div class="essence_picture_css_class">
21
- <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}",
22
- default: content.essence.css_class.camelcase) %>
24
+ <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{essence_picture_editor.essence.css_class}",
25
+ default: essence_picture_editor.essence.css_class.camelcase) %>
23
26
  </div>
24
27
  <%- end -%>
25
28
  <div class="edit_images_bottom">
26
29
  <%= render 'alchemy/essences/shared/essence_picture_tools', {
27
- content: content,
28
- options: options
30
+ content: essence_picture_editor.content
29
31
  } %>
30
32
  </div>
31
33
  </div>
32
- <%= hidden_field_tag content.form_field_name(:picture_id),
33
- content.ingredient.try!(:id) %>
34
- <%= hidden_field_tag content.form_field_name(:link),
35
- content.essence.link %>
36
- <%= hidden_field_tag content.form_field_name(:link_title),
37
- content.essence.link_title %>
38
- <%= hidden_field_tag content.form_field_name(:link_class_name),
39
- content.essence.link_class_name %>
40
- <%= hidden_field_tag content.form_field_name(:link_target),
41
- content.essence.link_target %>
34
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:picture_id),
35
+ essence_picture_editor.ingredient.try!(:id) %>
36
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:link),
37
+ essence_picture_editor.essence.link %>
38
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:link_title),
39
+ essence_picture_editor.essence.link_title %>
40
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:link_class_name),
41
+ essence_picture_editor.essence.link_class_name %>
42
+ <%= hidden_field_tag essence_picture_editor.form_field_name(:link_target),
43
+ essence_picture_editor.essence.link_target %>
42
44
  <% end %>
@@ -1,11 +1,14 @@
1
- <div class="content_editor essence_richtext" id="<%= content.dom_id %>">
2
- <%= content_label(content) %>
1
+ <%= content_tag :div,
2
+ id: essence_richtext_editor.dom_id,
3
+ class: essence_richtext_editor.css_classes,
4
+ data: essence_richtext_editor.data_attributes do %>
5
+ <%= content_label(essence_richtext_editor) %>
3
6
  <div class="tinymce_container">
4
7
  <%= text_area_tag(
5
- content.form_field_name,
6
- content.ingredient || '',
7
- class: content.tinymce_class_name,
8
- id: "tinymce_#{content.id}"
8
+ essence_richtext_editor.form_field_name,
9
+ essence_richtext_editor.ingredient || '',
10
+ class: essence_richtext_editor.tinymce_class_name,
11
+ id: "tinymce_#{essence_richtext_editor.id}"
9
12
  ) %>
10
13
  </div>
11
- </div>
14
+ <% end %>
@@ -1,32 +1,28 @@
1
- <% select_values = content.settings_value(:select_values, local_assigns.fetch(:options, {})) %>
2
- <% inline = content.settings_value(:display_inline, local_assigns.fetch(:options, {})) %>
3
- <% html_options = local_assigns.fetch(:html_options, {}) %>
1
+ <% select_values = essence_select_editor.settings[:select_values] %>
4
2
 
5
3
  <%= content_tag :div,
6
- id: content.dom_id,
4
+ id: essence_select_editor.dom_id,
7
5
  class: [
8
- "content_editor",
9
- "essence_select",
10
- inline ? 'display_inline' : nil
11
- ].compact, data: {content_id: content.id} do %>
12
- <%= content_label(content) %>
6
+ essence_select_editor.css_classes,
7
+ essence_select_editor.settings[:display_inline] ? 'display_inline' : ''
8
+ ], data: essence_select_editor.data_attributes do %>
9
+ <%= content_label(essence_select_editor) %>
13
10
 
14
11
  <% if select_values.nil? %>
15
12
  <%= warning(':select_values is nil',
16
13
  "<strong>No select values given.</strong>
17
- <br>Please provide :<code>select_values</code> either as argument to
18
- <code>render_essence_editor</code> helper or as setting on the content definition in
14
+ <br>Please provide <code>select_values</code> on the
15
+ content definition <code>settings</code> in
19
16
  <code>elements.yml</code>.") %>
20
17
  <% else %>
21
18
  <%
22
19
  if select_values.is_a?(Hash)
23
- options_tags = grouped_options_for_select(select_values, content.ingredient)
20
+ options_tags = grouped_options_for_select(select_values, essence_select_editor.ingredient)
24
21
  else
25
- options_tags = options_for_select(select_values, content.ingredient)
22
+ options_tags = options_for_select(select_values, essence_select_editor.ingredient)
26
23
  end %>
27
- <%= select_tag content.form_field_name, options_tags, {
28
- class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].compact,
29
- style: html_options[:style]
24
+ <%= select_tag essence_select_editor.form_field_name, options_tags, {
25
+ class: ["alchemy_selectbox", "essence_editor_select"]
30
26
  } %>
31
27
  <% end %>
32
28
  <% end %>