alchemy_cms 7.1.7 → 7.2.0.b
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +133 -0
- data/Gemfile +2 -4
- data/LICENSE +1 -1
- data/README.md +5 -6
- data/SECURITY.md +1 -1
- data/alchemy_cms.gemspec +3 -4
- data/app/assets/javascripts/alchemy/admin.js +0 -9
- data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +5 -15
- data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +5 -4
- data/app/assets/javascripts/alchemy/templates/index.js +0 -1
- data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
- data/app/assets/javascripts/alchemy/templates/page_folder.hbs +1 -1
- data/app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js +20 -7
- data/app/assets/stylesheets/alchemy/_custom-properties.scss +12 -0
- data/app/assets/stylesheets/alchemy/_mixins.scss +10 -6
- data/app/assets/stylesheets/alchemy/_variables.scss +3 -0
- data/app/assets/stylesheets/alchemy/admin.scss +2 -2
- data/app/assets/stylesheets/alchemy/archive.scss +4 -3
- data/app/assets/stylesheets/alchemy/attachment-select.scss +19 -0
- data/app/assets/stylesheets/alchemy/base.scss +31 -18
- data/app/assets/stylesheets/alchemy/buttons.scss +3 -4
- data/app/assets/stylesheets/alchemy/dashboard.scss +1 -1
- data/app/assets/stylesheets/alchemy/dialogs.scss +2 -5
- data/app/assets/stylesheets/alchemy/elements.scss +76 -46
- data/app/assets/stylesheets/alchemy/flash.scss +20 -70
- data/app/assets/stylesheets/alchemy/forms.scss +41 -36
- data/app/assets/stylesheets/alchemy/frame.scss +12 -3
- data/app/assets/stylesheets/alchemy/icons.scss +34 -2
- data/app/assets/stylesheets/alchemy/image_library.scss +18 -9
- data/app/assets/stylesheets/alchemy/{filter_field.scss → list_filter.scss} +8 -7
- data/app/assets/stylesheets/alchemy/lists.scss +1 -1
- data/app/assets/stylesheets/alchemy/navigation.scss +9 -12
- data/app/assets/stylesheets/alchemy/node-select.scss +1 -1
- data/app/assets/stylesheets/alchemy/nodes.scss +15 -13
- data/app/assets/stylesheets/alchemy/notices.scss +56 -39
- data/app/assets/stylesheets/alchemy/page-select.scss +1 -4
- data/app/assets/stylesheets/alchemy/pagination.scss +11 -1
- data/app/assets/stylesheets/alchemy/preview_window.scss +7 -3
- data/app/assets/stylesheets/alchemy/search.scss +4 -4
- data/app/assets/stylesheets/alchemy/selects.scss +13 -7
- data/app/assets/stylesheets/alchemy/shoelace.scss +33 -2
- data/app/assets/stylesheets/alchemy/sitemap.scss +155 -159
- data/app/assets/stylesheets/alchemy/tables.scss +49 -12
- data/app/assets/stylesheets/alchemy/tags.scss +17 -11
- data/app/assets/stylesheets/alchemy/toolbar.scss +2 -2
- data/app/assets/stylesheets/alchemy/typography.scss +41 -22
- data/app/assets/stylesheets/alchemy/upload.scss +5 -4
- data/app/components/alchemy/admin/attachment_select.rb +39 -0
- data/app/components/alchemy/admin/icon.rb +72 -0
- data/app/components/alchemy/admin/link_dialog/anchor_tab.rb +41 -0
- data/app/components/alchemy/admin/link_dialog/base_tab.rb +75 -0
- data/app/components/alchemy/admin/link_dialog/external_tab.rb +42 -0
- data/app/components/alchemy/admin/link_dialog/file_tab.rb +45 -0
- data/app/components/alchemy/admin/link_dialog/internal_tab.rb +66 -0
- data/app/components/alchemy/admin/link_dialog/tabs.rb +33 -0
- data/app/components/alchemy/admin/list_filter.rb +42 -0
- data/app/components/alchemy/admin/message.rb +19 -0
- data/app/components/alchemy/admin/tags_autocomplete.rb +25 -0
- data/app/components/alchemy/admin/toolbar_button.rb +111 -0
- data/app/components/alchemy/ingredients/link_view.rb +1 -7
- data/app/components/alchemy/ingredients/picture_view.rb +2 -2
- data/app/components/alchemy/ingredients/text_view.rb +1 -2
- data/app/controllers/alchemy/admin/base_controller.rb +1 -1
- data/app/controllers/alchemy/admin/elements_controller.rb +4 -2
- data/app/controllers/alchemy/admin/ingredients_controller.rb +2 -0
- data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
- data/app/controllers/alchemy/admin/legacy_page_urls_controller.rb +12 -4
- data/app/controllers/alchemy/admin/nodes_controller.rb +26 -0
- data/app/controllers/alchemy/admin/pages_controller.rb +11 -78
- data/app/controllers/alchemy/admin/picture_descriptions_controller.rb +15 -0
- data/app/controllers/alchemy/admin/pictures_controller.rb +18 -1
- data/app/controllers/alchemy/admin/resources_controller.rb +15 -10
- data/app/controllers/alchemy/api/attachments_controller.rb +44 -0
- data/app/controllers/alchemy/api/pages_controller.rb +10 -6
- data/app/controllers/alchemy/base_controller.rb +2 -2
- data/app/controllers/alchemy/messages_controller.rb +2 -2
- data/app/controllers/alchemy/pages_controller.rb +8 -6
- data/app/controllers/concerns/alchemy/admin/current_language.rb +1 -1
- data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +1 -1
- data/app/decorators/alchemy/element_editor.rb +2 -2
- data/app/helpers/alchemy/admin/base_helper.rb +8 -60
- data/app/helpers/alchemy/admin/elements_helper.rb +1 -1
- data/app/helpers/alchemy/admin/ingredients_helper.rb +1 -1
- data/app/helpers/alchemy/base_helper.rb +9 -91
- data/app/helpers/alchemy/elements_helper.rb +3 -3
- data/app/helpers/alchemy/pages_helper.rb +16 -9
- data/app/javascript/alchemy_admin/components/attachment_select.js +24 -0
- data/app/javascript/alchemy_admin/components/button.js +3 -0
- data/app/javascript/alchemy_admin/components/clipboard_button.js +3 -2
- data/app/javascript/alchemy_admin/components/dialog_link.js +10 -7
- data/app/javascript/alchemy_admin/components/dom_id_select.js +69 -0
- data/app/javascript/alchemy_admin/components/element_editor/delete_element_button.js +42 -0
- data/app/javascript/alchemy_admin/components/element_editor/publish_element_button.js +4 -2
- data/app/javascript/alchemy_admin/components/element_editor.js +21 -13
- data/app/javascript/alchemy_admin/components/elements_window.js +87 -0
- data/app/javascript/alchemy_admin/components/growl.js +13 -0
- data/app/javascript/alchemy_admin/components/icon.js +51 -0
- data/app/javascript/alchemy_admin/components/index.js +24 -0
- data/app/javascript/alchemy_admin/components/ingredient_group.js +6 -0
- data/app/javascript/alchemy_admin/components/link_buttons/link_button.js +21 -11
- data/app/javascript/alchemy_admin/components/link_buttons/unlink_button.js +2 -1
- data/app/javascript/alchemy_admin/components/link_buttons.js +1 -0
- data/app/javascript/alchemy_admin/components/list_filter.js +68 -0
- data/app/javascript/alchemy_admin/components/message.js +69 -0
- data/app/javascript/alchemy_admin/components/node_select.js +1 -1
- data/app/javascript/alchemy_admin/components/overlay.js +6 -6
- data/app/javascript/alchemy_admin/components/page_select.js +3 -7
- data/app/javascript/alchemy_admin/components/preview_window.js +121 -0
- data/app/javascript/alchemy_admin/components/remote_select.js +4 -1
- data/app/javascript/alchemy_admin/components/select.js +37 -1
- data/app/javascript/alchemy_admin/components/tags_autocomplete.js +57 -0
- data/app/javascript/alchemy_admin/components/uploader/file_upload.js +4 -3
- data/app/javascript/alchemy_admin/components/uploader/progress.js +1 -1
- data/app/javascript/alchemy_admin/confirm_dialog.js +133 -0
- data/app/javascript/alchemy_admin/dirty.js +19 -14
- data/app/javascript/alchemy_admin/fixed_elements.js +24 -0
- data/app/javascript/alchemy_admin/growler.js +15 -0
- data/app/javascript/alchemy_admin/gui.js +2 -4
- data/app/javascript/alchemy_admin/hotkeys.js +60 -0
- data/app/javascript/alchemy_admin/image_loader.js +2 -2
- data/app/javascript/alchemy_admin/ingredient_anchor_link.js +2 -3
- data/app/javascript/alchemy_admin/initializer.js +1 -8
- data/app/javascript/alchemy_admin/link_dialog.js +131 -0
- data/app/javascript/alchemy_admin/locales/en.js +3 -0
- data/app/javascript/alchemy_admin/node_tree.js +4 -3
- data/app/javascript/alchemy_admin/page_sorter.js +23 -14
- data/app/javascript/alchemy_admin/picture_editors.js +3 -2
- data/app/javascript/alchemy_admin/shoelace_theme.js +60 -0
- data/app/javascript/alchemy_admin/sitemap.js +9 -3
- data/app/javascript/alchemy_admin/sortable_elements.js +4 -6
- data/app/javascript/alchemy_admin.js +18 -42
- data/app/models/alchemy/current.rb +26 -0
- data/app/models/alchemy/element.rb +1 -1
- data/app/models/alchemy/ingredients/headline.rb +8 -1
- data/app/models/alchemy/ingredients/picture.rb +6 -0
- data/app/models/alchemy/language.rb +8 -6
- data/app/models/alchemy/node.rb +2 -2
- data/app/models/alchemy/page/page_elements.rb +8 -8
- data/app/models/alchemy/page/page_layouts.rb +3 -3
- data/app/models/alchemy/page/page_natures.rb +13 -9
- data/app/models/alchemy/page/page_scopes.rb +2 -2
- data/app/models/alchemy/page/publisher.rb +1 -0
- data/app/models/alchemy/page.rb +13 -28
- data/app/models/alchemy/picture.rb +8 -0
- data/app/models/alchemy/picture_description.rb +8 -0
- data/app/models/alchemy/picture_variant.rb +1 -1
- data/app/models/alchemy/site.rb +10 -7
- data/app/serializers/alchemy/attachment_serializer.rb +8 -0
- data/app/serializers/alchemy/page_node_serializer.rb +9 -0
- data/app/views/alchemy/_menubar.html.erb +1 -1
- data/app/views/alchemy/_preview_mode_code.html.erb +1 -1
- data/app/views/alchemy/admin/attachments/_tag_list.html.erb +2 -2
- data/app/views/alchemy/admin/attachments/archive_overlay.js.erb +0 -1
- data/app/views/alchemy/admin/attachments/edit.html.erb +3 -4
- data/app/views/alchemy/admin/clipboard/clear.js.erb +1 -1
- data/app/views/alchemy/admin/clipboard/index.html.erb +1 -1
- data/app/views/alchemy/admin/clipboard/insert.js.erb +1 -1
- data/app/views/alchemy/admin/clipboard/remove.js.erb +1 -1
- data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb +1 -1
- data/app/views/alchemy/admin/dashboard/_sites.html.erb +1 -1
- data/app/views/alchemy/admin/dashboard/help.html.erb +48 -12
- data/app/views/alchemy/admin/dashboard/index.html.erb +1 -1
- data/app/views/alchemy/admin/dashboard/info.html.erb +5 -8
- data/app/views/alchemy/admin/elements/_add_nested_element_form.html.erb +1 -1
- data/app/views/alchemy/admin/elements/_element.html.erb +5 -5
- data/app/views/alchemy/admin/elements/_footer.html.erb +1 -1
- data/app/views/alchemy/admin/elements/_header.html.erb +6 -2
- data/app/views/alchemy/admin/elements/_toolbar.html.erb +8 -6
- data/app/views/alchemy/admin/elements/create.js.erb +0 -5
- data/app/views/alchemy/admin/elements/index.html.erb +70 -34
- data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +1 -2
- data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +3 -5
- data/app/views/alchemy/admin/languages/_language.html.erb +1 -1
- data/app/views/alchemy/admin/languages/index.html.erb +2 -2
- data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +18 -18
- data/app/views/alchemy/admin/layoutpages/edit.html.erb +3 -4
- data/app/views/alchemy/admin/layoutpages/index.html.erb +2 -2
- data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb +10 -11
- data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb +15 -17
- data/app/views/alchemy/admin/legacy_page_urls/_table.html.erb +16 -0
- data/app/views/alchemy/admin/legacy_page_urls/_update.turbo_stream.erb +12 -0
- data/app/views/alchemy/admin/legacy_page_urls/create.turbo_stream.erb +8 -0
- data/app/views/alchemy/admin/legacy_page_urls/destroy.turbo_stream.erb +1 -0
- data/app/views/alchemy/admin/legacy_page_urls/edit.html.erb +27 -0
- data/app/views/alchemy/admin/legacy_page_urls/show.html.erb +1 -0
- data/app/views/alchemy/admin/legacy_page_urls/update.turbo_stream.erb +1 -0
- data/app/views/alchemy/admin/nodes/_form.html.erb +12 -11
- data/app/views/alchemy/admin/nodes/_label.html.erb +1 -0
- data/app/views/alchemy/admin/nodes/_node.html.erb +19 -19
- data/app/views/alchemy/admin/nodes/_page_nodes.html.erb +48 -0
- data/app/views/alchemy/admin/nodes/_update.turbo_stream.erb +9 -0
- data/app/views/alchemy/admin/nodes/create.turbo_stream.erb +1 -0
- data/app/views/alchemy/admin/nodes/destroy.turbo_stream.erb +1 -0
- data/app/views/alchemy/admin/nodes/index.html.erb +3 -3
- data/app/views/alchemy/admin/pages/_form.html.erb +3 -4
- data/app/views/alchemy/admin/pages/_legacy_urls.html.erb +4 -15
- data/app/views/alchemy/admin/pages/_page.html.erb +39 -39
- data/app/views/alchemy/admin/pages/_table_row.html.erb +3 -3
- data/app/views/alchemy/admin/pages/_toolbar.html.erb +2 -2
- data/app/views/alchemy/admin/pages/configure.html.erb +6 -0
- data/app/views/alchemy/admin/pages/edit.html.erb +15 -62
- data/app/views/alchemy/admin/pages/unlock.js.erb +2 -2
- data/app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb +3 -1
- data/app/views/alchemy/admin/partials/_flash_notices.html.erb +4 -2
- data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +5 -2
- data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -2
- data/app/views/alchemy/admin/partials/_search_form.html.erb +2 -2
- data/app/views/alchemy/admin/partials/_site_select.html.erb +1 -1
- data/app/views/alchemy/admin/picture_descriptions/_form.html.erb +11 -0
- data/app/views/alchemy/admin/picture_descriptions/edit.html.erb +6 -0
- data/app/views/alchemy/admin/pictures/_form.html.erb +4 -3
- data/app/views/alchemy/admin/pictures/_infos.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_picture_description_field.html.erb +29 -0
- data/app/views/alchemy/admin/pictures/_tag_list.html.erb +2 -2
- data/app/views/alchemy/admin/pictures/archive_overlay.js.erb +0 -2
- data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +3 -3
- data/app/views/alchemy/admin/pictures/show.html.erb +3 -3
- data/app/views/alchemy/admin/resources/_form.html.erb +3 -4
- data/app/views/alchemy/admin/resources/_tag_list.html.erb +2 -2
- data/app/views/alchemy/admin/resources/index.html.erb +2 -2
- data/app/views/alchemy/admin/sites/index.html.erb +1 -1
- data/app/views/alchemy/admin/styleguide/index.html.erb +29 -24
- data/app/views/alchemy/admin/tags/_tag.html.erb +1 -1
- data/app/views/alchemy/admin/tags/edit.html.erb +1 -1
- data/app/views/alchemy/admin/tags/index.html.erb +1 -1
- data/app/views/alchemy/base/500.html.erb +7 -18
- data/app/views/alchemy/base/error_notice.html.erb +3 -1
- data/app/views/alchemy/ingredients/_boolean_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/_datetime_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/_headline_editor.html.erb +13 -8
- data/app/views/alchemy/ingredients/_picture_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +1 -1
- data/app/views/alchemy/language_links/_language.html.erb +1 -1
- data/app/views/kaminari/alchemy/_first_page.html.erb +2 -2
- data/app/views/kaminari/alchemy/_gap.html.erb +1 -1
- data/app/views/kaminari/alchemy/_last_page.html.erb +2 -2
- data/app/views/kaminari/alchemy/_next_page.html.erb +2 -2
- data/app/views/kaminari/alchemy/_prev_page.html.erb +2 -2
- data/app/views/layouts/alchemy/admin.html.erb +2 -1
- data/bundles/shoelace.js +3 -1
- data/config/locales/alchemy.en.yml +16 -3
- data/config/routes.rb +3 -1
- data/db/migrate/20240314105244_create_alchemy_picture_descriptions.rb +11 -0
- data/lib/alchemy/configuration_methods.rb +1 -1
- data/lib/alchemy/controller_actions.rb +3 -3
- data/lib/alchemy/element_definition.rb +10 -6
- data/lib/alchemy/engine.rb +19 -2
- data/lib/alchemy/page_layout.rb +10 -6
- data/lib/alchemy/permissions.rb +3 -2
- data/lib/alchemy/seeder.rb +2 -2
- data/lib/alchemy/test_support/capybara_helpers.rb +4 -0
- data/lib/alchemy/test_support/factories/language_factory.rb +1 -1
- data/lib/alchemy/test_support/shared_contexts.rb +8 -0
- data/lib/alchemy/tinymce.rb +2 -1
- data/lib/alchemy/version.rb +1 -1
- data/lib/alchemy.rb +36 -0
- data/lib/alchemy_cms.rb +0 -1
- data/lib/generators/alchemy/menus/templates/node.html.erb +2 -2
- data/lib/generators/alchemy/menus/templates/node.html.haml +2 -2
- data/lib/generators/alchemy/menus/templates/node.html.slim +2 -2
- data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
- data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
- data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
- data/lib/tasks/alchemy/sitemap.rake +97 -0
- data/package.json +8 -8
- data/vendor/assets/fonts/remixicon.symbol.svg +11 -0
- data/vendor/javascript/shoelace.min.js +333 -118
- data/vendor/javascript/sortable.min.js +1 -1
- data/vendor/javascript/tinymce.min.js +1 -1
- data/vendor/javascript/ungap-custom-elements.min.js +1 -1
- metadata +61 -54
- data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +0 -85
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +0 -107
- data/app/assets/javascripts/alchemy/alchemy.file_progress.js.coffee +0 -66
- data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +0 -45
- data/app/assets/javascripts/alchemy/alchemy.growler.js.coffee +0 -24
- data/app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee +0 -49
- data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee +0 -0
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +0 -230
- data/app/assets/javascripts/alchemy/alchemy.list_filter.js.coffee +0 -49
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +0 -82
- data/app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee +0 -11
- data/app/assets/javascripts/alchemy/templates/page.hbs +0 -19
- data/app/javascript/alchemy_admin/tags_autocomplete.js +0 -46
- data/app/models/alchemy/tree_node.rb +0 -7
- data/app/views/alchemy/admin/elements/destroy.js.erb +0 -8
- data/app/views/alchemy/admin/legacy_page_urls/_form.html.erb +0 -5
- data/app/views/alchemy/admin/legacy_page_urls/create.js.erb +0 -9
- data/app/views/alchemy/admin/legacy_page_urls/destroy.js.erb +0 -6
- data/app/views/alchemy/admin/legacy_page_urls/update.js.erb +0 -2
- data/app/views/alchemy/admin/pages/_anchor_link.html.erb +0 -22
- data/app/views/alchemy/admin/pages/_external_link.html.erb +0 -31
- data/app/views/alchemy/admin/pages/_file_link.html.erb +0 -31
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +0 -35
- data/app/views/alchemy/admin/pages/link.html.erb +0 -26
- data/app/views/alchemy/admin/partials/_flash.html.erb +0 -4
- data/app/views/alchemy/admin/partials/_toolbar_button.html.erb +0 -29
- data/vendor/assets/fonts/remixicon.eot +0 -0
- data/vendor/assets/fonts/remixicon.svg +0 -7816
- data/vendor/assets/fonts/remixicon.ttf +0 -0
- data/vendor/assets/fonts/remixicon.woff +0 -0
- data/vendor/assets/fonts/remixicon.woff2 +0 -0
- data/vendor/assets/stylesheets/remixicon.scss +0 -10480
@@ -0,0 +1,11 @@
|
|
1
|
+
<% field_name_prefix = "picture[descriptions_attributes][#{picture_description_counter}]" %>
|
2
|
+
|
3
|
+
<% if picture_description.persisted? %>
|
4
|
+
<%= hidden_field field_name_prefix, :id, value: picture_description.id %>
|
5
|
+
<% else %>
|
6
|
+
<%= hidden_field field_name_prefix, :language_id, value: picture_description.language_id %>
|
7
|
+
<%= hidden_field field_name_prefix, :picture_id, value: picture_description.picture_id %>
|
8
|
+
<% end %>
|
9
|
+
|
10
|
+
<%= label field_name_prefix, :text, Alchemy::PictureDescription.human_attribute_name(:text), class: "control-label" %>
|
11
|
+
<%= text_area field_name_prefix, :text, value: picture_description.text, rows: 3 %>
|
@@ -1,10 +1,11 @@
|
|
1
1
|
<%= alchemy_form_for [:admin, @picture] do |f| %>
|
2
2
|
<%= f.input :name %>
|
3
|
-
|
3
|
+
<%= render "picture_description_field", f: f %>
|
4
|
+
<%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
|
4
5
|
<%= f.label :tag_list %>
|
5
|
-
<%=
|
6
|
+
<%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
|
6
7
|
<small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
|
7
|
-
|
8
|
+
<% end %>
|
8
9
|
<%= hidden_field_tag :q, search_filter_params[:q] %>
|
9
10
|
<%= hidden_field_tag :size, @size %>
|
10
11
|
<%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
|
@@ -35,7 +35,7 @@
|
|
35
35
|
<% page_link = link_to element.display_name_with_preview_text,
|
36
36
|
edit_admin_page_path(page, anchor: "element_#{element.id}") %>
|
37
37
|
<% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
|
38
|
-
<%= render_icon('draggable', style:
|
38
|
+
<%= render_icon('draggable', style: false) %>
|
39
39
|
<p>
|
40
40
|
<%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
|
41
41
|
</p>
|
@@ -0,0 +1,29 @@
|
|
1
|
+
<div class="input">
|
2
|
+
<% if Alchemy::Language.published.many? %>
|
3
|
+
<label class="inline-label" style="float: right">
|
4
|
+
<%= Alchemy::Language.model_name.human %>
|
5
|
+
<%= select_tag :language_id, options_from_collection_for_select(
|
6
|
+
Alchemy::Language.published, :id, ->(l) { l.code.upcase },
|
7
|
+
selected: @picture_description.language_id,
|
8
|
+
), data: {
|
9
|
+
url: alchemy.edit_admin_picture_description_url(id: "__ID__", picture_id: @picture)
|
10
|
+
} %>
|
11
|
+
</label>
|
12
|
+
<% end %>
|
13
|
+
|
14
|
+
<turbo-frame id="picture_descriptions">
|
15
|
+
<%= render "alchemy/admin/picture_descriptions/form",
|
16
|
+
picture_description_counter: @picture.descriptions.index(@picture_description),
|
17
|
+
picture_description: @picture_description %>
|
18
|
+
</turbo-frame>
|
19
|
+
</div>
|
20
|
+
|
21
|
+
<script type="module">
|
22
|
+
const select = document.querySelector("#language_id")
|
23
|
+
|
24
|
+
select.addEventListener("change", () => {
|
25
|
+
const url = new URL(select.dataset.url)
|
26
|
+
url.searchParams.set("language_id", select.value)
|
27
|
+
Turbo.visit(url, { frame: "picture_descriptions" })
|
28
|
+
})
|
29
|
+
</script>
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<% if Alchemy::Picture.tag_counts.any? %>
|
2
2
|
<h3><%= Alchemy.t("Filter by tag") %></h3>
|
3
|
-
<%=
|
3
|
+
<%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
|
4
4
|
<ul>
|
5
5
|
<%= render_tag_list('Alchemy::Picture') %>
|
6
6
|
</ul>
|
7
7
|
<% if search_filter_params[:tagged_with].present? %>
|
8
8
|
<%= link_to(
|
9
|
-
render_icon(:close) + Alchemy.t('Remove tag filter'),
|
9
|
+
render_icon(:close, size: '1x') + Alchemy.t('Remove tag filter'),
|
10
10
|
url_for(search_filter_params.except(:tagged_with)),
|
11
11
|
remote: request.xhr?,
|
12
12
|
class: 'secondary button small with_icon'
|
@@ -17,11 +17,11 @@
|
|
17
17
|
<%= text_field_tag :pictures_name %>
|
18
18
|
</div>
|
19
19
|
|
20
|
-
|
20
|
+
<%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
|
21
21
|
<%= label_tag :pictures_tag_list, Alchemy.t(:tags), class: 'control-label' %>
|
22
|
-
<%= text_field_tag :pictures_tag_list, @tags
|
22
|
+
<%= text_field_tag :pictures_tag_list, @tags %>
|
23
23
|
<small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
|
24
|
-
|
24
|
+
<% end %>
|
25
25
|
|
26
26
|
<div class="submit">
|
27
27
|
<%= button_tag Alchemy.t(:save), name: nil, class: 'button' %>
|
@@ -14,7 +14,7 @@
|
|
14
14
|
),
|
15
15
|
class: "previous-picture",
|
16
16
|
remote: true do %>
|
17
|
-
|
17
|
+
<%= render_icon "arrow-left-wide", size: "xl" %>
|
18
18
|
<% end %>
|
19
19
|
<% end %>
|
20
20
|
<% if @next %>
|
@@ -28,7 +28,7 @@
|
|
28
28
|
),
|
29
29
|
class: "next-picture",
|
30
30
|
remote: true do %>
|
31
|
-
|
31
|
+
<%= render_icon "arrow-right-wide", size: "xl" %>
|
32
32
|
<% end %>
|
33
33
|
<% end %>
|
34
34
|
</div>
|
@@ -39,5 +39,5 @@
|
|
39
39
|
</div>
|
40
40
|
|
41
41
|
<div class="picture-overlay-handle">
|
42
|
-
|
42
|
+
<%= render_icon "contract-right" %>
|
43
43
|
</div>
|
@@ -18,10 +18,9 @@
|
|
18
18
|
<% end %>
|
19
19
|
<% end %>
|
20
20
|
<% if f.object.respond_to?(:tag_list) %>
|
21
|
-
|
22
|
-
<%= f.
|
23
|
-
|
24
|
-
</div>
|
21
|
+
<%= render Alchemy::Admin::TagsAutocomplete.new do %>
|
22
|
+
<%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
|
23
|
+
<% end %>
|
25
24
|
<% end %>
|
26
25
|
<%= f.submit Alchemy.t(:save) %>
|
27
26
|
<% end %>
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<div class="tag-list<%= ' with_filter_bar' if resource_has_filters %><%= ' filtered' if search_filter_params[:tagged_with].present? %>">
|
2
2
|
<h3><%= Alchemy.t("Filter by tag") %></h3>
|
3
|
-
<%=
|
3
|
+
<%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
|
4
4
|
<ul>
|
5
5
|
<%= render_tag_list(resource_model.name) %>
|
6
6
|
</ul>
|
7
7
|
<% if search_filter_params[:tagged_with].present? %>
|
8
8
|
<%= link_to(
|
9
|
-
render_icon(:times, size: '
|
9
|
+
render_icon(:times, size: '1x') + Alchemy.t('Remove tag filter'),
|
10
10
|
url_for(search_filter_params.except(:tagged_with)),
|
11
11
|
remote: request.xhr?,
|
12
12
|
class: 'secondary button small with_icon'
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
<% content_for(:toolbar) do %>
|
4
4
|
<div class="toolbar_buttons">
|
5
|
-
<%=
|
5
|
+
<%= render Alchemy::Admin::ToolbarButton.new(
|
6
6
|
icon: "add",
|
7
7
|
label: label_title,
|
8
8
|
url: new_resource_path,
|
@@ -15,7 +15,7 @@
|
|
15
15
|
},
|
16
16
|
if_permitted_to: [:create, resource_model]
|
17
17
|
) %>
|
18
|
-
<%=
|
18
|
+
<%= render Alchemy::Admin::ToolbarButton.new(
|
19
19
|
icon: :download,
|
20
20
|
url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
|
21
21
|
label: Alchemy.t(:download_csv),
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<% end %>
|
8
8
|
|
9
9
|
<% content_for(:toolbar) do %>
|
10
|
-
<%=
|
10
|
+
<%= render Alchemy::Admin::ToolbarButton.new(
|
11
11
|
icon: :info,
|
12
12
|
label: 'Info',
|
13
13
|
url: alchemy.dashboard_info_path,
|
@@ -38,13 +38,13 @@
|
|
38
38
|
<h3>Info Message</h3>
|
39
39
|
|
40
40
|
<%= render_message do %>
|
41
|
-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
|
41
|
+
<p>Lorem ipsum <strong>dolor</strong> sit amet, consectetur adipiscing elit.</p>
|
42
42
|
<% end %>
|
43
43
|
|
44
44
|
<h3>Warning Message</h3>
|
45
45
|
|
46
46
|
<%= render_message :warning do %>
|
47
|
-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
|
47
|
+
<p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
|
48
48
|
<% end %>
|
49
49
|
|
50
50
|
<h3>Error Message</h3>
|
@@ -53,27 +53,32 @@
|
|
53
53
|
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
|
54
54
|
<% end %>
|
55
55
|
|
56
|
+
<h3>Growl Messages</h3>
|
57
|
+
|
58
|
+
<%= link_to render_icon(:check), 'javascript:Alchemy.growl("Success message")', class: "icon_button" %>
|
59
|
+
<%= link_to render_icon(:info), 'javascript:Alchemy.growl("Info message", "info")', class: "icon_button" %>
|
60
|
+
<%= link_to render_icon(:alert), 'javascript:Alchemy.growl("Warning message", "warn")', class: "icon_button" %>
|
61
|
+
<%= link_to render_icon(:bug), 'javascript:Alchemy.growl("Error message", "error")', class: "icon_button" %>
|
62
|
+
|
56
63
|
<h2>Dialog Links</h2>
|
57
64
|
|
58
|
-
<
|
59
|
-
<sl-tooltip content="Open in Dialog">
|
60
|
-
<a
|
61
|
-
href="/admin/styleguide"
|
62
|
-
is="alchemy-dialog-link"
|
63
|
-
class="icon_button"
|
64
|
-
data-dialog-options="{"size":"800x600","title":"Styleguide in Dialog"}"
|
65
|
-
>
|
66
|
-
<i class="icon ri-window-line"></i>
|
67
|
-
</a>
|
68
|
-
</sl-tooltip>
|
65
|
+
<sl-tooltip content="Open in Dialog">
|
69
66
|
<a
|
70
|
-
href="
|
67
|
+
href="/admin/styleguide"
|
71
68
|
is="alchemy-dialog-link"
|
72
|
-
class="icon_button
|
69
|
+
class="icon_button"
|
70
|
+
data-dialog-options="{"size":"800x600","title":"Styleguide in Dialog"}"
|
73
71
|
>
|
74
|
-
|
72
|
+
<%= render_icon "window" %>
|
75
73
|
</a>
|
76
|
-
</
|
74
|
+
</sl-tooltip>
|
75
|
+
<a
|
76
|
+
href="#"
|
77
|
+
is="alchemy-dialog-link"
|
78
|
+
class="icon_button disabled"
|
79
|
+
>
|
80
|
+
<%= render_icon "window" %>
|
81
|
+
</a>
|
77
82
|
|
78
83
|
<h2>Forms</h2>
|
79
84
|
|
@@ -213,33 +218,33 @@
|
|
213
218
|
</tr>
|
214
219
|
<tr class="even">
|
215
220
|
<td class="icon">
|
216
|
-
|
221
|
+
<%= render_icon "user" %>
|
217
222
|
</td>
|
218
223
|
<td>Even table cell 1</td>
|
219
224
|
<td>Even table cell 2</td>
|
220
225
|
<td>Even table cell 3</td>
|
221
226
|
<td class="tools">
|
222
227
|
<a href="#" class="icon_button">
|
223
|
-
|
228
|
+
<%= render_icon "delete-bin-2" %>
|
224
229
|
</a>
|
225
230
|
<a href="#" class="icon_button">
|
226
|
-
|
231
|
+
<%= render_icon "edit" %>
|
227
232
|
</a>
|
228
233
|
</td>
|
229
234
|
</tr>
|
230
235
|
<tr class="odd">
|
231
236
|
<td class="icon">
|
232
|
-
|
237
|
+
<%= render_icon "user", style: "fill" %>
|
233
238
|
</td>
|
234
239
|
<td>Odd table cell 1</td>
|
235
240
|
<td>Odd table cell 2</td>
|
236
241
|
<td>Odd table cell 3</td>
|
237
242
|
<td class="tools">
|
238
243
|
<a href="#" class="icon_button">
|
239
|
-
|
244
|
+
<%= render_icon "delete-bin-2" %>
|
240
245
|
</a>
|
241
246
|
<a href="#" class="icon_button">
|
242
|
-
|
247
|
+
<%= render_icon "edit" %>
|
243
248
|
</a>
|
244
249
|
</td>
|
245
250
|
</tr>
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<div class="input tags">
|
14
14
|
<label class="control-label"><%= Alchemy.t('Tags') %></label>
|
15
15
|
<div class="control_group" id="tags_tag_list">
|
16
|
-
<%=
|
16
|
+
<%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
|
17
17
|
<ul class="tags tag-list">
|
18
18
|
<%= render partial: "radio_tag", collection: @tags, locals: {name: "tag"} %>
|
19
19
|
</ul>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<%= content_for :toolbar do %>
|
2
|
-
<%=
|
2
|
+
<%= render Alchemy::Admin::ToolbarButton.new(
|
3
3
|
icon: 'angle-double-left',
|
4
4
|
url: request.referer || alchemy.admin_dashboard_path,
|
5
5
|
label: Alchemy.t(:back),
|
@@ -18,21 +18,10 @@
|
|
18
18
|
<%= @error.class %>
|
19
19
|
<%= @notice %>
|
20
20
|
</h2>
|
21
|
-
<
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
<%= Alchemy.t('Show error details') %>
|
28
|
-
</a>
|
21
|
+
<details>
|
22
|
+
<summary><%= Alchemy.t('Show error details') %></summary>
|
23
|
+
<% @trace.each do |line| %>
|
24
|
+
<%= line %><br>
|
25
|
+
<% end %>
|
26
|
+
</details>
|
29
27
|
<% end %>
|
30
|
-
|
31
|
-
<script>
|
32
|
-
$(function(){
|
33
|
-
$('.error_details--toggle').on("click", function(){
|
34
|
-
$('.error.message p').toggleClass('hidden');
|
35
|
-
return false;
|
36
|
-
});
|
37
|
-
});
|
38
|
-
</script>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= f.label :value, style: "display: inline-block", for: nil do %>
|
6
6
|
<%= f.check_box :value, id: nil %>
|
7
7
|
<%= render_ingredient_role(boolean_editor) %>
|
8
|
-
<%= render_hint_for(boolean_editor, size: "
|
8
|
+
<%= render_hint_for(boolean_editor, size: "1x", fixed_width: false) %>
|
9
9
|
<% end %>
|
10
10
|
<% end %>
|
11
11
|
<% end %>
|
@@ -12,20 +12,25 @@
|
|
12
12
|
<%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>
|
13
13
|
<% end %>
|
14
14
|
|
15
|
-
|
16
|
-
<
|
15
|
+
<div class="input-addon right<%= " second" if has_size_select %>">
|
16
|
+
<sl-tooltip content="<%= f.object.class.human_attribute_name(:level) %>">
|
17
17
|
<%= f.select :level,
|
18
18
|
options_for_select(headline_editor.level_options, headline_editor.level),
|
19
19
|
{},
|
20
|
-
{
|
21
|
-
|
22
|
-
|
20
|
+
{
|
21
|
+
class: "custom-select",
|
22
|
+
disabled: !has_level_select
|
23
|
+
} %>
|
24
|
+
</sl-tooltip>
|
25
|
+
</div>
|
23
26
|
|
24
27
|
<% if has_size_select %>
|
25
28
|
<div class="input-addon right">
|
26
|
-
<%= f.
|
27
|
-
|
28
|
-
|
29
|
+
<sl-tooltip content="<%= f.object.class.human_attribute_name(:size) %>">
|
30
|
+
<%= f.select :size, options_for_select(headline_editor.size_options, headline_editor.size),
|
31
|
+
{},
|
32
|
+
{ class: "custom-select" } %>
|
33
|
+
</sl-tooltip>
|
29
34
|
</div>
|
30
35
|
<% end %>
|
31
36
|
<% end %>
|
@@ -41,7 +41,7 @@
|
|
41
41
|
|
42
42
|
<%= content_tag "sl-tooltip", content: Alchemy.t(:edit_image_properties), placement: "top-end" do %>
|
43
43
|
<%= link_to_dialog render_icon(:edit),
|
44
|
-
alchemy.edit_admin_ingredient_path(id: picture_editor.id),
|
44
|
+
alchemy.edit_admin_ingredient_path(id: picture_editor.id, language_id: @page.language_id),
|
45
45
|
{
|
46
46
|
title: Alchemy.t(:edit_image_properties),
|
47
47
|
size: "380x255"
|
@@ -6,7 +6,7 @@
|
|
6
6
|
),
|
7
7
|
class: [
|
8
8
|
language.code,
|
9
|
-
Alchemy::
|
9
|
+
Alchemy::Current.language.id == language.id ? 'active' : nil,
|
10
10
|
languages.first == language ? 'first' : nil,
|
11
11
|
languages.last == language ? 'last' : nil
|
12
12
|
].compact,
|
@@ -8,10 +8,10 @@
|
|
8
8
|
-%>
|
9
9
|
<% if current_page.first? %>
|
10
10
|
<span class="first-page disabled">
|
11
|
-
|
11
|
+
<%= render_icon("skip-left") %>
|
12
12
|
</span>
|
13
13
|
<% else %>
|
14
14
|
<%= link_to url, remote: remote, title: Alchemy.t(:first, scope: 'pagination'), class: 'first-page' do %>
|
15
|
-
|
15
|
+
<%= render_icon("skip-left") %>
|
16
16
|
<% end %>
|
17
17
|
<% end %>
|
@@ -8,10 +8,10 @@
|
|
8
8
|
-%>
|
9
9
|
<% if current_page.last? %>
|
10
10
|
<span class="last-page disabled">
|
11
|
-
|
11
|
+
<%= render_icon("skip-right") %>
|
12
12
|
</span>
|
13
13
|
<% else %>
|
14
14
|
<%= link_to url, remote: remote, title: Alchemy.t(:last, scope: 'pagination'), class: 'last-page' do %>
|
15
|
-
|
15
|
+
<%= render_icon("skip-right") %>
|
16
16
|
<% end %>
|
17
17
|
<% end %>
|
@@ -8,10 +8,10 @@
|
|
8
8
|
-%>
|
9
9
|
<% if current_page.last? -%>
|
10
10
|
<span class="next_page disabled">
|
11
|
-
|
11
|
+
<%= render_icon("arrow-right-s") %>
|
12
12
|
</span>
|
13
13
|
<% else -%>
|
14
14
|
<%= link_to url, rel: 'next', remote: remote, title: Alchemy.t(:next_page, scope: 'pagination'), class: 'next_page' do %>
|
15
|
-
|
15
|
+
<%= render_icon("arrow-right-s") %>
|
16
16
|
<% end %>
|
17
17
|
<% end -%>
|
@@ -8,10 +8,10 @@
|
|
8
8
|
-%>
|
9
9
|
<% if current_page.first? -%>
|
10
10
|
<span class="previous_page disabled">
|
11
|
-
|
11
|
+
<%= render_icon("arrow-left-s") %>
|
12
12
|
</span>
|
13
13
|
<% else -%>
|
14
14
|
<%= link_to url, rel: 'prev', remote: remote, class: 'previous_page', title: Alchemy.t(:previous_page, scope: 'pagination') do %>
|
15
|
-
|
15
|
+
<%= render_icon("arrow-left-s") %>
|
16
16
|
<% end %>
|
17
17
|
<% end -%>
|
@@ -7,6 +7,7 @@
|
|
7
7
|
<link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
|
8
8
|
<%= csrf_meta_tag %>
|
9
9
|
<meta name="robots" content="noindex">
|
10
|
+
<meta name="alchemy-icon-sprite" content="<%= asset_path("remixicon.symbol.svg") %>">
|
10
11
|
<%= stylesheet_link_tag('alchemy/admin/all', media: 'screen', 'data-turbo-track' => true) %>
|
11
12
|
<%= stylesheet_link_tag('alchemy/print', media: 'print', 'data-turbo-track' => true) %>
|
12
13
|
<%= yield :stylesheets %>
|
@@ -55,7 +56,7 @@
|
|
55
56
|
}, {'data-alchemy-hotkey' => 'alt+q'}) %>
|
56
57
|
<% else %>
|
57
58
|
<%= link_to(alchemy.root_path) do %>
|
58
|
-
|
59
|
+
<%= render_icon "logout-box-r", size: "lg" %>
|
59
60
|
<label><%= Alchemy.t(:leave) %></label>
|
60
61
|
<% end %>
|
61
62
|
<% end %>
|
data/bundles/shoelace.js
CHANGED
@@ -6,5 +6,7 @@ import "@shoelace-style/shoelace/dist/components/tab-group/tab-group.js"
|
|
6
6
|
import "@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js"
|
7
7
|
import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"
|
8
8
|
import "@shoelace-style/shoelace/dist/components/progress-bar/progress-bar.js"
|
9
|
+
import "@shoelace-style/shoelace/dist/components/dialog/dialog.js"
|
10
|
+
import { registerIconLibrary } from "@shoelace-style/shoelace/dist/utilities/icon-library.js"
|
9
11
|
import { setDefaultAnimation } from "@shoelace-style/shoelace/dist/utilities/animation-registry.js"
|
10
|
-
export { setDefaultAnimation }
|
12
|
+
export { registerIconLibrary, setDefaultAnimation }
|