alchemy_cms 4.6.6 → 5.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (382) 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 -27
  9. data/Gemfile +24 -22
  10. data/README.md +31 -19
  11. data/Rakefile +10 -8
  12. data/alchemy_cms.gemspec +6 -5
  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/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  29. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  30. data/app/controllers/alchemy/admin/attachments_controller.rb +8 -7
  31. data/app/controllers/alchemy/admin/base_controller.rb +13 -33
  32. data/app/controllers/alchemy/admin/clipboard_controller.rb +5 -4
  33. data/app/controllers/alchemy/admin/contents_controller.rb +1 -2
  34. data/app/controllers/alchemy/admin/dashboard_controller.rb +10 -9
  35. data/app/controllers/alchemy/admin/elements_controller.rb +20 -20
  36. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +12 -14
  37. data/app/controllers/alchemy/admin/languages_controller.rb +35 -2
  38. data/app/controllers/alchemy/admin/layoutpages_controller.rb +5 -2
  39. data/app/controllers/alchemy/admin/nodes_controller.rb +5 -4
  40. data/app/controllers/alchemy/admin/pages_controller.rb +50 -62
  41. data/app/controllers/alchemy/admin/pictures_controller.rb +16 -16
  42. data/app/controllers/alchemy/admin/resources_controller.rb +21 -13
  43. data/app/controllers/alchemy/admin/sites_controller.rb +18 -0
  44. data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
  45. data/app/controllers/alchemy/admin/tags_controller.rb +5 -3
  46. data/app/controllers/alchemy/admin/trash_controller.rb +6 -6
  47. data/app/controllers/alchemy/api/base_controller.rb +2 -2
  48. data/app/controllers/alchemy/api/contents_controller.rb +4 -4
  49. data/app/controllers/alchemy/api/elements_controller.rb +8 -8
  50. data/app/controllers/alchemy/api/nodes_controller.rb +37 -1
  51. data/app/controllers/alchemy/api/pages_controller.rb +14 -23
  52. data/app/controllers/alchemy/attachments_controller.rb +5 -5
  53. data/app/controllers/alchemy/base_controller.rb +10 -9
  54. data/app/controllers/alchemy/messages_controller.rb +16 -23
  55. data/app/controllers/alchemy/pages_controller.rb +13 -11
  56. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +3 -2
  57. data/app/controllers/concerns/alchemy/admin/current_language.rb +23 -0
  58. data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -5
  59. data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +4 -4
  60. data/app/controllers/concerns/alchemy/page_redirects.rb +2 -9
  61. data/app/controllers/concerns/alchemy/site_redirects.rb +2 -2
  62. data/app/decorators/alchemy/element_editor.rb +39 -0
  63. data/app/helpers/alchemy/admin/attachments_helper.rb +6 -6
  64. data/app/helpers/alchemy/admin/base_helper.rb +36 -35
  65. data/app/helpers/alchemy/admin/contents_helper.rb +3 -3
  66. data/app/helpers/alchemy/admin/elements_helper.rb +3 -88
  67. data/app/helpers/alchemy/admin/essences_helper.rb +8 -117
  68. data/app/helpers/alchemy/admin/form_helper.rb +1 -1
  69. data/app/helpers/alchemy/admin/navigation_helper.rb +24 -23
  70. data/app/helpers/alchemy/admin/pages_helper.rb +4 -4
  71. data/app/helpers/alchemy/admin/pictures_helper.rb +3 -3
  72. data/app/helpers/alchemy/admin/tags_helper.rb +8 -7
  73. data/app/helpers/alchemy/base_helper.rb +13 -8
  74. data/app/helpers/alchemy/elements_block_helper.rb +2 -31
  75. data/app/helpers/alchemy/elements_helper.rb +12 -58
  76. data/app/helpers/alchemy/pages_helper.rb +24 -174
  77. data/app/helpers/alchemy/url_helper.rb +2 -1
  78. data/app/mailers/alchemy/base_mailer.rb +1 -1
  79. data/app/mailers/alchemy/messages_mailer.rb +1 -1
  80. data/app/models/alchemy/attachment.rb +21 -19
  81. data/app/models/alchemy/base_record.rb +2 -5
  82. data/app/models/alchemy/content/factory.rb +24 -31
  83. data/app/models/alchemy/content.rb +33 -38
  84. data/app/models/alchemy/element/definitions.rb +4 -4
  85. data/app/models/alchemy/element/element_contents.rb +9 -6
  86. data/app/models/alchemy/element/element_essences.rb +4 -3
  87. data/app/models/alchemy/element/presenters.rb +3 -2
  88. data/app/models/alchemy/element.rb +46 -54
  89. data/app/models/alchemy/element_to_page.rb +1 -1
  90. data/app/models/alchemy/essence_boolean.rb +1 -3
  91. data/app/models/alchemy/essence_date.rb +2 -3
  92. data/app/models/alchemy/essence_file.rb +4 -4
  93. data/app/models/alchemy/essence_html.rb +1 -3
  94. data/app/models/alchemy/essence_link.rb +1 -3
  95. data/app/models/alchemy/essence_node.rb +18 -0
  96. data/app/models/alchemy/essence_page.rb +3 -16
  97. data/app/models/alchemy/essence_picture.rb +17 -16
  98. data/app/models/alchemy/essence_picture_view.rb +7 -6
  99. data/app/models/alchemy/essence_richtext.rb +1 -3
  100. data/app/models/alchemy/essence_select.rb +1 -3
  101. data/app/models/alchemy/essence_text.rb +0 -2
  102. data/app/models/alchemy/folded_page.rb +1 -0
  103. data/app/models/alchemy/language/code.rb +4 -4
  104. data/app/models/alchemy/language.rb +21 -35
  105. data/app/models/alchemy/legacy_page_url.rb +1 -1
  106. data/app/models/alchemy/message.rb +3 -3
  107. data/app/models/alchemy/node.rb +28 -5
  108. data/app/models/alchemy/page/fixed_attributes.rb +3 -2
  109. data/app/models/alchemy/page/page_elements.rb +35 -44
  110. data/app/models/alchemy/page/page_naming.rb +20 -70
  111. data/app/models/alchemy/page/page_natures.rb +7 -34
  112. data/app/models/alchemy/page/page_scopes.rb +23 -29
  113. data/app/models/alchemy/page/url_path.rb +0 -2
  114. data/app/models/alchemy/page.rb +47 -128
  115. data/app/models/alchemy/picture/transformations.rb +9 -7
  116. data/app/models/alchemy/picture/url.rb +5 -5
  117. data/app/models/alchemy/picture.rb +19 -28
  118. data/app/models/alchemy/site/layout.rb +2 -2
  119. data/app/models/alchemy/site.rb +6 -36
  120. data/app/models/concerns/alchemy/touch_elements.rb +24 -0
  121. data/app/serializers/alchemy/content_serializer.rb +0 -3
  122. data/app/serializers/alchemy/essence_boolean_serializer.rb +3 -3
  123. data/app/serializers/alchemy/essence_date_serializer.rb +3 -3
  124. data/app/serializers/alchemy/essence_file_serializer.rb +4 -2
  125. data/app/serializers/alchemy/essence_html_serializer.rb +3 -3
  126. data/app/serializers/alchemy/essence_link_serializer.rb +3 -3
  127. data/app/serializers/alchemy/essence_picture_serializer.rb +5 -4
  128. data/app/serializers/alchemy/essence_richtext_serializer.rb +3 -3
  129. data/app/serializers/alchemy/essence_select_serializer.rb +3 -3
  130. data/app/serializers/alchemy/essence_text_serializer.rb +5 -4
  131. data/app/serializers/alchemy/node_serializer.rb +2 -0
  132. data/app/serializers/alchemy/page_tree_serializer.rb +9 -13
  133. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  134. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +1 -2
  135. data/app/views/alchemy/admin/attachments/_files_list.html.erb +4 -4
  136. data/app/views/alchemy/admin/contents/create.js.erb +1 -3
  137. data/app/views/alchemy/admin/elements/_element.html.erb +9 -18
  138. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  139. data/app/views/alchemy/admin/elements/fold.js.erb +1 -1
  140. data/app/views/alchemy/admin/elements/index.html.erb +3 -3
  141. data/app/views/alchemy/admin/essence_files/assign.js.erb +1 -6
  142. data/app/views/alchemy/admin/essence_files/edit.html.erb +1 -1
  143. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +1 -7
  144. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -1
  145. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +7 -7
  146. data/app/views/alchemy/admin/essence_pictures/update.js.erb +1 -1
  147. data/app/views/alchemy/admin/languages/_form.html.erb +5 -5
  148. data/app/views/alchemy/admin/languages/_table.html.erb +3 -3
  149. data/app/views/alchemy/admin/languages/edit.html.erb +1 -0
  150. data/app/views/alchemy/admin/languages/index.html.erb +23 -4
  151. data/app/views/alchemy/admin/languages/new.html.erb +1 -0
  152. data/app/views/alchemy/admin/layoutpages/index.html.erb +3 -3
  153. data/app/views/alchemy/admin/nodes/_form.html.erb +18 -15
  154. data/app/views/alchemy/admin/nodes/_node.html.erb +1 -5
  155. data/app/views/alchemy/admin/nodes/index.html.erb +3 -4
  156. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +0 -8
  157. data/app/views/alchemy/admin/pages/_form.html.erb +0 -1
  158. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -0
  159. data/app/views/alchemy/admin/pages/_page.html.erb +11 -19
  160. data/app/views/alchemy/admin/pages/_page_infos.html.erb +0 -4
  161. data/app/views/alchemy/admin/pages/edit.html.erb +1 -1
  162. data/app/views/alchemy/admin/pages/info.html.erb +0 -9
  163. data/app/views/alchemy/admin/pages/unlock.js.erb +13 -6
  164. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +0 -2
  165. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -5
  166. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +1 -1
  167. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -2
  168. data/app/views/alchemy/admin/resources/_resource.html.erb +1 -1
  169. data/app/views/alchemy/admin/resources/_table.html.erb +2 -2
  170. data/app/views/alchemy/admin/sites/_form.html.erb +8 -0
  171. data/app/views/alchemy/admin/sites/edit.html.erb +1 -0
  172. data/app/views/alchemy/admin/sites/index.html.erb +21 -9
  173. data/app/views/alchemy/admin/sites/new.html.erb +1 -0
  174. data/app/views/alchemy/admin/tags/index.html.erb +2 -2
  175. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +10 -12
  176. data/app/views/alchemy/essences/_essence_date_editor.html.erb +11 -8
  177. data/app/views/alchemy/essences/_essence_file_editor.html.erb +16 -17
  178. data/app/views/alchemy/essences/_essence_html_editor.html.erb +8 -5
  179. data/app/views/alchemy/essences/_essence_link_editor.html.erb +18 -15
  180. data/app/views/alchemy/essences/_essence_node_editor.html.erb +27 -0
  181. data/app/views/alchemy/essences/_essence_node_view.html.erb +1 -0
  182. data/app/views/alchemy/essences/_essence_page_editor.html.erb +14 -11
  183. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +22 -20
  184. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +10 -7
  185. data/app/views/alchemy/essences/_essence_select_editor.html.erb +12 -16
  186. data/app/views/alchemy/essences/_essence_text_editor.html.erb +18 -17
  187. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +6 -11
  188. data/app/views/alchemy/pages/show.rss.builder +3 -2
  189. data/app/views/layouts/alchemy/admin.html.erb +1 -0
  190. data/babel.config.js +12 -0
  191. data/bin/rails +5 -4
  192. data/config/alchemy/config.yml +15 -18
  193. data/config/brakeman.ignore +1 -1
  194. data/config/initializers/assets.rb +2 -1
  195. data/config/initializers/dragonfly.rb +2 -1
  196. data/config/initializers/mime_types.rb +1 -0
  197. data/config/initializers/mini_profiler.rb +3 -2
  198. data/config/initializers/simple_form.rb +6 -6
  199. data/config/locales/alchemy.en.yml +23 -8
  200. data/config/routes.rb +25 -24
  201. data/config/spring.rb +3 -2
  202. data/db/migrate/20200226213334_alchemy_four_point_four.rb +313 -0
  203. data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +11 -0
  204. data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +28 -0
  205. data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +8 -0
  206. data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +27 -0
  207. data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +6 -0
  208. data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +24 -0
  209. data/lib/alchemy/admin/locale.rb +3 -1
  210. data/lib/alchemy/admin/preview_url.rb +64 -0
  211. data/lib/alchemy/auth_accessors.rb +8 -7
  212. data/lib/alchemy/cache_digests/template_tracker.rb +5 -4
  213. data/lib/alchemy/config.rb +1 -5
  214. data/lib/alchemy/configuration_methods.rb +3 -1
  215. data/lib/alchemy/controller_actions.rb +6 -5
  216. data/lib/alchemy/deprecation.rb +2 -1
  217. data/lib/alchemy/elements_finder.rb +5 -5
  218. data/lib/alchemy/engine.rb +23 -8
  219. data/lib/alchemy/errors.rb +0 -7
  220. data/lib/alchemy/essence.rb +17 -16
  221. data/lib/alchemy/filetypes.rb +5 -5
  222. data/lib/alchemy/forms/builder.rb +4 -4
  223. data/lib/alchemy/hints.rb +1 -1
  224. data/lib/alchemy/i18n.rb +2 -1
  225. data/lib/alchemy/modules.rb +12 -12
  226. data/lib/alchemy/name_conversions.rb +5 -5
  227. data/lib/alchemy/on_page_layout/callbacks_runner.rb +1 -0
  228. data/lib/alchemy/page_layout.rb +15 -12
  229. data/lib/alchemy/paths.rb +1 -1
  230. data/lib/alchemy/permissions.rb +7 -6
  231. data/lib/alchemy/resource.rb +25 -17
  232. data/lib/alchemy/resources_helper.rb +12 -18
  233. data/lib/alchemy/routing_constraints.rb +1 -1
  234. data/lib/alchemy/seeder.rb +42 -14
  235. data/lib/alchemy/shell.rb +13 -10
  236. data/lib/alchemy/taggable.rb +1 -0
  237. data/lib/alchemy/tasks/tidy.rb +4 -3
  238. data/lib/alchemy/test_support/config_stubbing.rb +1 -0
  239. data/lib/alchemy/test_support/essence_shared_examples.rb +72 -72
  240. data/lib/alchemy/test_support/factories/attachment_factory.rb +5 -5
  241. data/lib/alchemy/test_support/factories/content_factory.rb +6 -6
  242. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +7 -7
  243. data/lib/alchemy/test_support/factories/element_factory.rb +9 -9
  244. data/lib/alchemy/test_support/factories/essence_file_factory.rb +3 -3
  245. data/lib/alchemy/test_support/factories/essence_page_factory.rb +3 -3
  246. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +4 -4
  247. data/lib/alchemy/test_support/factories/essence_text_factory.rb +3 -3
  248. data/lib/alchemy/test_support/factories/language_factory.rb +16 -14
  249. data/lib/alchemy/test_support/factories/node_factory.rb +8 -8
  250. data/lib/alchemy/test_support/factories/page_factory.rb +15 -27
  251. data/lib/alchemy/test_support/factories/picture_factory.rb +5 -5
  252. data/lib/alchemy/test_support/factories/site_factory.rb +7 -6
  253. data/lib/alchemy/test_support/factories.rb +1 -1
  254. data/lib/alchemy/test_support/integration_helpers.rb +1 -0
  255. data/lib/alchemy/test_support/shared_contexts.rb +5 -4
  256. data/lib/alchemy/test_support/shared_uploader_examples.rb +4 -3
  257. data/lib/alchemy/tinymce.rb +15 -13
  258. data/lib/alchemy/upgrader/five_point_zero.rb +41 -0
  259. data/lib/alchemy/upgrader/tasks/element_views_updater.rb +4 -4
  260. data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +29 -0
  261. data/lib/alchemy/upgrader.rb +8 -7
  262. data/lib/alchemy/userstamp.rb +1 -1
  263. data/lib/alchemy/version.rb +1 -1
  264. data/lib/alchemy_cms.rb +52 -50
  265. data/lib/{rails/generators → generators}/alchemy/base.rb +5 -4
  266. data/lib/{rails/generators → generators}/alchemy/elements/elements_generator.rb +13 -9
  267. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.erb +0 -0
  268. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.haml +0 -0
  269. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.slim +0 -0
  270. data/lib/{rails/generators → generators}/alchemy/essence/essence_generator.rb +15 -13
  271. data/lib/generators/alchemy/essence/templates/editor.html.erb +17 -0
  272. data/lib/{rails/generators → generators}/alchemy/essence/templates/view.html.erb +0 -0
  273. data/lib/{rails/generators → generators}/alchemy/install/files/_article.html.erb +0 -0
  274. data/lib/{rails/generators → generators}/alchemy/install/files/_standard.html.erb +0 -0
  275. data/lib/{rails/generators → generators}/alchemy/install/files/alchemy.en.yml +0 -0
  276. data/lib/generators/alchemy/install/files/alchemy_admin.js +1 -0
  277. data/lib/{rails/generators → generators}/alchemy/install/files/all.css +0 -0
  278. data/lib/{rails/generators → generators}/alchemy/install/files/all.js +0 -0
  279. data/lib/{rails/generators → generators}/alchemy/install/files/application.html.erb +0 -0
  280. data/lib/{rails/generators → generators}/alchemy/install/files/article.scss +0 -0
  281. data/lib/generators/alchemy/install/install_generator.rb +110 -0
  282. data/lib/{rails/generators → generators}/alchemy/install/templates/dragonfly.rb.tt +0 -0
  283. data/lib/{rails/generators → generators}/alchemy/install/templates/elements.yml.tt +0 -0
  284. data/lib/{rails/generators → generators}/alchemy/install/templates/menus.yml.tt +0 -0
  285. data/lib/{rails/generators → generators}/alchemy/install/templates/page_layouts.yml.tt +0 -0
  286. data/lib/{rails/generators → generators}/alchemy/menus/menus_generator.rb +2 -2
  287. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.erb +1 -4
  288. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.haml +1 -4
  289. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.slim +1 -4
  290. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.erb +1 -1
  291. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.haml +1 -1
  292. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.slim +1 -1
  293. data/lib/{rails/generators → generators}/alchemy/module/module_generator.rb +3 -2
  294. data/lib/{rails/generators → generators}/alchemy/module/templates/ability.rb.tt +0 -0
  295. data/lib/{rails/generators → generators}/alchemy/module/templates/controller.rb.tt +0 -0
  296. data/lib/{rails/generators → generators}/alchemy/module/templates/module_config.rb.tt +0 -0
  297. data/lib/{rails/generators → generators}/alchemy/page_layouts/page_layouts_generator.rb +5 -4
  298. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.erb +0 -0
  299. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.haml +0 -0
  300. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.slim +0 -0
  301. data/lib/{rails/generators → generators}/alchemy/site_layouts/site_layouts_generator.rb +4 -2
  302. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.erb +0 -0
  303. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.haml +0 -0
  304. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.slim +0 -0
  305. data/lib/{rails/generators → generators}/alchemy/views/views_generator.rb +7 -6
  306. data/lib/kaminari/scoped_pagination_url_helper.rb +1 -0
  307. data/lib/tasks/alchemy/db.rake +3 -19
  308. data/lib/tasks/alchemy/install.rake +3 -2
  309. data/lib/tasks/alchemy/tidy.rake +9 -8
  310. data/lib/tasks/alchemy/upgrade.rake +18 -120
  311. data/package/admin.js +14 -0
  312. data/package/src/__tests__/i18n.spec.js +70 -0
  313. data/package/src/i18n.js +48 -0
  314. data/package/src/node_tree.js +72 -0
  315. data/package/src/translations.js +32 -0
  316. data/package/src/utils/__tests__/ajax.spec.js +124 -0
  317. data/package/src/utils/__tests__/events.spec.js +38 -0
  318. data/package/src/utils/ajax.js +48 -0
  319. data/package/src/utils/events.js +16 -0
  320. data/package.json +45 -0
  321. data/vendor/assets/fonts/fa-regular-400.eot +0 -0
  322. data/vendor/assets/fonts/fa-regular-400.svg +798 -358
  323. data/vendor/assets/fonts/fa-regular-400.ttf +0 -0
  324. data/vendor/assets/fonts/fa-regular-400.woff +0 -0
  325. data/vendor/assets/fonts/fa-regular-400.woff2 +0 -0
  326. data/vendor/assets/fonts/fa-solid-900.eot +0 -0
  327. data/vendor/assets/fonts/fa-solid-900.svg +4933 -1408
  328. data/vendor/assets/fonts/fa-solid-900.ttf +0 -0
  329. data/vendor/assets/fonts/fa-solid-900.woff +0 -0
  330. data/vendor/assets/fonts/fa-solid-900.woff2 +0 -0
  331. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +1 -2
  332. data/vendor/assets/stylesheets/fontawesome/_core.scss +5 -0
  333. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +1 -1
  334. data/vendor/assets/stylesheets/fontawesome/_icons.scss +651 -2
  335. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +0 -1
  336. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +3 -2
  337. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +1 -1
  338. data/vendor/assets/stylesheets/fontawesome/_variables.scss +662 -9
  339. data/vendor/assets/stylesheets/fontawesome/fontawesome.scss +2 -2
  340. data/vendor/assets/stylesheets/fontawesome/regular.scss +23 -0
  341. data/vendor/assets/stylesheets/fontawesome/solid.scss +24 -0
  342. metadata +117 -96
  343. data/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +0 -32
  344. data/app/assets/javascripts/alchemy/alchemy.node_tree.js +0 -66
  345. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +0 -29
  346. data/app/assets/javascripts/alchemy/alchemy.utils.js +0 -45
  347. data/app/helpers/alchemy/essences_helper.rb +0 -119
  348. data/app/models/concerns/alchemy/content_touching.rb +0 -23
  349. data/app/serializers/alchemy/legacy_element_serializer.rb +0 -15
  350. data/app/views/alchemy/admin/contents/_missing.html.erb +0 -17
  351. data/app/views/alchemy/admin/pages/_menu_fields.html.erb +0 -37
  352. data/app/views/alchemy/admin/pages/configure_external.html.erb +0 -32
  353. data/app/views/alchemy/elements/_editor_not_found.html.erb +0 -4
  354. data/app/views/alchemy/navigation/_image_link.html.erb +0 -14
  355. data/app/views/alchemy/navigation/_link.html.erb +0 -19
  356. data/app/views/alchemy/navigation/_renderer.html.erb +0 -29
  357. data/db/migrate/20180226123013_alchemy_four_point_zero.rb +0 -363
  358. data/db/migrate/20180227224537_migrate_tags_to_gutentag.rb +0 -41
  359. data/db/migrate/20180519204655_add_fixed_to_alchemy_elements.rb +0 -6
  360. data/db/migrate/20191016073858_create_alchemy_essence_pages.rb +0 -8
  361. data/db/migrate/20191029212236_create_alchemy_nodes.rb +0 -24
  362. data/db/migrate/20200226081535_add_site_id_to_alchemy_nodes.rb +0 -15
  363. data/lib/alchemy/ssl_protection.rb +0 -34
  364. data/lib/alchemy/tasks/helpers.rb +0 -81
  365. data/lib/alchemy/test_support/controller_requests.rb +0 -93
  366. data/lib/alchemy/upgrader/four_point_four.rb +0 -52
  367. data/lib/alchemy/upgrader/four_point_one.rb +0 -42
  368. data/lib/alchemy/upgrader/four_point_six.rb +0 -50
  369. data/lib/alchemy/upgrader/four_point_two.rb +0 -86
  370. data/lib/alchemy/upgrader/tasks/cells_migration.rb +0 -44
  371. data/lib/alchemy/upgrader/tasks/cells_upgrader.rb +0 -166
  372. data/lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb +0 -32
  373. data/lib/alchemy/upgrader/tasks/fixed_element_name_finder.rb +0 -31
  374. data/lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb +0 -27
  375. data/lib/alchemy/upgrader/tasks/picture_gallery_migration.rb +0 -65
  376. data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb +0 -210
  377. data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +0 -15
  378. data/lib/rails/generators/alchemy/install/install_generator.rb +0 -60
  379. data/lib/tasks/alchemy/convert.rake +0 -98
  380. data/vendor/assets/javascripts/sortable/Sortable.min.js +0 -2
  381. data/vendor/assets/stylesheets/fontawesome/fa-regular.scss +0 -22
  382. data/vendor/assets/stylesheets/fontawesome/fa-solid.scss +0 -23
