alchemy_cms 6.1.2 → 7.0.0.pre.a
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 +0 -3
- data/.gitignore +1 -6
- data/CHANGELOG.md +22 -8
- data/Gemfile +1 -0
- data/Rakefile +13 -8
- data/alchemy_cms.gemspec +1 -3
- data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +18 -32
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -2
- data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +2 -2
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +27 -29
- data/app/assets/stylesheets/alchemy/elements.scss +16 -35
- data/app/assets/stylesheets/alchemy/forms.scss +0 -4
- data/app/assets/stylesheets/alchemy/node-select.scss +2 -2
- data/app/controllers/alchemy/admin/attachments_controller.rb +0 -1
- data/app/controllers/alchemy/admin/elements_controller.rb +7 -32
- data/app/controllers/alchemy/admin/pages_controller.rb +1 -1
- data/app/controllers/alchemy/admin/pictures_controller.rb +1 -1
- data/app/controllers/alchemy/admin/resources_controller.rb +1 -18
- data/app/controllers/alchemy/api/elements_controller.rb +0 -2
- data/app/controllers/alchemy/api/pages_controller.rb +6 -4
- data/app/controllers/alchemy/messages_controller.rb +9 -9
- data/app/controllers/alchemy/pages_controller.rb +19 -28
- data/app/decorators/alchemy/element_editor.rb +10 -30
- data/app/helpers/alchemy/admin/elements_helper.rb +0 -2
- data/app/helpers/alchemy/elements_block_helper.rb +5 -42
- data/app/helpers/alchemy/elements_helper.rb +3 -11
- data/app/helpers/alchemy/pages_helper.rb +0 -4
- data/app/models/alchemy/attachment.rb +6 -3
- data/app/models/alchemy/base_record.rb +2 -0
- data/app/models/alchemy/eager_loading.rb +0 -1
- data/app/models/alchemy/element/element_ingredients.rb +1 -8
- data/app/models/alchemy/element/presenters.rb +9 -25
- data/app/models/alchemy/element.rb +2 -16
- data/app/models/alchemy/ingredient.rb +17 -6
- data/app/models/alchemy/ingredients/audio.rb +2 -0
- data/app/models/alchemy/ingredients/datetime.rb +3 -1
- data/app/models/alchemy/ingredients/file.rb +7 -0
- data/app/models/alchemy/ingredients/headline.rb +6 -0
- data/app/models/alchemy/ingredients/link.rb +2 -0
- data/app/models/alchemy/ingredients/node.rb +2 -0
- data/app/models/alchemy/ingredients/page.rb +2 -0
- data/app/models/alchemy/ingredients/picture.rb +11 -0
- data/app/models/alchemy/ingredients/richtext.rb +6 -0
- data/app/models/alchemy/ingredients/select.rb +1 -0
- data/app/models/alchemy/ingredients/text.rb +8 -0
- data/app/models/alchemy/ingredients/video.rb +2 -0
- data/app/models/alchemy/node.rb +9 -6
- data/app/models/alchemy/page/page_elements.rb +5 -26
- data/app/models/alchemy/page/page_layouts.rb +0 -14
- data/app/models/alchemy/page/page_natures.rb +0 -10
- data/app/models/alchemy/page.rb +0 -8
- data/app/models/alchemy/picture/transformations.rb +0 -30
- data/app/models/alchemy/picture/url.rb +1 -1
- data/app/models/alchemy/picture.rb +12 -10
- data/app/models/alchemy/picture_thumb/create.rb +7 -18
- data/app/models/alchemy/picture_thumb/file_store.rb +33 -0
- data/app/models/alchemy/picture_thumb.rb +10 -10
- data/app/models/concerns/alchemy/picture_thumbnails.rb +2 -2
- data/app/serializers/alchemy/element_serializer.rb +1 -6
- data/app/services/alchemy/delete_elements.rb +1 -7
- data/app/services/alchemy/duplicate_element.rb +1 -6
- data/app/views/alchemy/admin/elements/_element.html.erb +5 -22
- data/app/views/alchemy/admin/elements/create.js.erb +1 -1
- data/app/views/alchemy/admin/elements/fold.js.erb +2 -2
- data/app/views/alchemy/admin/elements/order.js.erb +1 -1
- data/app/views/alchemy/admin/elements/update.js.erb +1 -2
- data/app/views/alchemy/admin/pages/_external_link.html.erb +2 -2
- data/app/views/alchemy/admin/pages/_file_link.html.erb +2 -2
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +2 -2
- data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +3 -6
- data/app/views/alchemy/admin/pages/edit.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -3
- data/app/views/alchemy/admin/pictures/_infos.html.erb +4 -6
- data/app/views/alchemy/ingredients/_boolean_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/_headline_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/_html_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/_node_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/_picture_editor.html.erb +4 -4
- data/app/views/alchemy/ingredients/_select_editor.html.erb +2 -2
- data/app/views/alchemy/ingredients/_text_editor.html.erb +1 -1
- data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +3 -3
- data/app/views/alchemy/pages/_meta_data.html.erb +0 -1
- data/app/views/layouts/alchemy/admin.html.erb +5 -1
- data/config/alchemy/config.yml +6 -6
- data/config/brakeman.ignore +56 -57
- data/config/locales/alchemy.en.yml +98 -112
- data/config/routes.rb +1 -16
- data/db/migrate/20230121212637_alchemy_six_point_one.rb +248 -0
- data/lib/alchemy/cache_digests/template_tracker.rb +6 -7
- data/lib/alchemy/config.rb +2 -2
- data/lib/alchemy/deprecation.rb +1 -1
- data/lib/alchemy/errors.rb +0 -11
- data/lib/alchemy/hints.rb +10 -10
- data/lib/alchemy/install/tasks.rb +7 -1
- data/lib/alchemy/permissions.rb +0 -13
- data/lib/alchemy/routing_constraints.rb +3 -3
- data/lib/alchemy/searchable_resource.rb +38 -0
- data/lib/alchemy/tasks/tidy.rb +0 -38
- data/lib/alchemy/test_support/capybara_helpers.rb +69 -0
- data/lib/alchemy/test_support/factories/element_factory.rb +0 -6
- data/lib/alchemy/test_support/factories/ingredient_factory.rb +1 -1
- data/lib/alchemy/test_support/factories/page_factory.rb +4 -2
- data/lib/alchemy/test_support/shared_dom_ids_examples.rb +1 -1
- data/lib/alchemy/test_support/shared_ingredient_examples.rb +1 -1
- data/lib/alchemy/tinymce.rb +1 -18
- data/lib/alchemy/upgrader/seven_point_zero.rb +45 -0
- data/lib/alchemy/upgrader/tasks/.keep +0 -0
- data/lib/alchemy/upgrader.rb +8 -3
- data/lib/alchemy/version.rb +1 -1
- data/lib/alchemy.rb +0 -19
- data/lib/alchemy_cms.rb +2 -3
- data/lib/generators/alchemy/elements/elements_generator.rb +0 -1
- data/lib/generators/alchemy/elements/templates/view.html.erb +1 -10
- data/lib/generators/alchemy/elements/templates/view.html.haml +1 -9
- data/lib/generators/alchemy/elements/templates/view.html.slim +1 -9
- data/lib/generators/alchemy/install/files/alchemy.en.yml +7 -8
- data/lib/generators/alchemy/install/files/application.html.erb +1 -1
- data/lib/generators/alchemy/install/install_generator.rb +18 -22
- data/lib/generators/alchemy/install/templates/elements.yml.tt +12 -12
- data/lib/non_stupid_digest_assets.rb +55 -0
- data/lib/tasks/alchemy/thumbnails.rake +2 -21
- data/lib/tasks/alchemy/tidy.rake +1 -12
- data/lib/tasks/alchemy/upgrade.rake +10 -47
- data/package/dist/admin.js +16 -0
- data/package/dist/admin.js.map +7 -0
- data/package.json +5 -3
- metadata +15 -154
- data/app/controllers/alchemy/admin/contents_controller.rb +0 -21
- data/app/controllers/alchemy/admin/essence_audios_controller.rb +0 -30
- data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -31
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +0 -43
- data/app/controllers/alchemy/admin/essence_videos_controller.rb +0 -34
- data/app/controllers/alchemy/api/contents_controller.rb +0 -52
- data/app/decorators/alchemy/content_editor.rb +0 -119
- data/app/helpers/alchemy/admin/contents_helper.rb +0 -42
- data/app/helpers/alchemy/admin/essences_helper.rb +0 -31
- data/app/models/alchemy/content/factory.rb +0 -143
- data/app/models/alchemy/content.rb +0 -247
- data/app/models/alchemy/element/element_contents.rb +0 -200
- data/app/models/alchemy/element/element_essences.rb +0 -133
- data/app/models/alchemy/essence_audio.rb +0 -13
- data/app/models/alchemy/essence_boolean.rb +0 -20
- data/app/models/alchemy/essence_date.rb +0 -25
- data/app/models/alchemy/essence_file.rb +0 -49
- data/app/models/alchemy/essence_headline.rb +0 -41
- data/app/models/alchemy/essence_html.rb +0 -23
- data/app/models/alchemy/essence_link.rb +0 -21
- data/app/models/alchemy/essence_node.rb +0 -19
- data/app/models/alchemy/essence_page.rb +0 -17
- data/app/models/alchemy/essence_picture.rb +0 -67
- data/app/models/alchemy/essence_picture_view.rb +0 -90
- data/app/models/alchemy/essence_richtext.rb +0 -44
- data/app/models/alchemy/essence_select.rb +0 -19
- data/app/models/alchemy/essence_text.rb +0 -23
- data/app/models/alchemy/essence_video.rb +0 -13
- data/app/serializers/alchemy/content_serializer.rb +0 -17
- data/app/serializers/alchemy/essence_boolean_serializer.rb +0 -10
- data/app/serializers/alchemy/essence_date_serializer.rb +0 -10
- data/app/serializers/alchemy/essence_file_serializer.rb +0 -13
- data/app/serializers/alchemy/essence_html_serializer.rb +0 -10
- data/app/serializers/alchemy/essence_link_serializer.rb +0 -13
- data/app/serializers/alchemy/essence_picture_serializer.rb +0 -28
- data/app/serializers/alchemy/essence_richtext_serializer.rb +0 -11
- data/app/serializers/alchemy/essence_select_serializer.rb +0 -10
- data/app/serializers/alchemy/essence_text_serializer.rb +0 -22
- data/app/views/alchemy/admin/contents/create.js.erb +0 -21
- data/app/views/alchemy/admin/essence_audios/edit.html.erb +0 -7
- data/app/views/alchemy/admin/essence_files/edit.html.erb +0 -21
- data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +0 -5
- data/app/views/alchemy/admin/essence_pictures/edit.html.erb +0 -30
- data/app/views/alchemy/admin/essence_pictures/save_link.js.erb +0 -3
- data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -8
- data/app/views/alchemy/admin/essence_videos/edit.html.erb +0 -12
- data/app/views/alchemy/essences/_essence_audio_editor.html.erb +0 -4
- data/app/views/alchemy/essences/_essence_audio_view.html.erb +0 -15
- data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +0 -11
- data/app/views/alchemy/essences/_essence_boolean_view.html.erb +0 -2
- data/app/views/alchemy/essences/_essence_date_editor.html.erb +0 -16
- data/app/views/alchemy/essences/_essence_date_view.html.erb +0 -10
- data/app/views/alchemy/essences/_essence_file_editor.html.erb +0 -54
- data/app/views/alchemy/essences/_essence_file_view.html.erb +0 -18
- data/app/views/alchemy/essences/_essence_headline_editor.html.erb +0 -36
- data/app/views/alchemy/essences/_essence_headline_view.html.erb +0 -10
- data/app/views/alchemy/essences/_essence_html_editor.html.erb +0 -10
- data/app/views/alchemy/essences/_essence_html_view.html.erb +0 -2
- data/app/views/alchemy/essences/_essence_link_editor.html.erb +0 -30
- data/app/views/alchemy/essences/_essence_link_view.html.erb +0 -10
- data/app/views/alchemy/essences/_essence_node_editor.html.erb +0 -27
- data/app/views/alchemy/essences/_essence_node_view.html.erb +0 -1
- data/app/views/alchemy/essences/_essence_page_editor.html.erb +0 -26
- data/app/views/alchemy/essences/_essence_page_view.html.erb +0 -5
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +0 -59
- data/app/views/alchemy/essences/_essence_picture_view.html.erb +0 -6
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +0 -14
- data/app/views/alchemy/essences/_essence_richtext_view.html.erb +0 -4
- data/app/views/alchemy/essences/_essence_select_editor.html.erb +0 -28
- data/app/views/alchemy/essences/_essence_select_view.html.erb +0 -2
- data/app/views/alchemy/essences/_essence_text_editor.html.erb +0 -29
- data/app/views/alchemy/essences/_essence_text_view.html.erb +0 -17
- data/app/views/alchemy/essences/_essence_video_editor.html.erb +0 -4
- data/app/views/alchemy/essences/_essence_video_view.html.erb +0 -19
- data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +0 -59
- data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +0 -20
- data/app/views/alchemy/pages/show.rss.builder +0 -21
- data/db/migrate/20200226213334_alchemy_four_point_four.rb +0 -313
- data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +0 -11
- data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +0 -28
- data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +0 -8
- data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +0 -27
- data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +0 -6
- data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +0 -24
- data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb +0 -22
- data/db/migrate/20200907111332_remove_tri_state_booleans.rb +0 -33
- data/db/migrate/20201207131309_create_page_versions.rb +0 -19
- data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +0 -76
- data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +0 -10
- data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +0 -7
- data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +0 -12
- data/db/migrate/20210506135919_create_essence_audios.rb +0 -19
- data/db/migrate/20210506140258_create_essence_videos.rb +0 -23
- data/db/migrate/20210508091432_create_alchemy_ingredients.rb +0 -22
- data/db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb +0 -13
- data/db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb +0 -9
- data/lib/alchemy/essence.rb +0 -250
- data/lib/alchemy/test_support/essence_shared_examples.rb +0 -271
- data/lib/alchemy/test_support/factories/content_factory.rb +0 -20
- data/lib/alchemy/test_support/factories/essence_audio_factory.rb +0 -7
- data/lib/alchemy/test_support/factories/essence_file_factory.rb +0 -7
- data/lib/alchemy/test_support/factories/essence_page_factory.rb +0 -7
- data/lib/alchemy/test_support/factories/essence_picture_factory.rb +0 -11
- data/lib/alchemy/test_support/factories/essence_text_factory.rb +0 -7
- data/lib/alchemy/test_support/factories/essence_video_factory.rb +0 -7
- data/lib/alchemy/upgrader/five_point_zero.rb +0 -41
- data/lib/alchemy/upgrader/six_point_zero.rb +0 -21
- data/lib/alchemy/upgrader/tasks/add_page_versions.rb +0 -33
- data/lib/alchemy/upgrader/tasks/element_views_updater.rb +0 -34
- data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +0 -29
- data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +0 -74
- data/lib/generators/alchemy/essence/essence_generator.rb +0 -49
- data/lib/generators/alchemy/essence/templates/editor.html.erb +0 -17
- data/lib/generators/alchemy/essence/templates/view.html.erb +0 -2
@@ -20,7 +20,7 @@ module Alchemy
|
|
20
20
|
#
|
21
21
|
# === Example:
|
22
22
|
#
|
23
|
-
#
|
23
|
+
# picture_view.picture_url(size: '200x300', crop: true, format: 'gif')
|
24
24
|
# # '/pictures/1/show/200x300/crop/cats.gif?sh=765rfghj'
|
25
25
|
#
|
26
26
|
# @option options size [String]
|
@@ -100,7 +100,7 @@ module Alchemy
|
|
100
100
|
).to_h
|
101
101
|
end
|
102
102
|
|
103
|
-
# Show image cropping link for
|
103
|
+
# Show image cropping link for ingredient
|
104
104
|
def allow_image_cropping?
|
105
105
|
settings[:crop] && picture &&
|
106
106
|
picture.can_be_cropped_to?(
|
@@ -10,16 +10,11 @@ module Alchemy
|
|
10
10
|
:tag_list,
|
11
11
|
:created_at,
|
12
12
|
:updated_at,
|
13
|
-
:ingredients,
|
14
|
-
:content_ids,
|
15
13
|
:dom_id,
|
16
14
|
:display_name
|
17
15
|
|
18
16
|
has_many :nested_elements
|
19
|
-
|
20
|
-
def ingredients
|
21
|
-
object.contents.collect(&:serialize)
|
22
|
-
end
|
17
|
+
has_many :ingredients
|
23
18
|
|
24
19
|
def display_name
|
25
20
|
object.display_name_with_preview_text
|
@@ -3,6 +3,7 @@
|
|
3
3
|
module Alchemy
|
4
4
|
class DeleteElements
|
5
5
|
class WouldLeaveOrphansError < StandardError; end
|
6
|
+
|
6
7
|
attr_reader :elements
|
7
8
|
|
8
9
|
def initialize(elements)
|
@@ -14,13 +15,6 @@ module Alchemy
|
|
14
15
|
raise WouldLeaveOrphansError
|
15
16
|
end
|
16
17
|
|
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
18
|
Gutentag::Tagging.where(taggable: elements).delete_all
|
25
19
|
delete_elements
|
26
20
|
end
|
@@ -25,7 +25,6 @@ module Alchemy
|
|
25
25
|
.except(*SKIPPED_ATTRIBUTES_ON_COPY)
|
26
26
|
.merge(differences)
|
27
27
|
.merge(
|
28
|
-
autogenerate_contents: false,
|
29
28
|
autogenerate_ingredients: false,
|
30
29
|
autogenerate_nested_elements: false,
|
31
30
|
tags: source_element.tags,
|
@@ -35,17 +34,13 @@ module Alchemy
|
|
35
34
|
new_element.ingredients = source_element.ingredients.map(&:dup)
|
36
35
|
new_element.save!
|
37
36
|
|
38
|
-
source_element.contents.map do |content|
|
39
|
-
Content.copy(content, element: new_element)
|
40
|
-
end
|
41
|
-
|
42
37
|
nested_elements = repository.children_of(source_element)
|
43
38
|
Element.acts_as_list_no_update do
|
44
39
|
nested_elements.each.with_index(1) do |nested_element, position|
|
45
40
|
self.class.new(nested_element, repository: repository).call(
|
46
41
|
parent_element: new_element,
|
47
42
|
page_version: new_element.page_version,
|
48
|
-
position: position
|
43
|
+
position: position,
|
49
44
|
)
|
50
45
|
end
|
51
46
|
end
|
@@ -20,7 +20,7 @@
|
|
20
20
|
|
21
21
|
<% if element.editable? %>
|
22
22
|
<%= form_for [alchemy, :admin, element], remote: true,
|
23
|
-
html: {id: "element_#{element.id}_form".html_safe, class: 'element-
|
23
|
+
html: {id: "element_#{element.id}_form".html_safe, class: 'element-body'} do |f| %>
|
24
24
|
|
25
25
|
<div id="element_<%= element.id %>_errors" class="element_errors"></div>
|
26
26
|
|
@@ -31,35 +31,18 @@
|
|
31
31
|
|
32
32
|
<!-- Each ingredient group -->
|
33
33
|
<% element.ingredients.select { |i| i.definition[:group] }.group_by { |i| i.definition[:group] }.each do |group, ingredients| %>
|
34
|
-
<div class="
|
35
|
-
<%= link_to '#', id: "element_#{element.id}
|
34
|
+
<div class="ingredient-group">
|
35
|
+
<%= link_to '#', id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}_header", class: 'ingredient-group-header', data: { toggle_ingredient_group: true } do %>
|
36
36
|
<%= element.translated_group group %>
|
37
|
-
<i class="
|
37
|
+
<i class="ingredient-group-expand icon fa-fw fa-angle-down fas"></i>
|
38
38
|
<% end %>
|
39
|
-
<%= content_tag :div, id: "element_#{element.id}
|
39
|
+
<%= content_tag :div, id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}", class: 'ingredient-group-ingredients' do %>
|
40
40
|
<%= render ingredients, element_form: f %>
|
41
41
|
<% end %>
|
42
42
|
</div>
|
43
43
|
<% end %>
|
44
44
|
</div>
|
45
45
|
<% end %>
|
46
|
-
<!-- Contents -->
|
47
|
-
<div id="element_<%= element.id %>_content" class="element-content-editors">
|
48
|
-
<%= render element.contents.select { |c| !c.definition[:group] } %>
|
49
|
-
|
50
|
-
<!-- Each content group -->
|
51
|
-
<% element.contents.select { |c| c.definition[:group] }.group_by { |c| c.definition[:group] }.each do |group, contents| %>
|
52
|
-
<div class="content-group">
|
53
|
-
<%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
|
54
|
-
<%= element.translated_group group %>
|
55
|
-
<i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
|
56
|
-
<% end %>
|
57
|
-
<%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
|
58
|
-
<%= render contents, element_form: f %>
|
59
|
-
<% end %>
|
60
|
-
</div>
|
61
|
-
<% end %>
|
62
|
-
</div>
|
63
46
|
|
64
47
|
<% if element.taggable? %>
|
65
48
|
<div class="autocomplete_tag_list">
|
@@ -34,7 +34,7 @@
|
|
34
34
|
|
35
35
|
Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
|
36
36
|
Alchemy.closeCurrentDialog();
|
37
|
-
Alchemy.Tinymce.init(<%=
|
37
|
+
Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
|
38
38
|
Alchemy.PreviewWindow.refresh(function() {
|
39
39
|
Alchemy.ElementEditors.focusElementPreview(<%= @element.id %>);
|
40
40
|
});
|
@@ -14,12 +14,12 @@
|
|
14
14
|
|
15
15
|
<% if @element.folded? -%>
|
16
16
|
|
17
|
-
Alchemy.Tinymce.remove(<%=
|
17
|
+
Alchemy.Tinymce.remove(<%= @element.richtext_ingredients_ids.to_json %>);
|
18
18
|
|
19
19
|
<% else -%>
|
20
20
|
|
21
21
|
$el.trigger('FocusElementEditor.Alchemy');
|
22
|
-
Alchemy.Tinymce.init(<%=
|
22
|
+
Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
|
23
23
|
Alchemy.GUI.initElement($el);
|
24
24
|
Alchemy.SortableElements(
|
25
25
|
<%= @page.id %>,
|
@@ -1,7 +1,7 @@
|
|
1
1
|
(function() {
|
2
2
|
var $el = $('#element_<%= @element.id %>');
|
3
3
|
var $errors = $('#element_<%= @element.id %>_errors');
|
4
|
-
$('> .element-
|
4
|
+
$('> .element-body .ingredient-editor', $el).removeClass('validation_failed');
|
5
5
|
|
6
6
|
<%- if @element_validated -%>
|
7
7
|
|
@@ -20,7 +20,6 @@
|
|
20
20
|
Alchemy.growl('<%= j @notice %>', 'warn');
|
21
21
|
$errors.html('<%= j @error_message %><ul><li><%== j @error_messages.join("</li><li>") %></li></ul>');
|
22
22
|
$errors.show();
|
23
|
-
$('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
|
24
23
|
$('<%== @element.ingredients_with_errors.map { |ingredient| "[data-ingredient-id=\"#{ingredient.id}\"]" }.join(", ") %>').addClass('validation_failed');
|
25
24
|
Alchemy.Buttons.enable($el);
|
26
25
|
|
@@ -8,8 +8,8 @@
|
|
8
8
|
<ul></ul>
|
9
9
|
</div>
|
10
10
|
<div class="input text">
|
11
|
-
<label for="
|
12
|
-
<%= text_field_tag "
|
11
|
+
<label for="external_link" class="control-label">URL</label>
|
12
|
+
<%= text_field_tag "external_link" %>
|
13
13
|
</div>
|
14
14
|
<div class="input text">
|
15
15
|
<label for="external_link_title" class="control-label">
|
@@ -3,10 +3,10 @@
|
|
3
3
|
<h3><%= Alchemy.t(:choose_file_to_link) %></h3>
|
4
4
|
<% end %>
|
5
5
|
<div class="input select">
|
6
|
-
<label for="
|
6
|
+
<label for="file_link" class="control-label">
|
7
7
|
<%= Alchemy.t(:file) %>
|
8
8
|
</label>
|
9
|
-
<%= select_tag "
|
9
|
+
<%= select_tag "file_link",
|
10
10
|
options_for_select(@attachments),
|
11
11
|
prompt: Alchemy.t('Please choose'),
|
12
12
|
class: "alchemy_selectbox" %>
|
@@ -4,10 +4,10 @@
|
|
4
4
|
<p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
|
5
5
|
<% end %>
|
6
6
|
<div class="input select">
|
7
|
-
<label for="
|
7
|
+
<label for="internal_link" class="control-label">
|
8
8
|
<%= Alchemy.t(:page) %>
|
9
9
|
</label>
|
10
|
-
<input type="text" id="
|
10
|
+
<input type="text" id="internal_link" class="alchemy_selectbox full_width">
|
11
11
|
</div>
|
12
12
|
<div class="input select">
|
13
13
|
<label for="element_anchor" class="control-label">
|
@@ -1,11 +1,8 @@
|
|
1
1
|
<script>
|
2
2
|
// Populate custom tinymce configurations
|
3
|
-
<% (
|
4
|
-
|
5
|
-
|
6
|
-
).each do |content| %>
|
7
|
-
Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] || content['role'] %>"] = {
|
8
|
-
<% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
|
3
|
+
<% Alchemy::Tinymce.custom_config_ingredients(@page).each do |ingredient| %>
|
4
|
+
Alchemy.Tinymce.customConfigs["<%= ingredient['element'] %>_<%= ingredient['role'] %>"] = {
|
5
|
+
<% ingredient.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
|
9
6
|
<%= k %>: <%== v.to_json %>,
|
10
7
|
<% end %>
|
11
8
|
};
|
@@ -197,7 +197,7 @@
|
|
197
197
|
Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
|
198
198
|
Alchemy.ElementEditors.init();
|
199
199
|
Alchemy.SelectBox('.element-editor');
|
200
|
-
Alchemy.Tinymce.init(<%=
|
200
|
+
Alchemy.Tinymce.init(<%= @page.richtext_ingredients_ids.to_json %>);
|
201
201
|
$('#fixed-elements').tabs().tabs('paging', {
|
202
202
|
follow: true,
|
203
203
|
followOnSelect: true,
|
@@ -8,9 +8,7 @@
|
|
8
8
|
redirect_url: alchemy.admin_pictures_path(
|
9
9
|
size: search_filter_params[:size],
|
10
10
|
filter: { misc: 'last_upload' },
|
11
|
-
form_field_id: @form_field_id
|
12
|
-
content_id: @content.try(:id),
|
13
|
-
element_id: @element.try(:id)
|
11
|
+
form_field_id: @form_field_id
|
14
12
|
) %>
|
15
13
|
<div class="toolbar_spacer"></div>
|
16
14
|
<% end %>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
<div id="pictures_page_list">
|
23
23
|
<% if @assignments.any? %>
|
24
24
|
<ul>
|
25
|
-
<% @assignments.group_by(&:page).each do |page,
|
25
|
+
<% @assignments.group_by(&:page).each do |page, picture_ingredients| %>
|
26
26
|
<% if page %>
|
27
27
|
<li>
|
28
28
|
<h3>
|
@@ -30,20 +30,18 @@
|
|
30
30
|
<p><%= link_to page.name, edit_admin_page_path(page) %></p>
|
31
31
|
</h3>
|
32
32
|
<ul class="list">
|
33
|
-
<%
|
33
|
+
<% picture_ingredients.group_by(&:element).each do |element, picture_ingredients| %>
|
34
34
|
<li class="<%= cycle('even', 'odd') %>">
|
35
35
|
<% page_link = link_to element.display_name_with_preview_text,
|
36
36
|
edit_admin_page_path(page, anchor: "element_#{element.id}") %>
|
37
|
-
<%
|
38
|
-
e.content.name_for_label
|
39
|
-
end.to_sentence %>
|
37
|
+
<% ingredients = picture_ingredients.collect(&:translated_role).to_sentence %>
|
40
38
|
<% if element.public? %>
|
41
39
|
<%= render_icon('window-maximize', style: 'regular') %>
|
42
40
|
<% else %>
|
43
41
|
<%= render_icon('window-close') %>
|
44
42
|
<% end %>
|
45
43
|
<p>
|
46
|
-
<%== Alchemy.t(:pictures_in_page, page: page_link, pictures:
|
44
|
+
<%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
|
47
45
|
</p>
|
48
46
|
</li>
|
49
47
|
<% end %>
|
@@ -3,7 +3,7 @@
|
|
3
3
|
data: boolean_editor.data_attributes do %>
|
4
4
|
<%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
|
5
5
|
<%= f.label :value, style: "display: inline-block" do %>
|
6
|
-
<%= f.check_box :value, id:
|
6
|
+
<%= f.check_box :value, id: boolean_editor.form_field_id %>
|
7
7
|
<%= render_ingredient_role(boolean_editor) %>
|
8
8
|
<% end %>
|
9
9
|
<%= render_hint_for(boolean_editor) %>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
data: headline_editor.data_attributes do %>
|
7
7
|
<%= element_form.fields_for(:ingredients, headline_editor.ingredient) do |f| %>
|
8
8
|
<%= ingredient_label(headline_editor) %>
|
9
|
-
<%= f.text_field :value, id:
|
9
|
+
<%= f.text_field :value, id: headline_editor.form_field_id %>
|
10
10
|
|
11
11
|
<% if headline_editor.settings[:anchor] %>
|
12
12
|
<%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>
|
@@ -3,6 +3,6 @@
|
|
3
3
|
data: html_editor.data_attributes do %>
|
4
4
|
<%= element_form.fields_for(:ingredients, html_editor.ingredient) do |f| %>
|
5
5
|
<%= ingredient_label(html_editor) %>
|
6
|
-
<%= f.text_area :value, id:
|
6
|
+
<%= f.text_area :value, id: html_editor.form_field_id %>
|
7
7
|
<% end %>
|
8
8
|
<% end %>
|
@@ -16,7 +16,7 @@
|
|
16
16
|
}) %>
|
17
17
|
$('#<%= node_editor.form_field_id(:node_id) %>').alchemyNodeSelect({
|
18
18
|
placeholder: "<%= Alchemy.t(:search_node) %>",
|
19
|
-
url: "<%= alchemy.api_nodes_path %>",
|
19
|
+
url: "<%= alchemy.api_nodes_path(language_id: node_editor.page&.language_id) %>",
|
20
20
|
query_params: <%== query_params.to_json %>,
|
21
21
|
<% if node_editor.node %>
|
22
22
|
<% serialized_node = ActiveModelSerializers::SerializableResource.new(node_editor.node, include: :ancestors) %>
|
@@ -31,10 +31,10 @@
|
|
31
31
|
<% end %>
|
32
32
|
</div>
|
33
33
|
</div>
|
34
|
-
<%- if picture_editor.
|
35
|
-
<div class="
|
36
|
-
<%= Alchemy.t("alchemy.
|
37
|
-
default: picture_editor.
|
34
|
+
<%- if picture_editor.css_class.present? -%>
|
35
|
+
<div class="picture_ingredient_css_class">
|
36
|
+
<%= Alchemy.t("alchemy.picture_ingredients.css_classes.#{picture_editor.css_class}",
|
37
|
+
default: picture_editor.css_class.camelcase) %>
|
38
38
|
</div>
|
39
39
|
<%- end -%>
|
40
40
|
<div class="edit_images_bottom">
|
@@ -12,7 +12,7 @@
|
|
12
12
|
<%= warning(':select_values is nil',
|
13
13
|
"<strong>No select values given.</strong>
|
14
14
|
<br>Please provide <code>select_values</code> on the
|
15
|
-
|
15
|
+
ingredient definition <code>settings</code> in
|
16
16
|
<code>elements.yml</code>.") %>
|
17
17
|
<% else %>
|
18
18
|
<%
|
@@ -22,7 +22,7 @@
|
|
22
22
|
options_tags = options_for_select(select_values, select_editor.value)
|
23
23
|
end %>
|
24
24
|
<%= f.select :value, options_tags, {}, {
|
25
|
-
id:
|
25
|
+
id: select_editor.form_field_id,
|
26
26
|
class: ["alchemy_selectbox", "ingredient-editor-select"]
|
27
27
|
} %>
|
28
28
|
<% end %>
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<%= ingredient_label(text_editor) %>
|
8
8
|
<%= f.text_field :value,
|
9
9
|
class: text_editor.settings[:linkable] ? "text_with_icon" : "",
|
10
|
-
id:
|
10
|
+
id: text_editor.form_field_id,
|
11
11
|
type: text_editor.settings[:input_type] || "text" %>
|
12
12
|
<% if text_editor.settings[:anchor] %>
|
13
13
|
<%= render "alchemy/ingredients/shared/anchor", ingredient_editor: text_editor %>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
<span class="
|
1
|
+
<span class="ingredient_link_buttons">
|
2
2
|
<%= link_to(
|
3
3
|
render_icon(:link),
|
4
4
|
'#',
|
5
5
|
onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
|
6
|
-
class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-
|
6
|
+
class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-ingredient",
|
7
7
|
"data-parent-selector": "[data-ingredient-id='#{ingredient_editor.id}']",
|
8
8
|
title: Alchemy.t(:place_link),
|
9
9
|
id: "edit_link_#{ingredient_editor.id}"
|
@@ -12,7 +12,7 @@
|
|
12
12
|
render_icon(:unlink),
|
13
13
|
'#',
|
14
14
|
onclick: "return Alchemy.LinkDialog.removeLink(this, '[data-ingredient-id=\"#{ingredient_editor.id}\"]')",
|
15
|
-
class: "icon_button unlink-
|
15
|
+
class: "icon_button unlink-ingredient #{ingredient_editor.linked? ? 'linked' : 'disabled'}",
|
16
16
|
tabindex: ingredient_editor.linked? ? nil : '-1',
|
17
17
|
'data-ingredient-id' => ingredient_editor.id,
|
18
18
|
title: Alchemy.t(:unlink)
|
@@ -5,5 +5,4 @@
|
|
5
5
|
<%= tag(:meta, name: 'robots', content: meta_robots) %>
|
6
6
|
<%= tag(:meta, name: 'description', content: meta_description, lang: @page.language_code) if meta_description.present? %>
|
7
7
|
<%= tag(:meta, name: 'keywords', content: meta_keywords, lang: @page.language_code) if meta_keywords.present? %>
|
8
|
-
<%= auto_discovery_link_tag(:rss, show_alchemy_page_url(@page, format: :rss)) if @page.contains_feed? %>
|
9
8
|
<% end %>
|
@@ -36,7 +36,11 @@
|
|
36
36
|
</script>
|
37
37
|
<%= render 'alchemy/admin/partials/routes' %>
|
38
38
|
<%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %>
|
39
|
-
|
39
|
+
<% if respond_to?(:javascript_pack_tag) %>
|
40
|
+
<%= javascript_pack_tag('alchemy/admin', 'data-turbolinks-track' => true, defer: true) %>
|
41
|
+
<% else %>
|
42
|
+
<%= javascript_include_tag('alchemy_admin', 'data-turbolinks-track' => true, defer: true) %>
|
43
|
+
<% end %>
|
40
44
|
<%= yield :javascript_includes %>
|
41
45
|
</head>
|
42
46
|
<%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>
|
data/config/alchemy/config.yml
CHANGED
@@ -66,9 +66,9 @@ items_per_page: 15
|
|
66
66
|
#
|
67
67
|
# Example:
|
68
68
|
# - name: some_element
|
69
|
-
#
|
70
|
-
# -
|
71
|
-
# type:
|
69
|
+
# ingredients:
|
70
|
+
# - role: some_picture
|
71
|
+
# type: Picture
|
72
72
|
# settings:
|
73
73
|
# hint: true
|
74
74
|
# crop: true # turns on image cropping
|
@@ -82,7 +82,7 @@ items_per_page: 15
|
|
82
82
|
# preprocess_image_resize [String] # Use this option to resize images to the given size when they are uploaded to the image library. Downsizing example: '1000x1000>' (Default nil)
|
83
83
|
# image_output_format [String] # The global image output format setting. (Default +original+)
|
84
84
|
#
|
85
|
-
# NOTE: You can always override the output format in the settings of your
|
85
|
+
# NOTE: You can always override the output format in the settings of your ingredients in elements.yml, I.E. {format: 'gif'}
|
86
86
|
#
|
87
87
|
output_image_jpg_quality: 85
|
88
88
|
preprocess_image_resize:
|
@@ -91,7 +91,7 @@ image_output_format: original
|
|
91
91
|
# This is used by the seeder to create the default site.
|
92
92
|
default_site:
|
93
93
|
name: Default Site
|
94
|
-
host:
|
94
|
+
host: "*"
|
95
95
|
|
96
96
|
# This is the default language when seeding.
|
97
97
|
default_language:
|
@@ -191,7 +191,7 @@ link_target_options: [blank]
|
|
191
191
|
# === Format matchers
|
192
192
|
#
|
193
193
|
# Named aliases for regular expressions that can be used in various places.
|
194
|
-
# The most common use case is the format validation of
|
194
|
+
# The most common use case is the format validation of ingredients, or attribute validations of your individual models.
|
195
195
|
#
|
196
196
|
# == Example:
|
197
197
|
#
|