alchemy_cms 6.1.6 → 7.0.0.pre.a

data/app/models/alchemy/picture_thumb.rb

@@ -7,7 +7,7 @@ module Alchemy
   # different thumbnail store (ie. a remote file storage).
   #
   #     config/initializers/alchemy.rb
-  #     Alchemy::PictureThumb.generator_class = My::ThumbnailGenerator
+  #     Alchemy::PictureThumb.storage_class = My::ThumbnailStore
   #
   class PictureThumb < BaseRecord
     belongs_to :picture, class_name: "Alchemy::Picture"
@@ -16,18 +16,18 @@ module Alchemy
     validates :uid, presence: true
 
     class << self
-      # Thumbnail generator class
+      # Thumbnail storage class
       #
-      # @see Alchemy::PictureThumb::Create
-      def generator_class
-        @_generator_class ||= Alchemy::PictureThumb::Create
+      # @see Alchemy::PictureThumb::FileStore
+      def storage_class
+        @_storage_class ||= Alchemy::PictureThumb::FileStore
       end
 
-      # Set a thumbnail generator class
+      # Set a thumbnail storage class
       #
-      # @see Alchemy::PictureThumb::Create
-      def generator_class=(klass)
-        @_generator_class = klass
+      # @see Alchemy::PictureThumb::FileStore
+      def storage_class=(klass)
+        @_storage_class = klass
       end
 
       # Upfront generation of picture thumbnails
@@ -49,7 +49,7 @@ module Alchemy
           next if thumb
 
           uid = Alchemy::PictureThumb::Uid.call(signature, variant)
-          generator_class.call(variant, signature, uid)
+          Alchemy::PictureThumb::Create.call(variant, signature, uid)
         end
       end
     end

data/app/models/concerns/alchemy/picture_thumbnails.rb

@@ -20,7 +20,7 @@ module Alchemy
     #
     # === Example:
     #
-    #   essence_picture.picture_url(size: '200x300', crop: true, format: 'gif')
+    #   picture_view.picture_url(size: '200x300', crop: true, format: 'gif')
     #   # '/pictures/1/show/200x300/crop/cats.gif?sh=765rfghj'
     #
     # @option options size [String]
@@ -100,7 +100,7 @@ module Alchemy
       ).to_h
     end
 