@@ -0,0 +1,24 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Alchemy
4
+ # If the model has a +elements+ association,
5
+ # it updates all their timestamps after save.
6
+ #
7
+ # Should only be used on bottom to top relations,
8
+ # e.g. +Alchemy::Picture+ or +Alchemy::Attachment+
9
+ # not on top to bottom ones like +Alchemy::Page+.
10
+ #
11
+ module TouchElements
12
+ def self.included(base)
13
+ base.after_save(:touch_elements)
14
+ end
15
+
16
+ private
17
+
18
+ def touch_elements
19
+ return unless respond_to?(:elements)
20
+
21
+ elements.map(&:touch)
22
+ end
23
+ end
24
+ end
@@ -6,9 +6,6 @@ module Alchemy
6
6
  :name,
7
7
  :ingredient,
8
8
  :element_id,
9
- :position,
10
- :created_at,
11
- :updated_at,
12
9
  :settings
13
10
 
14
11
  has_one :essence, polymorphic: true
@@ -2,9 +2,9 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceBooleanSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :value,
7
- :created_at,
8
- :updated_at
8
+ )
9
9
  end
10
10
  end
@@ -2,9 +2,9 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceDateSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :date,
7
- :created_at,
8
- :updated_at
8
+ )
9
9
  end
