alchemy_cms 5.2.1 → 6.0.0.pre.b4

data/app/services/alchemy/duplicate_element.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class DuplicateElement
+    SKIPPED_ATTRIBUTES_ON_COPY = [
+      "cached_tag_list",
+      "created_at",
+      "creator_id",
+      "position",
+      "id",
+      "folded",
+      "updated_at",
+      "updater_id",
+    ].freeze
+
+    attr_reader :source_element, :repository
+
+    def initialize(source_element, repository: source_element.page_version.element_repository)
+      @source_element = source_element
+      @repository = repository
+    end
+
+    def call(differences = {})
+      attributes = source_element.attributes.with_indifferent_access
+        .except(*SKIPPED_ATTRIBUTES_ON_COPY)
+        .merge(differences)
+        .merge(
+          autogenerate_contents: false,
+          autogenerate_ingredients: false,
+          autogenerate_nested_elements: false,
+          tags: source_element.tags,
+        )
+
+      new_element = Element.new(attributes)
+      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
+          )
+        end
+      end
+
+      new_element
+    end
+  end
+end

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -6,8 +6,7 @@
       file_attribute: 'file',
       in_dialog: true,
       redirect_url: admin_attachments_path(
-        element_id: @element.try(:id),
-        content_id: @content.try(:id)
+        form_field_id: @form_field_id
       ) %>
   <% end %>
   <%= render 'alchemy/admin/partials/remote_search_form' %>
@@ -15,7 +14,7 @@
 
 <div id="assign_file_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
   <div id="library_sidebar">
-    <%= render 'filter_bar' %>
+    <%= render 'filter_bar' if resource_has_filters %>
 
     <% if Alchemy::Attachment.tag_counts.any? %>
       <div class="tag-list">

data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb

@@ -1,7 +1,7 @@
 <li class="assign_file_file <%= cycle('even', 'odd') %>">
-  <%= link_to alchemy.assign_admin_essence_files_path(
-      attachment_id: file_to_assign.id,
-      content_id: @content.id
+  <%= link_to alchemy.assign_admin_attachment_path(
+      id: file_to_assign.id,
+      form_field_id: @form_field_id
     ),
     remote: true,
     method: 'put' do %>

data/app/views/alchemy/admin/attachments/assign.js.erb

@@ -0,0 +1,11 @@
+(function () {
+  var $form_field = $("#<%= @form_field_id -%>")
+  $("#assignable_<%= @assignable_id %> a").attr("href", "#").off("click")
+  $form_field.val("<%= @assignable_id %>")
+  $form_field.parent().find("> .file_name").text("<%= @attachment.name %>")
+  $form_field.parent().find("> .file_icon").html("<%= j render_icon(@attachment.icon_css_class) %>")
+  $form_field.parent().find("> .remove_file_link").removeClass("hidden")
+  Alchemy.closeCurrentDialog(function() {
+    Alchemy.setElementDirty($form_field.closest(".element-editor"))
+  })
+})()

data/app/views/alchemy/admin/attachments/index.html.erb

@@ -7,8 +7,7 @@
         file_attribute: 'file' %>
     <% end %>
   </div>
-  <%= render 'alchemy/admin/partials/search_form',
-    additional_params: [:file_type, :tagged_with] %>
+  <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="with_tag_filter resources-table-wrapper">
@@ -16,7 +15,7 @@
   <%= render 'files_list' %>
 
   <div id="library_sidebar">
-    <%= render 'filter_bar' %>
+    <%= render 'filter_bar' if resource_has_filters %>
 
     <% if Alchemy::Attachment.tag_counts.any? %>
       <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">

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

@@ -0,0 +1,36 @@
+<div id="jscropper">
+<% if @no_image_notice %>
+  <%= render_message :warn do %>
+    <%= @no_image_notice %>
+  <% end %>
+<% else %>
+  <%= render_message do %>
+    <%= simple_format Alchemy.t(:explain_cropping) %>
+  <% end %>
+  <div class="thumbnail_background">
+    <%= image_tag @picture.url(size: '800x600', flatten: true), id: 'imageToCrop' %>
+  </div>
+  <form>
+    <%= button_tag Alchemy.t(:apply), type: 'submit' %>
+    <%= button_tag Alchemy.t('Reset Imagemask'), class: 'reset_mask', type: 'reset' %>
+  </form>
+</div>
+<% end %>
+<% if @settings %>
+<script type="text/javascript">
+  Alchemy.ImageLoader('#jscropper .thumbnail_background');
+  $('#imageToCrop').load(function() {
+    new Alchemy.ImageCropper(
+      <%= @settings[:min_size].to_json %>,
+      <%= @settings[:default_box].to_json %>,
+      <%= @settings[:ratio] %>,
+      <%= @settings[:image_size].to_json %>,
+      [
+        "<%= params[:crop_from_form_field_id] %>",
+        "<%= params[:crop_size_form_field_id] %>",
+      ],
+      <%= @element.id %>
+    );
+  });
+</script>
+<% end %>

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

@@ -4,11 +4,11 @@
   class: element.css_classes do %>
 
   <% unless element.fixed? %>
-    <%= render 'alchemy/admin/elements/element_header', element: element %>
+    <%= render 'alchemy/admin/elements/header', element: element %>
   <% end %>
 
   <% if element.expanded? || element.fixed? %>
-    <%= render 'alchemy/admin/elements/element_toolbar', element: element %>
+    <%= render 'alchemy/admin/elements/toolbar', element: element %>
 
     <% element.definition[:message].tap do |message| %>
       <%= render_message(:info, sanitize(message)) if message %>
@@ -23,11 +23,15 @@
         html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
 
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
-
-        <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <%= render element.contents %>
-        </div>
-
+        <% if element.has_ingredients_defined? %>
+          <div class="element-ingredient-editors">
+            <%= render element.ingredients, element_form: f %>
+          </div>
+        <% else %>
+          <div id="element_<%= element.id %>_content" class="element-content-editors">
+            <%= render element.contents %>
+          </div>
+        <% end %>
         <% if element.taggable? %>
           <div class="autocomplete_tag_list">
             <%= f.label :tag_list %>
@@ -36,7 +40,7 @@
         <% end %>
       <% end %>
 
-      <%= render 'alchemy/admin/elements/element_footer', element: element %>
+      <%= render 'alchemy/admin/elements/footer', element: element %>
     <% end %>
   <% end %>
 
@@ -57,7 +61,7 @@
           <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
             remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
             <%= f.hidden_field :name %>
-            <%= f.hidden_field :page_id, value: element.page_id %>
+            <%= f.hidden_field :page_version_id, value: element.page_version_id %>
             <%= f.hidden_field :parent_element_id, value: element.id %>
             <button class="button add-nestable-element-button" data-alchemy-button>
               <%= Alchemy.t(:add_nested_element) % { name: Alchemy.t(nestable_element, scope: 'element_names') } %>
@@ -67,7 +71,7 @@
           <%= link_to_dialog Alchemy.t("New Element"),
             alchemy.new_admin_element_path(
               parent_element_id: element.id,
-              page_id: element.page.id
+              page_version_id: element.page_version_id
             ), {
               size: "320x125",
               title: Alchemy.t("New Element")

data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb}

@@ -4,7 +4,7 @@
   <% end %>
 <%- else -%>
   <%= alchemy_form_for [:admin, @element] do |form| %>
-    <%= form.hidden_field :page_id %>
+    <%= form.hidden_field :page_version_id %>
     <%= form.input :name,
       label: Alchemy.t(:element_of_type),
       collection: elements_for_select(@elements),

data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb}