-    # Show image cropping link for content
+    # Show image cropping link for ingredient
     def allow_image_cropping?
       settings[:crop] && picture &&
         picture.can_be_cropped_to?(

data/app/serializers/alchemy/element_serializer.rb

@@ -10,16 +10,11 @@ module Alchemy
       :tag_list,
       :created_at,
       :updated_at,
-      :ingredients,
-      :content_ids,
       :dom_id,
       :display_name
 
     has_many :nested_elements
-
-    def ingredients
-      object.contents.collect(&:serialize)
-    end
+    has_many :ingredients
 
     def display_name
       object.display_name_with_preview_text

data/app/services/alchemy/delete_elements.rb

@@ -3,6 +3,7 @@
 module Alchemy
   class DeleteElements
     class WouldLeaveOrphansError < StandardError; end
+
     attr_reader :elements
 
     def initialize(elements)
@@ -14,13 +15,6 @@ module Alchemy
         raise WouldLeaveOrphansError
       end
 
-      contents = Alchemy::Content.where(element_id: elements.map(&:id))
-      contents.group_by(&:essence_type)
-        .transform_values! { |value| value.map(&:essence_id) }
-        .each do |class_name, ids|
-          class_name.constantize.where(id: ids).delete_all
-        end
-      contents.delete_all
       Gutentag::Tagging.where(taggable: elements).delete_all
       delete_elements
     end

data/app/services/alchemy/duplicate_element.rb

@@ -25,7 +25,6 @@ module Alchemy
         .except(*SKIPPED_ATTRIBUTES_ON_COPY)
         .merge(differences)
         .merge(
-          autogenerate_contents: false,
           autogenerate_ingredients: false,
           autogenerate_nested_elements: false,
           tags: source_element.tags,
@@ -35,17 +34,13 @@ module Alchemy
       new_element.ingredients = source_element.ingredients.map(&:dup)
       new_element.save!
 
-      source_element.contents.map do |content|
-        Content.copy(content, element: new_element)
-      end
-
       nested_elements = repository.children_of(source_element)
       Element.acts_as_list_no_update do
         nested_elements.each.with_index(1) do |nested_element, position|
           self.class.new(nested_element, repository: repository).call(
             parent_element: new_element,
             page_version: new_element.page_version,
-            position: position
+            position: position,
           )
         end
       end

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -20,7 +20,7 @@
 
     <% if element.editable? %>
       <%= form_for [alchemy, :admin, element], remote: true,
-        html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
+        html: {id: "element_#{element.id}_form".html_safe, class: 'element-body'} do |f| %>
 
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
@@ -31,35 +31,18 @@
 
             <!-- Each ingredient group -->
             <% element.ingredients.select { |i| i.definition[:group] }.group_by { |i| i.definition[:group] }.each do |group, ingredients| %>
-              <div class="content-group">
-                <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
+              <div class="ingredient-group">
+                <%= link_to '#', id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}_header", class: 'ingredient-group-header', data: { toggle_ingredient_group: true } do %>
                   <%= element.translated_group group %>
-                  <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
+                  <i class="ingredient-group-expand icon fa-fw fa-angle-down fas"></i>
                 <% end %>
-                <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
+                <%= content_tag :div, id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}", class: 'ingredient-group-ingredients' do %>
                   <%= render ingredients, element_form: f %>
                 <% end %>
               </div>
             <% end %>
           </div>
         <% end %>
-        <!-- Contents -->
-        <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <%= render element.contents.select { |c| !c.definition[:group] } %>
-
-          <!-- Each content group -->
-          <% element.contents.select { |c| c.definition[:group] }.group_by { |c| c.definition[:group] }.each do |group, contents| %>
-            <div class="content-group">
-              <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
-                <%= element.translated_group group %>
-                <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
-              <% end %>
-              <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
-                <%= render contents, element_form: f %>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
 
         <% if element.taggable? %>
           <div class="autocomplete_tag_list">

data/app/views/alchemy/admin/elements/create.js.erb

@@ -34,7 +34,7 @@
 
   Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();
-  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.focusElementPreview(<%= @element.id %>);
   });

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -14,12 +14,12 @@
 
   <% if @element.folded? -%>
 