10
10
  end
@@ -2,9 +2,11 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceFileSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :title,
7
- :css_class
8
+ :css_class,
9
+ )
8
10
 
9
11
  has_one :attachment
10
12
  end
@@ -2,9 +2,9 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceHtmlSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :source,
7
- :created_at,
8
- :updated_at
8
+ )
9
9
  end
10
10
  end
@@ -2,12 +2,12 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceLinkSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :link,
7
8
  :link_title,
8
9
  :link_target,
9
10
  :link_class_name,
10
- :created_at,
11
- :updated_at
11
+ )
12
12
  end
13
13
  end
@@ -2,25 +2,26 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssencePictureSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :picture_id,
7
8
  :caption,
8
9
  :title,
9
10
  :alt_tag,
10
11
  :css_class,
11
12
  :link,
12
- :created_at,
13
- :updated_at
13
+ )
14
14
 
15
15
  has_one :picture
16
16
 
17
17
  def link
18
18
  return if object.link.blank?
19
+
19
20
  {
20
21
  url: object.link,
21
22
  css_class: object.link_class_name,
22
23
  title: object.link_title,
23
- target: object.link_target
24
+ target: object.link_target,
24
25
  }
25
26
  end
26
27
  end
@@ -2,10 +2,10 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceRichtextSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :body,
7
8
  :stripped_body,