@@ -18,7 +18,7 @@
       <%= sanitize(element.preview_text.presence || '&nbsp;') %>
     </span>
   </span>
-  <%= render_hint_for(element) unless element.trashed? %>
+  <%= render_hint_for(element) %>
   <%= link_to '#', {
     'data-element-toggle' => element.id,
     title: Alchemy.t(element.folded? ? :show_element_content : :hide_element_content),

data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb}

@@ -22,14 +22,13 @@
       <label><%= Alchemy.t(:cut_element) %></label>
     </div>
     <div class="button_with_label">
-      <%= link_to(
+      <%= link_to_confirm_dialog(
         render_icon('trash-alt'),
-        alchemy.trash_admin_element_path(element),
-        method: :delete,
-        class: "icon_button",
-        remote: true
+        Alchemy.t(:confirm_to_delete_element),
+        alchemy.admin_element_path(element),
+        class: "icon_button"
       ) -%>
-      <label><%= Alchemy.t("trash element") %></label>
+      <label><%= Alchemy.t("Delete element") %></label>
     </div>
     <div class="button_with_label publish-element-button">
       <%= link_to(

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.to_json %>);
+  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.focusElementPreview(<%= @element.id %>);
   });

data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb}

@@ -1,13 +1,9 @@
 $('#element_<%= @element.id %>').hide(200, function() {
   $(this).remove();
-  Alchemy.growl('<%= j Alchemy.t("Element trashed") %>');
+  Alchemy.growl('<%= j @notice %>');
   $('#element_area .sortable-elements').sortable('refresh');
-  Alchemy.TrashWindow.refresh();
-  $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
-  <% @element.richtext_contents_ids.each do |id| %>
-  tinymce.get('tinymce_<%= id %>').remove();
-  <% end %>
+  Alchemy.Tinymce.remove(<%= @richtext_ids.to_json %>);
   <% if @element.fixed? %>
   Alchemy.FixedElements.removeTab(<%= @element.id %>);
   <% end %>

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

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

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

@@ -1,5 +1,5 @@
 <%- if @clipboard_items.blank? -%>
-  <%= render 'new_element_form' %>
+  <%= render 'form' %>
 <%- else -%>
 <div id="overlay_tabs">
   <ul>
@@ -7,11 +7,11 @@
     <li><a href="#paste_element_tab"><%= Alchemy.t('Paste from clipboard') %></a></li>
   </ul>
   <div id="create_element_tab">
-    <%= render 'new_element_form' %>
+    <%= render 'form' %>
   </div>
   <div id="paste_element_tab">
     <%= alchemy_form_for([:admin, @element]) do |f| %>
-      <%= f.hidden_field :page_id %>
+      <%= f.hidden_field :page_version_id %>
       <%= f.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>

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

@@ -6,23 +6,6 @@
     '<%= sanitize(@parent_element.preview_text.presence || '&nbsp;') %>'
   );
 <% end %>
-
-<% if @trashed_element_ids.any? %>
-
-  $('#element_area .ajax-folder').show();
-  <% element_ids = @trashed_element_ids.collect do |id|
-                     "#element_area [data-element-id=\"#{id}\"]"
-                   end.join(", ").html_safe %>
-  <% @trashed_element_ids.each do |id| %>
-  $('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
-  <% end %>
-  Alchemy.growl('<%= Alchemy.t(:successfully_restored_element) -%>');
-
-<% else %>
-
   Alchemy.growl('<%= Alchemy.t(:successfully_saved_element_position) -%>');
-
-<% end %>
-
   Alchemy.PreviewWindow.refresh();
 })();

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', $el).removeClass('validation_failed');
+  $('> .element-content .content_editor, > .element-content .ingredient-editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 
@@ -15,9 +15,10 @@
 <%- else -%>
 
   Alchemy.growl('<%= j @notice %>', 'warn');
-  $errors.html('<%= j @error_message %><ul><li><%== j @element.essence_error_messages.join("</li><li>") %></li></ul>');
+  $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);
 
 <%- end -%>

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