-  Alchemy.Tinymce.remove(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.remove(<%= @element.richtext_ingredients_ids.to_json %>);
 
   <% else -%>
 
   $el.trigger('FocusElementEditor.Alchemy');
-  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
   Alchemy.GUI.initElement($el);
   Alchemy.SortableElements(
     <%= @page.id %>,

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,5 +1,5 @@
 (function() {
-<% if @parent_element && @parent_element.contents.empty? %>
+<% if @parent_element && @parent_element.ingredients.empty? %>
   var $parent = $('#element_<%= @parent_element.id %>');
   Alchemy.ElementEditors.setTitle(
     $parent,

data/app/views/alchemy/admin/elements/update.js.erb

@@ -1,7 +1,7 @@
 (function() {
   var $el = $('#element_<%= @element.id %>');
   var $errors = $('#element_<%= @element.id %>_errors');
-  $('> .element-content .content_editor, > .element-content .ingredient-editor', $el).removeClass('validation_failed');
+  $('> .element-body .ingredient-editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 
@@ -20,7 +20,6 @@
   Alchemy.growl('<%= j @notice %>', 'warn');
   $errors.html('<%= j @error_message %><ul><li><%== j @error_messages.join("</li><li>") %></li></ul>');
   $errors.show();
-  $('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
   $('<%== @element.ingredients_with_errors.map { |ingredient| "[data-ingredient-id=\"#{ingredient.id}\"]" }.join(", ") %>').addClass('validation_failed');
   Alchemy.Buttons.enable($el);
 

data/app/views/alchemy/admin/pages/_external_link.html.erb

@@ -8,8 +8,8 @@
     <ul></ul>
   </div>
   <div class="input text">
-    <label for="external_url" class="control-label">URL</label>
-    <%= text_field_tag "external_url" %>
+    <label for="external_link" class="control-label">URL</label>
+    <%= text_field_tag "external_link" %>
   </div>
   <div class="input text">
     <label for="external_link_title" class="control-label">

data/app/views/alchemy/admin/pages/_file_link.html.erb

@@ -3,10 +3,10 @@
     <h3><%= Alchemy.t(:choose_file_to_link) %></h3>
   <% end %>
   <div class="input select">
-    <label for="public_filename" class="control-label">
+    <label for="file_link" class="control-label">
       <%= Alchemy.t(:file) %>
     </label>
-    <%= select_tag "public_filename",
+    <%= select_tag "file_link",
       options_for_select(@attachments),
       prompt: Alchemy.t('Please choose'),
       class: "alchemy_selectbox" %>

data/app/views/alchemy/admin/pages/_internal_link.html.erb

@@ -4,10 +4,10 @@
     <p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
   <% end %>
   <div class="input select">
-    <label for="page_urlname" class="control-label">
+    <label for="internal_link" class="control-label">
       <%= Alchemy.t(:page) %>
     </label>
-    <input type="text" id="page_urlname" class="alchemy_selectbox full_width">
+    <input type="text" id="internal_link" class="alchemy_selectbox full_width">
   </div>
   <div class="input select">
     <label for="element_anchor" class="control-label">

data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb

@@ -1,11 +1,8 @@
 <script>
   // Populate custom tinymce configurations
-  <% (
-    Alchemy::Tinymce.custom_config_contents(@page) +
-    Alchemy::Tinymce.custom_config_ingredients(@page)
-  ).each do |content| %>
-  Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] || content['role'] %>"] = {
-    <% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
+  <% Alchemy::Tinymce.custom_config_ingredients(@page).each do |ingredient| %>
+  Alchemy.Tinymce.customConfigs["<%= ingredient['element'] %>_<%= ingredient['role'] %>"] = {
+    <% ingredient.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
     <%= k %>: <%== v.to_json %>,
     <% end %>
   };

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -197,7 +197,7 @@
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element-editor');
-      Alchemy.Tinymce.init(<%= (@page.richtext_contents_ids + @page.richtext_ingredients_ids).to_json %>);
+      Alchemy.Tinymce.init(<%= @page.richtext_ingredients_ids.to_json %>);
       $('#fixed-elements').tabs().tabs('paging', {
         follow: true,
         followOnSelect: true,

data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb

@@ -8,9 +8,7 @@
       redirect_url: alchemy.admin_pictures_path(
         size: search_filter_params[:size],
         filter: { misc: 'last_upload' },
-        form_field_id: @form_field_id,
-        content_id: @content.try(:id),
-        element_id: @element.try(:id)
+        form_field_id: @form_field_id
       ) %>
     <div class="toolbar_spacer"></div>
   <% end %>

data/app/views/alchemy/admin/pictures/_infos.html.erb

@@ -22,7 +22,7 @@
   <div id="pictures_page_list">
     <% if @assignments.any? %>
       <ul>
-        <% @assignments.group_by(&:page).each do |page, essence_pictures| %>
+        <% @assignments.group_by(&:page).each do |page, picture_ingredients| %>
           <% if page %>
             <li>
               <h3>
@@ -30,20 +30,18 @@
                 <p><%= link_to page.name, edit_admin_page_path(page) %></p>
               </h3>
               <ul class="list">
-                <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
+                <% picture_ingredients.group_by(&:element).each do |element, picture_ingredients| %>
                   <li class="<%= cycle('even', 'odd') %>">
                     <% page_link = link_to element.display_name_with_preview_text,
                                    edit_admin_page_path(page, anchor: "element_#{element.id}") %>
-                    <% pictures = essence_pictures.collect do |e|
-                                    e.content.name_for_label
-                                  end.to_sentence %>
+                    <% ingredients = picture_ingredients.collect(&:translated_role).to_sentence %>
                     <% if element.public? %>
                       <%= render_icon('window-maximize', style: 'regular') %>
                     <% else %>
                       <%= render_icon('window-close') %>
                     <% end %>
                     <p>
-                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
+                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
                     </p>
                   </li>
                 <% end %>

data/app/views/alchemy/ingredients/_boolean_editor.html.erb

@@ -3,7 +3,7 @@
   data: boolean_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
     <%= f.label :value, style: "display: inline-block" do %>
-      <%= f.check_box :value, id: nil %>
+      <%= f.check_box :value, id: boolean_editor.form_field_id %>
       <%= render_ingredient_role(boolean_editor) %>
     <% end %>
     <%= render_hint_for(boolean_editor) %>

data/app/views/alchemy/ingredients/_headline_editor.html.erb

@@ -6,7 +6,7 @@
   data: headline_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, headline_editor.ingredient) do |f| %>
     <%= ingredient_label(headline_editor) %>
-    <%= f.text_field :value, id: nil %>
+    <%= f.text_field :value, id: headline_editor.form_field_id %>
 
     <% if headline_editor.settings[:anchor] %>
       <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>

data/app/views/alchemy/ingredients/_html_editor.html.erb

@@ -3,6 +3,6 @@
   data: html_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, html_editor.ingredient) do |f| %>
     <%= ingredient_label(html_editor) %>
-    <%= f.text_area :value, id: nil %>
+    <%= f.text_area :value, id: html_editor.form_field_id %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_node_editor.html.erb

@@ -16,7 +16,7 @@
   }) %>
   $('#<%= node_editor.form_field_id(:node_id) %>').alchemyNodeSelect({
     placeholder: "<%= Alchemy.t(:search_node) %>",
-    url: "<%= alchemy.api_nodes_path %>",
+    url: "<%= alchemy.api_nodes_path(language_id: node_editor.page&.language_id) %>",
     query_params: <%== query_params.to_json %>,
     <% if node_editor.node %>
     <% serialized_node = ActiveModelSerializers::SerializableResource.new(node_editor.node, include: :ancestors) %>

data/app/views/alchemy/ingredients/_picture_editor.html.erb

@@ -31,10 +31,10 @@
           <% end %>
         </div>
       </div>
-      <%- if picture_editor.essence.css_class.present? -%>
-        <div class="essence_picture_css_class">
-          <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{picture_editor.essence.css_class}",
-            default: picture_editor.essence.css_class.camelcase) %>
+      <%- if picture_editor.css_class.present? -%>
+        <div class="picture_ingredient_css_class">
+          <%= Alchemy.t("alchemy.picture_ingredients.css_classes.#{picture_editor.css_class}",
+            default: picture_editor.css_class.camelcase) %>
         </div>
       <%- end -%>
       <div class="edit_images_bottom">

data/app/views/alchemy/ingredients/_select_editor.html.erb

@@ -12,7 +12,7 @@
       <%= warning(':select_values is nil',
       "<strong>No select values given.</strong>
       <br>Please provide <code>select_values</code> on the
-      content definition <code>settings</code> in
+      ingredient definition <code>settings</code> in
       <code>elements.yml</code>.") %>
     <% else %>
       <%
@@ -22,7 +22,7 @@
         options_tags = options_for_select(select_values, select_editor.value)
       end %>
       <%= f.select :value, options_tags, {}, {
-        id: nil,
+        id: select_editor.form_field_id,
         class: ["alchemy_selectbox", "ingredient-editor-select"]
       } %>
     <% end %>

data/app/views/alchemy/ingredients/_text_editor.html.erb

@@ -7,7 +7,7 @@
     <%= ingredient_label(text_editor) %>
     <%= f.text_field :value,
       class: text_editor.settings[:linkable] ? "text_with_icon" : "",
-      id: nil,
+      id: text_editor.form_field_id,
       type: text_editor.settings[:input_type] || "text" %>
     <% if text_editor.settings[:anchor] %>
       <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: text_editor %>

data/app/views/alchemy/ingredients/shared/_link_tools.html.erb

@@ -1,9 +1,9 @@
-<span class="linkable_essence_tools">
+<span class="ingredient_link_buttons">
   <%= link_to(
     render_icon(:link),
     '#',
     onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
-    class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-essence",
+    class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-ingredient",
     "data-parent-selector": "[data-ingredient-id='#{ingredient_editor.id}']",
     title: Alchemy.t(:place_link),
     id: "edit_link_#{ingredient_editor.id}"
@@ -12,7 +12,7 @@
     render_icon(:unlink),
     '#',
     onclick: "return Alchemy.LinkDialog.removeLink(this, '[data-ingredient-id=\"#{ingredient_editor.id}\"]')",
-    class: "icon_button unlink-essence #{ingredient_editor.linked? ? 'linked' : 'disabled'}",
+    class: "icon_button unlink-ingredient #{ingredient_editor.linked? ? 'linked' : 'disabled'}",
     tabindex: ingredient_editor.linked? ? nil : '-1',
     'data-ingredient-id' => ingredient_editor.id,
     title: Alchemy.t(:unlink)

data/app/views/alchemy/pages/_meta_data.html.erb

@@ -5,5 +5,4 @@
   <%= tag(:meta, name: 'robots', content: meta_robots) %>
   <%= tag(:meta, name: 'description', content: meta_description, lang: @page.language_code) if meta_description.present? %>
   <%= tag(:meta, name: 'keywords', content: meta_keywords, lang: @page.language_code) if meta_keywords.present? %>
-  <%= auto_discovery_link_tag(:rss, show_alchemy_page_url(@page, format: :rss)) if @page.contains_feed? %>
 <% end %>

data/app/views/layouts/alchemy/admin.html.erb

@@ -36,7 +36,11 @@
     </script>
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %>
-    <%= javascript_pack_tag('alchemy/admin') %>
+    <% if respond_to?(:javascript_pack_tag) %>
+      <%= javascript_pack_tag('alchemy/admin', 'data-turbolinks-track' => true, defer: true) %>
+    <% else %>
+      <%= javascript_include_tag('alchemy_admin', 'data-turbolinks-track' => true, defer: true) %>
+    <% end %>
     <%= yield :javascript_includes %>
   </head>
   <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>

data/config/alchemy/config.yml

@@ -66,9 +66,9 @@ items_per_page: 15
 #
 # Example:
 # - name: some_element
-#   contents:
-#   - name: some_picture
-#     type: EssencePicture
+#   ingredients:
+#   - role: some_picture
+#     type: Picture
 #     settings:
 #       hint: true
 #       crop: true  # turns on image cropping
@@ -82,7 +82,7 @@ items_per_page: 15
 #   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)
 #   image_output_format       [String]        # The global image output format setting. (Default +original+)
 #
-# NOTE: You can always override the output format in the settings of your Essence in elements.yml, I.E. {format: 'gif'}
+# NOTE: You can always override the output format in the settings of your ingredients in elements.yml, I.E. {format: 'gif'}
 #
 output_image_jpg_quality: 85
 preprocess_image_resize:
@@ -91,7 +91,7 @@ image_output_format: original
 # This is used by the seeder to create the default site.
 default_site:
   name: Default Site
-  host: '*'
+  host: "*"
 
 # This is the default language when seeding.
 default_language:
@@ -191,7 +191,7 @@ link_target_options: [blank]
 # === Format matchers
 #
 # Named aliases for regular expressions that can be used in various places.
-# The most common use case is the format validation of essences, or attribute validations of your individual models.
+# The most common use case is the format validation of ingredients, or attribute validations of your individual models.
 #
 # == Example:
 #