8
- :created_at,
9
- :updated_at
9
+ )
10
10
  end
11
11
  end
@@ -2,9 +2,9 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceSelectSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :value,
7
- :created_at,
8
- :updated_at
8
+ )
9
9
  end
10
10
  end
@@ -2,19 +2,20 @@
2
2
 
3
3
  module Alchemy
4
4
  class EssenceTextSerializer < ActiveModel::Serializer
5
- attributes :id,
5
+ attributes(
6
+ :id,
6
7
  :body,
7
8
  :link,
8
- :created_at,
9
- :updated_at
9
+ )
10
10
 
11
11
  def link
12
12
  return if object.link.blank?
13
+
13
14
  {
14
15
  url: object.link,
15
16
  title: object.link_title,
16
17
  css_class: object.link_class_name,
17
- target: object.link_target
18
+ target: object.link_target,
18
19
  }
19
20
  end
20
21
  end
@@ -8,5 +8,7 @@ module Alchemy
8
8
  :rgt,
9
9
  :url,
10
10
  :parent_id
11
+
12
+ has_many :ancestors, record_type: :node, serializer: self
11
13
  end
12
14
  end
@@ -3,13 +3,13 @@
3
3
  module Alchemy
4
4
  class PageTreeSerializer < BaseSerializer
