alchemy_cms 5.2.5 → 6.0.0.b1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +6 -14
- data/.gitignore +0 -1
- data/.hound.yml +1 -1
- data/.rubocop.yml +46 -4
- data/CHANGELOG.md +80 -29
- data/Gemfile +4 -2
- data/README.md +5 -2
- data/alchemy_cms.gemspec +78 -65
- data/app/assets/javascripts/alchemy/admin.js +0 -2
- data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +0 -27
- data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +2 -1
- data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +0 -25
- data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -0
- data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +1 -1
- data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
- data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +40 -27
- data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
- data/app/assets/stylesheets/alchemy/admin.scss +1 -1
- data/app/assets/stylesheets/alchemy/archive.scss +4 -4
- data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
- data/app/assets/stylesheets/alchemy/elements.scss +73 -61
- data/app/assets/stylesheets/alchemy/images.scss +8 -0
- data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
- data/app/assets/stylesheets/alchemy/page-select.scss +1 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
- data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
- data/app/controllers/alchemy/admin/attachments_controller.rb +6 -2
- data/app/controllers/alchemy/admin/base_controller.rb +5 -7
- data/app/controllers/alchemy/admin/elements_controller.rb +58 -34
- data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
- data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
- data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
- data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
- data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
- data/app/controllers/alchemy/admin/pages_controller.rb +6 -13
- data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
- data/app/controllers/alchemy/api/elements_controller.rb +10 -5
- data/app/controllers/alchemy/api/pages_controller.rb +2 -4
- data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
- data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
- data/app/decorators/alchemy/element_editor.rb +23 -1
- data/app/decorators/alchemy/ingredient_editor.rb +154 -0
- data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
- data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
- data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
- data/app/helpers/alchemy/elements_block_helper.rb +22 -7
- data/app/helpers/alchemy/elements_helper.rb +12 -5
- data/app/helpers/alchemy/pages_helper.rb +3 -11
- data/app/jobs/alchemy/base_job.rb +11 -0
- data/app/jobs/alchemy/publish_page_job.rb +11 -0
- data/app/models/alchemy/attachment.rb +1 -1
- data/app/models/alchemy/content/factory.rb +23 -27
- data/app/models/alchemy/content.rb +1 -6
- data/app/models/alchemy/element/definitions.rb +29 -27
- data/app/models/alchemy/element/element_contents.rb +131 -122
- data/app/models/alchemy/element/element_essences.rb +100 -98
- data/app/models/alchemy/element/element_ingredients.rb +176 -0
- data/app/models/alchemy/element/presenters.rb +89 -87
- data/app/models/alchemy/element.rb +40 -73
- data/app/models/alchemy/elements_repository.rb +126 -0
- data/app/models/alchemy/essence_audio.rb +12 -0
- data/app/models/alchemy/essence_headline.rb +40 -0
- data/app/models/alchemy/essence_picture.rb +4 -116
- data/app/models/alchemy/essence_richtext.rb +12 -0
- data/app/models/alchemy/essence_video.rb +12 -0
- data/app/models/alchemy/image_cropper_settings.rb +87 -0
- data/app/models/alchemy/ingredient.rb +219 -0
- data/app/models/alchemy/ingredient_validator.rb +97 -0
- data/app/models/alchemy/ingredients/audio.rb +29 -0
- data/app/models/alchemy/ingredients/boolean.rb +21 -0
- data/app/models/alchemy/ingredients/datetime.rb +20 -0
- data/app/models/alchemy/ingredients/file.rb +30 -0
- data/app/models/alchemy/ingredients/headline.rb +42 -0
- data/app/models/alchemy/ingredients/html.rb +19 -0
- data/app/models/alchemy/ingredients/link.rb +16 -0
- data/app/models/alchemy/ingredients/node.rb +23 -0
- data/app/models/alchemy/ingredients/page.rb +23 -0
- data/app/models/alchemy/ingredients/picture.rb +41 -0
- data/app/models/alchemy/ingredients/richtext.rb +57 -0
- data/app/models/alchemy/ingredients/select.rb +10 -0
- data/app/models/alchemy/ingredients/text.rb +17 -0
- data/app/models/alchemy/ingredients/video.rb +33 -0
- data/app/models/alchemy/language.rb +0 -11
- data/app/models/alchemy/node.rb +1 -1
- data/app/models/alchemy/page/fixed_attributes.rb +53 -51
- data/app/models/alchemy/page/page_elements.rb +186 -205
- data/app/models/alchemy/page/page_naming.rb +66 -64
- data/app/models/alchemy/page/page_natures.rb +139 -142
- data/app/models/alchemy/page/page_scopes.rb +113 -102
- data/app/models/alchemy/page/publisher.rb +50 -0
- data/app/models/alchemy/page/url_path.rb +1 -1
- data/app/models/alchemy/page.rb +67 -33
- data/app/models/alchemy/page_version.rb +58 -0
- data/app/models/alchemy/picture/calculations.rb +2 -8
- data/app/models/alchemy/picture/preprocessor.rb +2 -0
- data/app/models/alchemy/picture/transformations.rb +24 -96
- data/app/models/alchemy/picture.rb +4 -2
- data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
- data/app/models/concerns/alchemy/touch_elements.rb +2 -2
- data/app/presenters/alchemy/picture_view.rb +88 -0
- data/app/serializers/alchemy/element_serializer.rb +5 -0
- data/app/serializers/alchemy/page_tree_serializer.rb +3 -2
- data/app/services/alchemy/delete_elements.rb +44 -0
- data/app/services/alchemy/duplicate_element.rb +56 -0
- data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
- data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
- data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
- data/app/views/alchemy/admin/crop.html.erb +36 -0
- data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
- data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
- data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
- data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
- data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
- data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
- data/app/views/alchemy/admin/elements/new.html.erb +3 -3
- data/app/views/alchemy/admin/elements/order.js.erb +0 -17
- data/app/views/alchemy/admin/elements/update.js.erb +3 -2
- data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
- data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
- data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
- data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
- data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
- data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
- data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
- data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
- data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
- data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
- data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_form.html.erb +0 -6
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
- data/app/views/alchemy/admin/pages/edit.html.erb +36 -24
- data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
- data/app/views/alchemy/admin/partials/_routes.html.erb +7 -11
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
- data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
- data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
- data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
- data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
- data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
- data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
- data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
- data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
- data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
- data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
- data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
- data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
- data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
- data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
- data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
- data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
- data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
- data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
- data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
- data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
- data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
- data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
- data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
- data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
- data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
- data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
- data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
- data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
- data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
- data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
- data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
- data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
- data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
- data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
- data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
- data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
- data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
- data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
- data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
- data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
- data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
- data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
- data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
- data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
- data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
- data/config/brakeman.ignore +66 -159
- data/config/initializers/dragonfly.rb +10 -0
- data/config/locales/alchemy.en.yml +23 -15
- data/config/routes.rb +17 -22
- data/db/migrate/20201207131309_create_page_versions.rb +19 -0
- data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
- data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
- data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
- data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
- data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
- data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
- data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
- data/lib/alchemy/admin/preview_url.rb +2 -0
- data/lib/alchemy/deprecation.rb +1 -1
- data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
- data/lib/alchemy/dragonfly/processors/crop_resize.rb +35 -0
- data/lib/alchemy/elements_finder.rb +14 -60
- data/lib/alchemy/engine.rb +1 -1
- data/lib/alchemy/essence.rb +1 -2
- data/lib/alchemy/hints.rb +8 -4
- data/lib/alchemy/page_layout.rb +0 -13
- data/lib/alchemy/permissions.rb +30 -29
- data/lib/alchemy/resource.rb +13 -3
- data/lib/alchemy/tasks/tidy.rb +29 -0
- data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
- data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
- data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
- data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
- data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
- data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
- data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
- data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
- data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
- data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
- data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
- data/lib/alchemy/test_support.rb +2 -11
- data/lib/alchemy/tinymce.rb +17 -0
- data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
- data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
- data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
- data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
- data/lib/alchemy/version.rb +1 -1
- data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
- data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
- data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
- data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
- data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
- data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
- data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
- data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
- data/lib/generators/alchemy/install/install_generator.rb +1 -2
- data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
- data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
- data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
- data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
- 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/tidy.rake +12 -0
- data/lib/tasks/alchemy/upgrade.rake +21 -15
- data/package/admin.js +9 -1
- data/package/src/file_editors.js +28 -0
- data/package/src/image_cropper.js +103 -0
- data/package/src/image_loader.js +58 -0
- data/package/src/node_tree.js +5 -5
- data/package/src/picture_editors.js +169 -0
- data/package/src/utils/__tests__/ajax.spec.js +20 -12
- data/package/src/utils/ajax.js +8 -3
- data/package.json +3 -2
- data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
- data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
- metadata +285 -56
- data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
- data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
- data/app/assets/stylesheets/alchemy/trash.scss +0 -8
- data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
- data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
- data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
- data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
- data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
- data/app/views/alchemy/admin/trash/index.html.erb +0 -31
- data/lib/alchemy/test_support/factories.rb +0 -20
@@ -10,7 +10,7 @@ module Alchemy
|
|
10
10
|
#
|
11
11
|
module TouchElements
|
12
12
|
def self.included(base)
|
13
|
-
base.
|
13
|
+
base.after_update(:touch_elements)
|
14
14
|
end
|
15
15
|
|
16
16
|
private
|
@@ -18,7 +18,7 @@ module Alchemy
|
|
18
18
|
def touch_elements
|
19
19
|
return unless respond_to?(:elements)
|
20
20
|
|
21
|
-
elements.
|
21
|
+
elements.touch_all
|
22
22
|
end
|
23
23
|
end
|
24
24
|
end
|
@@ -0,0 +1,88 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Alchemy
|
4
|
+
# Renders a picture ingredient view
|
5
|
+
class PictureView
|
6
|
+
include ActionView::Helpers::AssetTagHelper
|
7
|
+
include ActionView::Helpers::UrlHelper
|
8
|
+
include Rails.application.routes.url_helpers
|
9
|
+
|
10
|
+
attr_reader :ingredient, :html_options, :options, :picture
|
11
|
+
|
12
|
+
DEFAULT_OPTIONS = {
|
13
|
+
show_caption: true,
|
14
|
+
disable_link: false,
|
15
|
+
srcset: [],
|
16
|
+
sizes: [],
|
17
|
+
}.with_indifferent_access
|
18
|
+
|
19
|
+
def initialize(ingredient, options = {}, html_options = {})
|
20
|
+
@ingredient = ingredient
|
21
|
+
@options = DEFAULT_OPTIONS.merge(ingredient.settings).merge(options || {})
|
22
|
+
@html_options = html_options || {}
|
23
|
+
@picture = ingredient.picture
|
24
|
+
end
|
25
|
+
|
26
|
+
def render
|
27
|
+
return if picture.blank?
|
28
|
+
|
29
|
+
output = caption ? img_tag + caption : img_tag
|
30
|
+
|
31
|
+
if is_linked?
|
32
|
+
output = link_to(output, url_for(ingredient.link), {
|
33
|
+
title: ingredient.link_title.presence,
|
34
|
+
target: ingredient.link_target == "blank" ? "_blank" : nil,
|
35
|
+
data: { link_target: ingredient.link_target.presence },
|
36
|
+
})
|
37
|
+
end
|
38
|
+
|
39
|
+
if caption
|
40
|
+
content_tag(:figure, output, { class: ingredient.css_class.presence }.merge(html_options))
|
41
|
+
else
|
42
|
+
output
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
def caption
|
47
|
+
return unless show_caption?
|
48
|
+
|
49
|
+
@_caption ||= content_tag(:figcaption, ingredient.caption)
|
50
|
+
end
|
51
|
+
|
52
|
+
def src
|
53
|
+
ingredient.picture_url(options.except(*DEFAULT_OPTIONS.keys))
|
54
|
+
end
|
55
|
+
|
56
|
+
def img_tag
|
57
|
+
@_img_tag ||= image_tag(
|
58
|
+
src, {
|
59
|
+
alt: alt_text,
|
60
|
+
title: ingredient.title.presence,
|
61
|
+
class: caption ? nil : ingredient.css_class.presence,
|
62
|
+
srcset: srcset.join(", ").presence,
|
63
|
+
sizes: options[:sizes].join(", ").presence,
|
64
|
+
}.merge(caption ? {} : html_options)
|
65
|
+
)
|
66
|
+
end
|
67
|
+
|
68
|
+
def show_caption?
|
69
|
+
options[:show_caption] && ingredient.caption.present?
|
70
|
+
end
|
71
|
+
|
72
|
+
def is_linked?
|
73
|
+
!options[:disable_link] && ingredient.link.present?
|
74
|
+
end
|
75
|
+
|
76
|
+
def srcset
|
77
|
+
options[:srcset].map do |size|
|
78
|
+
url = ingredient.picture_url(size: size)
|
79
|
+
width, height = size.split("x")
|
80
|
+
width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
def alt_text
|
85
|
+
ingredient.alt_tag.presence || html_options.delete(:alt) || ingredient.picture.name&.humanize
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
@@ -6,6 +6,7 @@ module Alchemy
|
|
6
6
|
:name,
|
7
7
|
:position,
|
8
8
|
:page_id,
|
9
|
+
:page_version_id,
|
9
10
|
:tag_list,
|
10
11
|
:created_at,
|
11
12
|
:updated_at,
|
@@ -23,5 +24,9 @@ module Alchemy
|
|
23
24
|
def display_name
|
24
25
|
object.display_name_with_preview_text
|
25
26
|
end
|
27
|
+
|
28
|
+
def page_id
|
29
|
+
object.page.id
|
30
|
+
end
|
26
31
|
end
|
27
32
|
end
|
@@ -83,10 +83,11 @@ module Alchemy
|
|
83
83
|
end
|
84
84
|
|
85
85
|
def page_elements(page)
|
86
|
+
elements = page.public_version&.elements || Alchemy::Element.none
|
86
87
|
if opts[:elements] == "true"
|
87
|
-
|
88
|
+
elements
|
88
89
|
else
|
89
|
-
|
90
|
+
elements.named(opts[:elements].split(",") || [])
|
90
91
|
end
|
91
92
|
end
|
92
93
|
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Alchemy
|
4
|
+
class DeleteElements
|
5
|
+
class WouldLeaveOrphansError < StandardError; end
|
6
|
+
attr_reader :elements
|
7
|
+
|
8
|
+
def initialize(elements)
|
9
|
+
@elements = elements
|
10
|
+
end
|
11
|
+
|
12
|
+
def call
|
13
|
+
if orphanable_records.present?
|
14
|
+
raise WouldLeaveOrphansError
|
15
|
+
end
|
16
|
+
|
17
|
+
contents = Alchemy::Content.where(element_id: elements.map(&:id))
|
18
|
+
contents.group_by(&:essence_type)
|
19
|
+
.transform_values! { |value| value.map(&:essence_id) }
|
20
|
+
.each do |class_name, ids|
|
21
|
+
class_name.constantize.where(id: ids).delete_all
|
22
|
+
end
|
23
|
+
contents.delete_all
|
24
|
+
delete_elements
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
def orphanable_records
|
30
|
+
Alchemy::Element.where(parent_element_id: [elements]).where.not(id: elements)
|
31
|
+
end
|
32
|
+
|
33
|
+
def delete_elements
|
34
|
+
case elements
|
35
|
+
when ActiveRecord::Associations::CollectionProxy
|
36
|
+
elements.delete_all(:delete_all)
|
37
|
+
when ActiveRecord::Relation
|
38
|
+
elements.delete_all
|
39
|
+
else
|
40
|
+
Alchemy::Element.where(id: elements).delete_all
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,56 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Alchemy
|
4
|
+
class DuplicateElement
|
5
|
+
SKIPPED_ATTRIBUTES_ON_COPY = [
|
6
|
+
"cached_tag_list",
|
7
|
+
"created_at",
|
8
|
+
"creator_id",
|
9
|
+
"position",
|
10
|
+
"id",
|
11
|
+
"folded",
|
12
|
+
"updated_at",
|
13
|
+
"updater_id",
|
14
|
+
].freeze
|
15
|
+
|
16
|
+
attr_reader :source_element, :repository
|
17
|
+
|
18
|
+
def initialize(source_element, repository: source_element.page_version.element_repository)
|
19
|
+
@source_element = source_element
|
20
|
+
@repository = repository
|
21
|
+
end
|
22
|
+
|
23
|
+
def call(differences = {})
|
24
|
+
attributes = source_element.attributes.with_indifferent_access
|
25
|
+
.except(*SKIPPED_ATTRIBUTES_ON_COPY)
|
26
|
+
.merge(differences)
|
27
|
+
.merge(
|
28
|
+
autogenerate_contents: false,
|
29
|
+
autogenerate_ingredients: false,
|
30
|
+
autogenerate_nested_elements: false,
|
31
|
+
tags: source_element.tags,
|
32
|
+
)
|
33
|
+
|
34
|
+
new_element = Element.new(attributes)
|
35
|
+
new_element.ingredients = source_element.ingredients.map(&:dup)
|
36
|
+
new_element.save!
|
37
|
+
|
38
|
+
source_element.contents.map do |content|
|
39
|
+
Content.copy(content, element: new_element)
|
40
|
+
end
|
41
|
+
|
42
|
+
nested_elements = repository.children_of(source_element)
|
43
|
+
Element.acts_as_list_no_update do
|
44
|
+
nested_elements.each.with_index(1) do |nested_element, position|
|
45
|
+
self.class.new(nested_element, repository: repository).call(
|
46
|
+
parent_element: new_element,
|
47
|
+
page_version: new_element.page_version,
|
48
|
+
position: position
|
49
|
+
)
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
new_element
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
@@ -6,8 +6,7 @@
|
|
6
6
|
file_attribute: 'file',
|
7
7
|
in_dialog: true,
|
8
8
|
redirect_url: admin_attachments_path(
|
9
|
-
|
10
|
-
content_id: @content.try(:id)
|
9
|
+
form_field_id: @form_field_id
|
11
10
|
) %>
|
12
11
|
<% end %>
|
13
12
|
<%= render 'alchemy/admin/partials/remote_search_form' %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<li class="assign_file_file <%= cycle('even', 'odd') %>">
|
2
|
-
<%= link_to alchemy.
|
3
|
-
|
4
|
-
|
2
|
+
<%= link_to alchemy.assign_admin_attachment_path(
|
3
|
+
id: file_to_assign.id,
|
4
|
+
form_field_id: @form_field_id
|
5
5
|
),
|
6
6
|
remote: true,
|
7
7
|
method: 'put' do %>
|
@@ -0,0 +1,11 @@
|
|
1
|
+
(function () {
|
2
|
+
var $form_field = $("#<%= @form_field_id -%>")
|
3
|
+
$("#assignable_<%= @assignable_id %> a").attr("href", "#").off("click")
|
4
|
+
$form_field.val("<%= @assignable_id %>")
|
5
|
+
$form_field.parent().find("> .file_name").text("<%= @attachment.name %>")
|
6
|
+
$form_field.parent().find("> .file_icon").html("<%= j render_icon(@attachment.icon_css_class) %>")
|
7
|
+
$form_field.parent().find("> .remove_file_link").removeClass("hidden")
|
8
|
+
Alchemy.closeCurrentDialog(function() {
|
9
|
+
Alchemy.setElementDirty($form_field.closest(".element-editor"))
|
10
|
+
})
|
11
|
+
})()
|
@@ -0,0 +1,36 @@
|
|
1
|
+
<div id="jscropper">
|
2
|
+
<% if @no_image_notice %>
|
3
|
+
<%= render_message :warn do %>
|
4
|
+
<%= @no_image_notice %>
|
5
|
+
<% end %>
|
6
|
+
<% else %>
|
7
|
+
<%= render_message do %>
|
8
|
+
<%= simple_format Alchemy.t(:explain_cropping) %>
|
9
|
+
<% end %>
|
10
|
+
<div class="thumbnail_background">
|
11
|
+
<%= image_tag @picture.url(size: '800x600', flatten: true), id: 'imageToCrop' %>
|
12
|
+
</div>
|
13
|
+
<form>
|
14
|
+
<%= button_tag Alchemy.t(:apply), type: 'submit' %>
|
15
|
+
<%= button_tag Alchemy.t('Reset Imagemask'), class: 'reset_mask', type: 'reset' %>
|
16
|
+
</form>
|
17
|
+
</div>
|
18
|
+
<% end %>
|
19
|
+
<% if @settings %>
|
20
|
+
<script type="text/javascript">
|
21
|
+
Alchemy.ImageLoader('#jscropper .thumbnail_background');
|
22
|
+
$('#imageToCrop').load(function() {
|
23
|
+
new Alchemy.ImageCropper(
|
24
|
+
<%= @settings[:min_size].to_json %>,
|
25
|
+
<%= @settings[:default_box].to_json %>,
|
26
|
+
<%= @settings[:ratio] %>,
|
27
|
+
<%= @settings[:image_size].to_json %>,
|
28
|
+
[
|
29
|
+
"<%= params[:crop_from_form_field_id] %>",
|
30
|
+
"<%= params[:crop_size_form_field_id] %>",
|
31
|
+
],
|
32
|
+
<%= @element.id %>
|
33
|
+
);
|
34
|
+
});
|
35
|
+
</script>
|
36
|
+
<% end %>
|
@@ -4,11 +4,11 @@
|
|
4
4
|
class: element.css_classes do %>
|
5
5
|
|
6
6
|
<% unless element.fixed? %>
|
7
|
-
<%= render 'alchemy/admin/elements/
|
7
|
+
<%= render 'alchemy/admin/elements/header', element: element %>
|
8
8
|
<% end %>
|
9
9
|
|
10
10
|
<% if element.expanded? || element.fixed? %>
|
11
|
-
<%= render 'alchemy/admin/elements/
|
11
|
+
<%= render 'alchemy/admin/elements/toolbar', element: element %>
|
12
12
|
|
13
13
|
<% element.definition[:message].tap do |message| %>
|
14
14
|
<%= render_message(:info, sanitize(message)) if message %>
|
@@ -23,11 +23,15 @@
|
|
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
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
26
|
+
<% if element.has_ingredients_defined? %>
|
27
|
+
<div class="element-ingredient-editors">
|
28
|
+
<%= render element.ingredients, element_form: f %>
|
29
|
+
</div>
|
30
|
+
<% else %>
|
31
|
+
<div id="element_<%= element.id %>_content" class="element-content-editors">
|
32
|
+
<%= render element.contents %>
|
33
|
+
</div>
|
34
|
+
<% end %>
|
31
35
|
<% if element.taggable? %>
|
32
36
|
<div class="autocomplete_tag_list">
|
33
37
|
<%= f.label :tag_list %>
|
@@ -36,7 +40,7 @@
|
|
36
40
|
<% end %>
|
37
41
|
<% end %>
|
38
42
|
|
39
|
-
<%= render 'alchemy/admin/elements/
|
43
|
+
<%= render 'alchemy/admin/elements/footer', element: element %>
|
40
44
|
<% end %>
|
41
45
|
<% end %>
|
42
46
|
|
@@ -57,7 +61,7 @@
|
|
57
61
|
<%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
|
58
62
|
remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
|
59
63
|
<%= f.hidden_field :name %>
|
60
|
-
<%= f.hidden_field :
|
64
|
+
<%= f.hidden_field :page_version_id, value: element.page_version_id %>
|
61
65
|
<%= f.hidden_field :parent_element_id, value: element.id %>
|
62
66
|
<button class="button add-nestable-element-button" data-alchemy-button>
|
63
67
|
<%= Alchemy.t(:add_nested_element) % { name: Alchemy.t(nestable_element, scope: 'element_names') } %>
|
@@ -67,7 +71,7 @@
|
|
67
71
|
<%= link_to_dialog Alchemy.t("New Element"),
|
68
72
|
alchemy.new_admin_element_path(
|
69
73
|
parent_element_id: element.id,
|
70
|
-
|
74
|
+
page_version_id: element.page_version_id
|
71
75
|
), {
|
72
76
|
size: "320x125",
|
73
77
|
title: Alchemy.t("New Element")
|
File without changes
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<% end %>
|
5
5
|
<%- else -%>
|
6
6
|
<%= alchemy_form_for [:admin, @element] do |form| %>
|
7
|
-
<%= form.hidden_field :
|
7
|
+
<%= form.hidden_field :page_version_id %>
|
8
8
|
<%= form.input :name,
|
9
9
|
label: Alchemy.t(:element_of_type),
|
10
10
|
collection: elements_for_select(@elements),
|
@@ -18,7 +18,7 @@
|
|
18
18
|
<%= sanitize(element.preview_text.presence || ' ') %>
|
19
19
|
</span>
|
20
20
|
</span>
|
21
|
-
<%= render_hint_for(element)
|
21
|
+
<%= render_hint_for(element) %>
|
22
22
|
<%= link_to '#', {
|
23
23
|
'data-element-toggle' => element.id,
|
24
24
|
title: Alchemy.t(element.folded? ? :show_element_content : :hide_element_content),
|
@@ -22,14 +22,13 @@
|
|
22
22
|
<label><%= Alchemy.t(:cut_element) %></label>
|
23
23
|
</div>
|
24
24
|
<div class="button_with_label">
|
25
|
-
<%=
|
25
|
+
<%= link_to_confirm_dialog(
|
26
26
|
render_icon('trash-alt'),
|
27
|
-
|
28
|
-
|
29
|
-
class: "icon_button"
|
30
|
-
remote: true
|
27
|
+
Alchemy.t(:confirm_to_delete_element),
|
28
|
+
alchemy.admin_element_path(element),
|
29
|
+
class: "icon_button"
|
31
30
|
) -%>
|
32
|
-
<label><%= Alchemy.t("
|
31
|
+
<label><%= Alchemy.t("Delete element") %></label>
|
33
32
|
</div>
|
34
33
|
<div class="button_with_label publish-element-button">
|
35
34
|
<%= link_to(
|
@@ -1,9 +1,7 @@
|
|
1
1
|
$('#element_<%= @element.id %>').hide(200, function() {
|
2
2
|
$(this).remove();
|
3
|
-
Alchemy.growl('<%= j
|
3
|
+
Alchemy.growl('<%= j @notice %>');
|
4
4
|
$('#element_area .sortable-elements').sortable('refresh');
|
5
|
-
Alchemy.TrashWindow.refresh();
|
6
|
-
$('#element_trash_button .icon').addClass('full');
|
7
5
|
Alchemy.PreviewWindow.refresh();
|
8
6
|
<% @element.richtext_contents_ids.each do |id| %>
|
9
7
|
tinymce.get('tinymce_<%= id %>').remove();
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<%- if @clipboard_items.blank? -%>
|
2
|
-
<%= render '
|
2
|
+
<%= render 'form' %>
|
3
3
|
<%- else -%>
|
4
4
|
<div id="overlay_tabs">
|
5
5
|
<ul>
|
@@ -7,11 +7,11 @@
|
|
7
7
|
<li><a href="#paste_element_tab"><%= Alchemy.t('Paste from clipboard') %></a></li>
|
8
8
|
</ul>
|
9
9
|
<div id="create_element_tab">
|
10
|
-
<%= render '
|
10
|
+
<%= render 'form' %>
|
11
11
|
</div>
|
12
12
|
<div id="paste_element_tab">
|
13
13
|
<%= alchemy_form_for([:admin, @element]) do |f| %>
|
14
|
-
<%= f.hidden_field :
|
14
|
+
<%= f.hidden_field :page_version_id %>
|
15
15
|
<%= f.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
|
16
16
|
<div class="input select">
|
17
17
|
<label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
|
@@ -6,23 +6,6 @@
|
|
6
6
|
'<%= sanitize(@parent_element.preview_text.presence || ' ') %>'
|
7
7
|
);
|
8
8
|
<% end %>
|
9
|
-
|
10
|
-
<% if @trashed_element_ids.any? %>
|
11
|
-
|
12
|
-
$('#element_area .ajax-folder').show();
|
13
|
-
<% element_ids = @trashed_element_ids.collect do |id|
|
14
|
-
"#element_area [data-element-id=\"#{id}\"]"
|
15
|
-
end.join(", ").html_safe %>
|
16
|
-
<% @trashed_element_ids.each do |id| %>
|
17
|
-
$('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
|
18
|
-
<% end %>
|
19
|
-
Alchemy.growl('<%= Alchemy.t(:successfully_restored_element) -%>');
|
20
|
-
|
21
|
-
<% else %>
|
22
|
-
|
23
9
|
Alchemy.growl('<%= Alchemy.t(:successfully_saved_element_position) -%>');
|
24
|
-
|
25
|
-
<% end %>
|
26
|
-
|
27
10
|
Alchemy.PreviewWindow.refresh();
|
28
11
|
})();
|
@@ -1,7 +1,7 @@
|
|
1
1
|
(function() {
|
2
2
|
var $el = $('#element_<%= @element.id %>');
|
3
3
|
var $errors = $('#element_<%= @element.id %>_errors');
|
4
|
-
$('> .element-content .content_editor', $el).removeClass('validation_failed');
|
4
|
+
$('> .element-content .content_editor, > .element-content .ingredient_editor', $el).removeClass('validation_failed');
|
5
5
|
|
6
6
|
<%- if @element_validated -%>
|
7
7
|
|
@@ -15,9 +15,10 @@
|
|
15
15
|
<%- else -%>
|
16
16
|
|
17
17
|
Alchemy.growl('<%= j @notice %>', 'warn');
|
18
|
-
$errors.html('<%= j @error_message %><ul><li><%== j @
|
18
|
+
$errors.html('<%= j @error_message %><ul><li><%== j @error_messages.join("</li><li>") %></li></ul>');
|
19
19
|
$errors.show();
|
20
20
|
$('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
|
21
|
+
$('<%== @element.ingredients_with_errors.map { |ingredient| "[data-ingredient-id=\"#{ingredient.id}\"]" }.join(", ") %>').addClass('validation_failed');
|
21
22
|
Alchemy.Buttons.enable($el);
|
22
23
|
|
23
24
|
<%- end -%>
|
@@ -0,0 +1,11 @@
|
|
1
|
+
<%= alchemy_form_for [:admin, @essence_video] do |f| %>
|
2
|
+
<%= f.input :width %>
|
3
|
+
<%= f.input :height %>
|
4
|
+
<%= f.input :autoplay %>
|
5
|
+
<%= f.input :controls %>
|
6
|
+
<%= f.input :loop %>
|
7
|
+
<%= f.input :muted %>
|
8
|
+
<%= f.input :preload, collection: %w(auto none metadata),
|
9
|
+
include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
|
10
|
+
<%= f.submit Alchemy.t(:save) %>
|
11
|
+
<% end %>
|
@@ -0,0 +1,18 @@
|
|
1
|
+
<% css_classes = ingredient.settings[:css_classes] %>
|
2
|
+
|
3
|
+
<%= f.input :link_text %>
|
4
|
+
<%= f.input :title %>
|
5
|
+
<%- if css_classes.present? -%>
|
6
|
+
<%= f.input :css_class,
|
7
|
+
collection: css_classes,
|
8
|
+
include_blank: Alchemy.t('None'),
|
9
|
+
input_html: {class: 'alchemy_selectbox'} %>
|
10
|
+
<%- else -%>
|
11
|
+
<%= f.input :css_class,
|
12
|
+
label: Alchemy.t(:position_in_text),
|
13
|
+
collection: [
|
14
|
+
[Alchemy.t(:above), "no_float"],
|
15
|
+
[Alchemy.t(:left), "left"],
|
16
|
+
[Alchemy.t(:right), "right"]
|
17
|
+
], include_blank: Alchemy.t('Layout default'), input_html: {class: 'alchemy_selectbox'} %>
|
18
|
+
<%- end -%>
|
@@ -0,0 +1,25 @@
|
|
1
|
+
<%= f.input :caption, as: ingredient.settings[:caption_as_textarea] ? 'text' : 'string' %>
|
2
|
+
<%= f.input :title %>
|
3
|
+
<%= f.input :alt_tag %>
|
4
|
+
<%- if ingredient.settings[:sizes].present? && ingredient.settings[:srcset].blank? -%>
|
5
|
+
<%= f.input :render_size,
|
6
|
+
collection: [
|
7
|
+
[Alchemy.t('Layout default'), ""]
|
8
|
+
] + ingredient.settings[:sizes].to_a,
|
9
|
+
include_blank: false,
|
10
|
+
input_html: {class: 'alchemy_selectbox'} %>
|
11
|
+
<%- end -%>
|
12
|
+
<%- if ingredient.settings[:css_classes].present? -%>
|
13
|
+
<%= f.input :css_class,
|
14
|
+
collection: ingredient.settings[:css_classes],
|
15
|
+
include_blank: Alchemy.t('None'),
|
16
|
+
input_html: {class: 'alchemy_selectbox'} %>
|
17
|
+
<%- else -%>
|
18
|
+
<%= f.input :css_class,
|
19
|
+
label: Alchemy.t(:position_in_text),
|
20
|
+
collection: [
|
21
|
+
[Alchemy.t(:above), "no_float"],
|
22
|
+
[Alchemy.t(:left), "left"],
|
23
|
+
[Alchemy.t(:right), "right"]
|
24
|
+
], include_blank: Alchemy.t("Layout default"), input_html: {class: 'alchemy_selectbox'} %>
|
25
|
+
<%- end -%>
|
@@ -0,0 +1,8 @@
|
|
1
|
+
<%= f.input :width %>
|
2
|
+
<%= f.input :height %>
|
3
|
+
<%= f.input :autoplay, as: :boolean %>
|
4
|
+
<%= f.input :controls, as: :boolean %>
|
5
|
+
<%= f.input :loop, as: :boolean %>
|
6
|
+
<%= f.input :muted, as: :boolean %>
|
7
|
+
<%= f.input :preload, collection: %w(auto none metadata),
|
8
|
+
include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
|
@@ -1,9 +1,4 @@
|
|
1
1
|
<%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
|
2
|
-
<%= f.input :page_layout,
|
3
|
-
collection: @page_layouts,
|
4
|
-
label: page_layout_label(@page),
|
5
|
-
include_blank: Alchemy.t('Please choose'),
|
6
|
-
input_html: {class: 'alchemy_selectbox'} %>
|
7
2
|
<%= f.input :name, autofocus: true %>
|
8
3
|
<div class="input string">
|
9
4
|
<%= f.label :tag_list %>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded
|
1
|
+
<%= content_tag :li, class: 'menu-item', data: { id: node.id, parent_id: node.parent_id, folded: node.folded?, type: "node" } do %>
|
2
2
|
<%= content_tag :div, class: [
|
3
3
|
'sitemap_node',
|
4
4
|
node.external? ? 'external' : 'internal',
|
@@ -67,7 +67,7 @@
|
|
67
67
|
<% end %>
|
68
68
|
</div>
|
69
69
|
<% end %>
|
70
|
-
<%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: {
|
70
|
+
<%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { record_id: node.id } do %>
|
71
71
|
<%= render partial: 'node', collection: node.children.includes(:page, :children) %>
|
72
72
|
<% end %>
|
73
73
|
<% end %>
|
@@ -17,6 +17,6 @@
|
|
17
17
|
<%= text_field_tag "anchor_link_title", '', class: 'link_title' %>
|
18
18
|
</div>
|
19
19
|
<div class="submit">
|
20
|
-
<%=
|
20
|
+
<%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'anchor' } %>
|
21
21
|
</div>
|
22
22
|
<% end %>
|
@@ -26,6 +26,6 @@
|
|
26
26
|
class: 'alchemy_selectbox link_target' %>
|
27
27
|
</div>
|
28
28
|
<div class="submit">
|
29
|
-
<%=
|
29
|
+
<%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'external' } %>
|
30
30
|
</div>
|
31
31
|
<% end %>
|
@@ -26,6 +26,6 @@
|
|
26
26
|
class: 'alchemy_selectbox link_target' %>
|
27
27
|
</div>
|
28
28
|
<div class="submit">
|
29
|
-
<%=
|
29
|
+
<%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'file' } %>
|
30
30
|
</div>
|
31
31
|
<% end %>
|