@@ -0,0 +1,7 @@
+<%= alchemy_form_for [:admin, @essence_audio] do |f| %>
+  <%= f.input :autoplay %>
+  <%= f.input :controls %>
+  <%= f.input :loop %>
+  <%= f.input :muted %>
+  <%= f.submit Alchemy.t(:save) %>
+<% end %>

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

@@ -1,5 +1,4 @@
 (function($) {
-  Alchemy.ImageCropper.destroy();
   Alchemy.closeCurrentDialog();
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
 <% if @content.ingredient %>

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

@@ -0,0 +1,11 @@
+<%= alchemy_form_for [:admin, @essence_video] do |f| %>
+  <%= f.input :width %>
+  <%= f.input :height %>
+  <%= f.input :autoplay %>
+  <%= f.input :controls %>
+  <%= f.input :loop %>
+  <%= f.input :muted %>
+  <%= f.input :preload, collection: %w(auto none metadata),
+    include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.submit Alchemy.t(:save) %>
+<% end %>

data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb

@@ -0,0 +1,4 @@
+<%= f.input :autoplay, as: :boolean %>
+<%= f.input :controls, as: :boolean %>
+<%= f.input :loop, as: :boolean %>
+<%= f.input :muted, as: :boolean %>

data/app/views/alchemy/admin/ingredients/_file_fields.html.erb

@@ -0,0 +1,18 @@
+<% css_classes = ingredient.settings[:css_classes] %>
+
+<%= f.input :link_text %>
+<%= f.input :title %>
+<%- if css_classes.present? -%>
+  <%= f.input :css_class,
+    collection: css_classes,
+    include_blank: Alchemy.t('None'),
+    input_html: {class: 'alchemy_selectbox'} %>
+<%- else -%>
+  <%= f.input :css_class,
+    label: Alchemy.t(:position_in_text),
+    collection: [
+      [Alchemy.t(:above), "no_float"],
+      [Alchemy.t(:left), "left"],
+      [Alchemy.t(:right), "right"]
+    ], include_blank: Alchemy.t('Layout default'), input_html: {class: 'alchemy_selectbox'} %>
+<%- end -%>

data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb

@@ -0,0 +1,25 @@
+<%= f.input :caption, as: ingredient.settings[:caption_as_textarea] ? 'text' : 'string' %>
+<%= f.input :title %>
+<%= f.input :alt_tag %>
+<%- if ingredient.settings[:sizes].present? && ingredient.settings[:srcset].blank? -%>
+  <%= f.input :render_size,
+    collection: [
+      [Alchemy.t('Layout default'), ""]
+    ] + ingredient.settings[:sizes].to_a,
+    include_blank: false,
+    input_html: {class: 'alchemy_selectbox'} %>
+<%- end -%>
+<%- if ingredient.settings[:css_classes].present? -%>
+  <%= f.input :css_class,
+    collection: ingredient.settings[:css_classes],
+    include_blank: Alchemy.t('None'),
+    input_html: {class: 'alchemy_selectbox'} %>
+<%- else -%>
+  <%= f.input :css_class,
+    label: Alchemy.t(:position_in_text),
+    collection: [
+      [Alchemy.t(:above), "no_float"],
+      [Alchemy.t(:left), "left"],
+      [Alchemy.t(:right), "right"]
+    ], include_blank: Alchemy.t("Layout default"), input_html: {class: 'alchemy_selectbox'} %>
+<%- end -%>