5
5
  def attributes
6
- {'pages' => nil}
6
+ {"pages" => nil}
7
7
  end
8
8
 
9
9
  def pages
10
10
  tree = []
11
11
  path = [{id: object.parent_id, children: tree}]
12
- page_list = object.self_and_descendants.includes({ language: :site }, :locker)
12
+ page_list = object.self_and_descendants
13
13
  base_level = object.level - 1
14
14
  # Load folded pages in advance
15
15
  folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -53,18 +53,15 @@ module Alchemy
53
53
  id: page.id,
54
54
  name: page.name,
55
55
  public: page.public?,
56
- visible: page.visible?,
57
56
  restricted: page.restricted?,
58
57
  page_layout: page.page_layout,
59
58
  slug: page.slug,
60
- redirects_to_external: page.definition['redirects_to_external'],
61
59
  urlname: page.urlname,
62
- external_urlname: page.definition['redirects_to_external'] ? page.external_urlname : nil,
63
60
  url_path: page.url_path,
64
61
  level: level,
65
62
  root: page.depth == 1,
66
63
  root_or_leaf: page.depth == 1 || !has_children,
67
- children: []
64
+ children: [],
68
65
  }
69
66
 
70
67
  if opts[:elements]
@@ -76,9 +73,9 @@ module Alchemy
76
73
  definition_missing: page.definition.blank?,
77
74
  folded: folded,
78
75
  locked: page.locked?,
79
- locked_notice: page.locked? ? Alchemy.t('This page is locked', name: page.locker_name) : nil,
76
+ locked_notice: page.locked? ? Alchemy.t("This page is locked", name: page.locker_name) : nil,
80
77
  permissions: page_permissions(page, opts[:ability]),
81
- status_titles: page_status_titles(page)
78
+ status_titles: page_status_titles(page),
82
79
  })
83
80
  else
84
81
  p_hash
@@ -86,10 +83,10 @@ module Alchemy
86
83
  end
87
84
 
88
85
  def page_elements(page)
89
- if opts[:elements] == 'true'
86
+ if opts[:elements] == "true"
90
87
  page.elements
91
88
  else
92
- page.elements.named(opts[:elements].split(',') || [])
89
+ page.elements.named(opts[:elements].split(",") || [])
93
90
  end
94
91
  end
95
92
 
@@ -100,15 +97,14 @@ module Alchemy
100
97
  copy: ability.can?(:copy, page),
101
98
  destroy: ability.can?(:destroy, page),
102
99
  create: ability.can?(:create, Alchemy::Page),
103
- edit_content: ability.can?(:edit_content, page)
100
+ edit_content: ability.can?(:edit_content, page),
104
101
  }
105
102
  end
106
103
 
107
104
  def page_status_titles(page)
108
105
  {
109
106
  public: page.status_title(:public),
110
- visible: page.status_title(:visible),
111
- restricted: page.status_title(:restricted)
107
+ restricted: page.status_title(:restricted),
112
108
  }
113
109
  end
114
110
  end
@@ -7,8 +7,7 @@
7
7
  in_dialog: true,
8
8
  redirect_url: admin_attachments_path(
9
9
  element_id: @element.try(:id),
10
- content_id: @content.try(:id),
11
- options: options_from_params
10
+ content_id: @content.try(:id)
12
11
  ) %>
13
12
  <% end %>
14
13
  <%= render 'alchemy/admin/partials/remote_search_form' %>
@@ -1,8 +1,7 @@
1
1
  <li class="assign_file_file <%= cycle('even', 'odd') %>">
2
2
  <%= link_to alchemy.assign_admin_essence_files_path(
3
3
  attachment_id: file_to_assign.id,
4
- content_id: @content.id,
5
- options: options_from_params
4
+ content_id: @content.id
6
5
  ),
7
6
  remote: true,
8
7
  method: 'put' do %>
@@ -11,11 +11,11 @@
11
11
  <thead>
12
12
  <tr>
13
13
  <th class="icon"></th>
14
- <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
15
- <th class="file_name"><%= sort_link(@query, :file_name, hide_indicator: true) %></th>
14
+ <th class="name"><%= sort_link(@query, :name) %></th>
15
+ <th class="file_name"><%= sort_link(@query, :file_name) %></th>
16
16
  <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
17
- <th class="file_size"><%= sort_link(@query, :file_size, hide_indicator: true) %></th>
18
- <th class="date"><%= sort_link(@query, :created_at, hide_indicator: true) %></th>
17
+ <th class="file_size"><%= sort_link(@query, :file_size) %></th>
18
+ <th class="date"><%= sort_link(@query, :created_at, default_order: 'desc') %></th>
19
19
  <th class="tools"></th>
20
20
  </tr>
21
21
  </thead>
@@ -1,6 +1,4 @@
1
- var editor_html = '<%= j(render "alchemy/essences/#{@content.essence_partial_name}_editor", {
2
- content: @content, options: options_from_params, html_options: @html_options
3
- }) %>';
1
+ var editor_html = '<%= j render(Alchemy::ContentEditor.new(@content)) %>';
4
2
 
5
3
  $("[data-element-<%= @content.element_id %>-missing-content=\"<%= @content.name %>\"]").replaceWith(editor_html);
6
4
 
@@ -1,7 +1,7 @@
1
1
  <%= content_tag :div,
2
2
  id: "element_#{element.id}",
3
3
  data: {'element-id' => element.id, 'element-name' => element.name},
4
- class: element_editor_classes(element) do %>
4
+ class: element.css_classes do %>
5
5
 
6
6
  <% unless element.fixed? %>
7
7
  <%= render 'alchemy/admin/elements/element_header', element: element %>
@@ -18,24 +18,14 @@
18
18
  <%= render_message(:warning, sanitize(warning)) if warning %>
19
19
  <% end %>
20
20
 
21
- <% if element_editable?(element) %>
21
+ <% if element.editable? %>
22
22
  <%= form_for [alchemy, :admin, element], remote: true,
23
23
  html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
24
24
 
25
25
  <div id="element_<%= element.id %>_errors" class="element_errors"></div>
26
26
 
27
27
  <div id="element_<%= element.id %>_content" class="element-content-editors">
28
- <% if lookup_context.exists?("#{element.name}_editor", ["alchemy/elements"], true) %>
29
- <%= render_editor(element) %>
30
- <% else %>
31
- <%= element_editor_for(element) do %>
32
- <% element.contents.each do |content| %>
33
- <%= render "alchemy/essences/#{content.essence_partial_name}_editor", {
34
- content: content
35
- } %>
36
- <% end %>
37
- <% end %>
38
- <% end %>
28
+ <%= render element.contents.map { |content| Alchemy::ContentEditor.new(content) } %>
39
29
  </div>
40
30
 
41
31
  <% if element.taggable? %>
@@ -53,11 +43,12 @@
53
43
  <% if element.nestable_elements.any? %>
54
44
  <div class="nestable-elements">
55
45
  <%= content_tag :div,
56
- class: "nested-elements", data: {
57
- 'droppable-elements' => element.nestable_elements.join(' ')
58
- } do %>
59
- <%= render partial: 'alchemy/admin/elements/element',
60
- collection: element.all_nested_elements %>
46
+ class: "nested-elements", data: {
47
+ 'droppable-elements' => element.nestable_elements.join(' ')
48
+ } do %>
49
+ <%= render element.all_nested_elements.map { |element|
50
+ Alchemy::ElementEditor.new(element)
51
+ } %>
61
52
  <% end %>
62
53
 
63
54
  <% if element.expanded? || element.fixed? %>
@@ -1,7 +1,7 @@
1
1
  (function() {
2
2
  var $el;
3
3
  var $element_area;
4
- var element_html = '<%= j render("element", element: @element, draggable: true) %>';
4
+ var element_html = '<%= j render(Alchemy::ElementEditor.new(@element)) %>';
5
5
 
6
6
  <%- if @cut_element_id -%>
7
7
  $('.element-editor[data-element-id="<%= @cut_element_id %>"]').remove();
@@ -8,7 +8,7 @@
8
8
 
9
9
  <% else -%>
10
10
 
11
- $el.replaceWith('<%= j render(partial: "element", object: @element) %>');
11
+ $el.replaceWith('<%= j render(Alchemy::ElementEditor.new(@element)) %>');
12
12
  $el = $('#element_<%= @element.id %>');
13
13
  $('#element_area .sortable-elements').sortable('refresh');
14
14
 
@@ -15,19 +15,19 @@
15
15
  <% end %>
16
16
  </ul>
17
17
  <div id="main-content-elements" class="sortable-elements" data-droppable-elements="<%= @page.element_definition_names.join(' ') %>">
18
- <%= render partial: 'alchemy/admin/elements/element', collection: @elements %>
18
+ <%= render @elements.map { |element| Alchemy::ElementEditor.new(element) } %>
19
19
  </div>
20
20
  <% @fixed_elements.each do |element| %>
21
21
  <div
22
22
  id="fixed-element-<%= element.id %>"
23
23
  class="sortable-elements"
24
24
  data-droppable-elements="<%= element.nestable_elements.join(' ') %>">
25
- <%= render 'alchemy/admin/elements/element', element: element %>
25
+ <%= render Alchemy::ElementEditor.new(element) %>
26
26
  </div>
27
27
  <% end %>
28
28
  </div>
29
29
  <% else %>
30
30
  <div id="main-content-elements" class="sortable-elements" data-droppable-elements="<%= @page.element_definition_names.join(' ') %>">
31
- <%= render partial: 'alchemy/admin/elements/element', collection: @elements %>
31
+ <%= render @elements.map { |element| Alchemy::ElementEditor.new(element) } %>
32
32
  </div>
33
33
  <% end %>
@@ -1,8 +1,3 @@
1
- $('#<%= @content.dom_id %>').replaceWith('<%= j(
2
- render "alchemy/essences/essence_file_editor",
3
- formats: [:html],
4
- content: @content,
5
- options: options_from_params
6
- ) %>');
1
+ $('#<%= @content.dom_id %>').replaceWith('<%= j render(Alchemy::ContentEditor.new(@content)) %>');
7
2
  Alchemy.closeCurrentDialog();
8
3
  Alchemy.setElementDirty($('#element_<%= @content.element.id %>'));
@@ -1,4 +1,4 @@
1
- <% css_classes = @content.settings_value(:css_classes, local_assigns.fetch(:options, {})) %>
1
+ <% css_classes = @content.settings[:css_classes] %>
2
2
 
3
3
  <%= alchemy_form_for [:admin, @essence_file] do |f| %>
4
4
  <%= f.input :link_text %>
@@ -1,10 +1,4 @@
1
1
  $('#picture_to_assign_<%= @picture.id %> a').attr('href', '#').off('click');
2
- $('#<%= @content.dom_id -%>').replaceWith('<%= j(
3
- render(
4
- "alchemy/essences/essence_picture_editor",
5
- content: @content,
6
- options: options_from_params
7
- )
8
- ) %>');
2
+ $('#<%= @content.dom_id -%>').replaceWith('<%= j render(Alchemy::ContentEditor.new(@content)) %>');
9
3
  Alchemy.closeCurrentDialog();
10
4
  Alchemy.setElementDirty('#element_<%= @content.element.id %>');
@@ -12,7 +12,7 @@
12
12
  </div>
13
13
  <%= form_for(
14
14
  @essence_picture,
15
- url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params),
15
+ url: alchemy.admin_essence_picture_path(@essence_picture),
16
16
  id: 'image_cropper_form',
17
17
  remote: true
18
18
  ) do |f| %>
@@ -1,20 +1,20 @@
1
1
  <%= alchemy_form_for @essence_picture,
2
- url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params) do |f| %>
2
+ url: alchemy.admin_essence_picture_path(@essence_picture) do |f| %>
3
3
  <%= hidden_field_tag 'content_id', @content.id %>
4
- <%= f.input :caption, as: options_from_params[:caption_as_textarea] ? 'text' : 'string' %>
4
+ <%= f.input :caption, as: @content.settings[:caption_as_textarea] ? 'text' : 'string' %>
5
5
  <%= f.input :title %>
6
6
  <%= f.input :alt_tag %>
7
- <%- if options_from_params[:sizes].present? -%>
7
+ <%- if @content.settings[:sizes].present? -%>
8
8
  <%= f.input :render_size,
9
9
  collection: [
10
- [Alchemy.t('Layout default'), options_from_params[:size]]
11
- ] + options_from_params[:sizes].to_a,
10
+ [Alchemy.t('Layout default'), @content.settings[:size]]
11
+ ] + @content.settings[:sizes].to_a,
12
12
  include_blank: false,
13
13
  input_html: {class: 'alchemy_selectbox'} %>
14
14
  <%- end -%>
15
- <%- if options_from_params[:css_classes].present? -%>
15
+ <%- if @content.settings[:css_classes].present? -%>
16
16
  <%= f.input :css_class,
17
- collection: options_from_params[:css_classes],
17
+ collection: @content.settings[:css_classes],
18
18
  include_blank: Alchemy.t('None'),
19
19
  input_html: {class: 'alchemy_selectbox'} %>
20
20
  <%- else -%>
@@ -3,7 +3,7 @@
3
3
  Alchemy.closeCurrentDialog();
4
4
  Alchemy.setElementDirty('#element_<%= @content.element.id %>');
5
5
  <% if @content.ingredient %>
6
- $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content, options_from_params) %>');
6
+ $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content) %>');
7
7
  Alchemy.ImageLoader('#<%= @content.dom_id %> .thumbnail_background');
8
8
  <% end %>
9
9
  })(jQuery);
@@ -1,14 +1,14 @@
1
- <%= alchemy_form_for [alchemy, :admin, @language] do |f| %>
1
+ <%= alchemy_form_for [alchemy, :admin, language] do |f| %>
2
2
  <%= f.input :name, autofocus: true %>
3
3
  <%= f.input :language_code, placeholder: Alchemy.t(:language_code_placeholder) %>
4
4
  <%= f.input :country_code,
5
5
  as: 'string',
6
6
  placeholder: Alchemy.t(:country_code_placeholder),
7
7
  hint: Alchemy.t(:country_code_foot_note) %>
8
- <% if @language.errors[:locale].present? || @language.locale.present? %>
8
+ <% if language.errors[:locale].present? || language.locale.present? %>
9
9
  <%= f.input :locale,
10
- collection: @language.matching_locales.presence || ::I18n.available_locales,
11
- selected: @language.locale || @language.language_code || ::I18n.default_locale.to_s,
10
+ collection: language.matching_locales.presence || ::I18n.available_locales,
11
+ selected: language.locale || language.language_code || ::I18n.default_locale.to_s,
12
12
  input_html: {class: 'alchemy_selectbox'} %>
13
13
  <% end %>
14
14
  <%= f.input :frontpage_name %>
@@ -19,6 +19,6 @@
19
19
  input_html: {class: 'alchemy_selectbox'} %>
20
20
  <%= f.input :public %>
21
21
  <%= f.input :default %>
22
- <%= f.hidden_field :site_id, value: Alchemy::Site.current.id %>
22
+ <%= f.hidden_field :site_id %>
23
23
  <%= f.submit Alchemy.t(:save) %>
24
24
  <% end %>
@@ -3,13 +3,13 @@
3
3
  <thead>
4
4
  <tr>
5
5
  <th>
6
- <%= sort_link @query, :name, hide_indicator: true %>
6
+ <%= sort_link @query, :name %>
7
7
  </th>
8
8
  <th>
9
- <%= sort_link @query, :language_code, hide_indicator: true %>
9
+ <%= sort_link @query, :language_code %>
10
10
  </th>
11
11
  <th>
12
- <%= sort_link @query, :country_code, hide_indicator: true %>
12
+ <%= sort_link @query, :country_code %>
13
13
  </th>
14
14
  <th>
15
15
  <%= Alchemy::Language.human_attribute_name(:code) %>
@@ -0,0 +1 @@
1
+ <%= render 'form', language: @language %>
@@ -3,7 +3,8 @@
3
3
  <% content_for :toolbar do %>
4
4
  <div class="toolbar_buttons">
5
5
  <%= render 'alchemy/admin/partials/site_select' %>
6
- <%= toolbar_button icon: :plus,
6
+ <%= toolbar_button(
7
+ icon: :plus,
7
8
  label: label_title,
8
9
  url: new_resource_path,
9
10
  title: label_title,
@@ -12,12 +13,30 @@
12
13
  title: label_title,
13
14
  size: "430x415"
14
15
  },
15
- if_permitted_to: [:create, Alchemy::Language] %>
16
+ if_permitted_to: [:create, Alchemy::Language]
17
+ ) if @languages.any? %>
16
18
  </div>
17
19
  <%= render 'alchemy/admin/partials/search_form' %>
18
20
  <% end %>
19
21
 
20
22
  <div id="archive_all" class="resources-table-wrapper">
21
- <%= render 'alchemy/admin/resources/table_header' %>
22
- <%= render 'table' %>
23
+ <% if @languages.any? %>
24
+ <%= render 'alchemy/admin/resources/table_header' %>
25
+ <%= render 'table' %>
26
+ <% elsif search_filter_params[:q].present? %>
27
+ <%= render_message { Alchemy.t('Nothing found') } %>
28
+ <% else %>
29
+ <div class="panel no-resource-found">
30
+ <%= render_message do %>
31
+ <%== Alchemy.t('alchemy/language', scope: :no_resource_found) %>
32
+ <% end %>
33
+ <%= render 'form', language: Alchemy::Language.new(
34
+ Alchemy::Config.get(:default_language).merge(
35
+ site: Alchemy::Site.current,
36
+ default: true,
37
+ public: true
38
+ )
39
+ ) %>
40
+ </div>
41
+ <% end %>
23
42
  </div>
@@ -0,0 +1 @@
1
+ <%= render 'form', language: @language %>
@@ -4,7 +4,7 @@
4
4
  <%= render 'alchemy/admin/partials/language_tree_select' %>
5
5
  <%= toolbar_button(
6
6
  icon: :plus,
7
- url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),
7
+ url: alchemy.new_admin_page_path(language: @current_language, layoutpage: true),
8
8
  hotkey: 'alt+n',
9
9
  dialog_options: {
10
10
  title: Alchemy.t('Add global page'),
@@ -34,6 +34,6 @@
34
34
  <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
35
35
  </h4>
36
36
 
37
- <ul class="list" id="sitemap">
38
- <%= render partial: "layoutpage", collection: @layout_root.children %>
37
+ <ul class="list" id="layoutpages">
38
+ <%= render partial: "layoutpage", collection: @layout_pages %>
39
39
  </ul>