alchemy_cms 5.2.0.rc1 → 6.0.0.b2

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

@@ -6,7 +6,7 @@
         file_attribute: 'image_file',
         redirect_url: alchemy.admin_pictures_path(
           size: @size,
-          filter: 'last_upload'
+          filter: { misc: 'last_upload' }
         ) %>
       <div class="toolbar_spacer"></div>
     <% end %>
@@ -67,7 +67,7 @@
   </div>
 
   <%= render 'alchemy/admin/partials/search_form',
-    additional_params: [:filter, :tagged_with, :size] %>
+    additional_params: [:size] %>
 <% end %>
 
 <div id="picture_archive" class="resources-table-wrapper with_tag_filter">
@@ -75,7 +75,12 @@
     <h2>
       <%= @pictures.total_count %>
       <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-      <%= Alchemy.t("picture_library.filter.#{search_filter_params[:filter]}") if search_filter_params[:filter].present? %>
+      <% if search_filter_params[:filter].present? %>
+        <%= Alchemy.t("filtered_by") %>
+        <% search_filter_params[:filter].each do |k, v| %>
+          <span class="applied-filter"><%= Alchemy.t("filters.picture.#{k}.values.#{v}") %></span>
+        <% end %>
+      <% end %>
     </h2>
   </div>
   <%= render 'archive' %>

data/app/views/alchemy/admin/resources/_filter.html.erb

@@ -0,0 +1,12 @@
+<label>
+  <h3><%= Alchemy.t("name", scope: ["filters", resource_name, filter.name]) || Alchemy.t('Filter') %></h3>
+  <%= select_tag(
+    filter.name,
+    options_for_select(
+      filter.options_for_select, params[:filter].try(:[], filter.name)
+    ),
+    include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
+    data: { remote: !!request.xhr? },
+    class: 'alchemy_selectbox'
+  ) %>
+</label>

data/app/views/alchemy/admin/resources/_filter_bar.html.erb

@@ -1,28 +1,25 @@
 <div id="filter_bar">
-  <label>
-    <h3><%= local_assigns[:label] || Alchemy.t('Filter') %></h3>
-    <%= select_tag(
-      'resource_filter',
-      options_for_select(
-        resource_filter_select, search_filter_params[:filter]
-      ),
-      include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
-      data: { remote: !!request.xhr? },
-      class: 'alchemy_selectbox'
-    ) %>
-  </label>
+  <%= render partial: "filter", collection: resource_filters_for_select %>
 </div>
 
 <script type="text/javascript">
   $(function() {
-    $('#resource_filter').on('change', function(e) {
+    $('select', '#filter_bar').on('change', function(e) {
       var $this = $(this);
-      var url = '<%= local_assigns[:url] || resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
+      var filter_param = 'filter['+$this.attr('name')+']';
+      var path = '<%= resources_path(resource_handler.namespaced_resources_name) %>';
+      var params = new URLSearchParams('<%= raw search_filter_params.to_query %>');
+
+      if ($this.val() === "") {
+        params.delete(filter_param);
+      } else {
+        params.set(filter_param, $this.val());
+      }
+
       if ($this.data('remote') === true) {
-        $.get(url, {filter: $this.val()}, null, 'script');
+        $.get(path, params.toString(), null, 'script');
       } else {
-        delimiter = url.match(/\?/) ? '&' : '?';
-        Turbolinks.visit(url + delimiter + 'filter=' + encodeURIComponent($this.val()));
+        Turbolinks.visit(path + '?' + params.toString());
       }
       return false;
     });

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -2,9 +2,12 @@
   <% resource_handler.editable_attributes.each do |attribute| %>
     <% if relation = attribute[:relation] %>
       <%= f.association relation[:name].to_sym,
+        collection: relation[:collection],
         label_method: relation[:attr_method],
         include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
         input_html: {class: 'alchemy_selectbox'} %>
+    <% elsif attribute[:type].in? %i[date time datetime] %>
+      <%= f.datepicker attribute[:name], resource_attribute_field_options(attribute) %>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>

data/app/views/alchemy/admin/resources/_table_header.html.erb

@@ -1,4 +1,19 @@
 <div class="resources-header">
+  <% if search_filter_params[:filter].present? %>
+    <b><%= Alchemy.t("filtered_by") %></b>
+    <% search_filter_params[:filter].each do |k, v| %>
+      <%- tmp_params = search_filter_params.dup -%>
+      <%- tmp_params[:filter] = tmp_params[:filter].except(k) -%>
+      <%- dismiss_filter_url = resource_url_proxy.url_for(
+                                { action: 'index' }.merge(tmp_params.except(:page))
+                              ) -%>
+      <div class="applied-filter">
+        <%= Alchemy.t("filters.#{resource_handler.resource_name}.#{k}.values.#{v}", default: v) %>
+        <%= link_to render_icon(:times, size: 'xs'), dismiss_filter_url, class: 'dismiss-filter' %>
+      </div>
+    <% end %>
+  <% end %>
+
   <h2>
     <%= resources_instance_variable.total_count %>
     <%= resource_model.model_name.human(count: resources_instance_variable.total_count) %>

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

@@ -21,10 +21,7 @@
     dialog: false,
     if_permitted_to: [:index, resource_model]
   ) %>
-  <%= render 'alchemy/admin/partials/search_form', additional_params: [
-    resource_has_filters ? :filter : nil,
-    resource_has_tags ? :tagged_with : nil
-  ].compact %>
+  <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
@@ -33,13 +30,8 @@
 
   <% if resource_has_tags || resource_has_filters %>
     <div id="library_sidebar">
-      <% if resource_has_filters %>
-        <%= render 'filter_bar' %>
-      <% end %>
-
-      <% if resource_has_tags %>
-        <%= render 'tag_list' %>
-      <% end %>
+      <%= render 'filter_bar' if resource_has_filters %>
+      <%= render 'tag_list' if resource_has_tags %>
     </div>
   <% end %>
 </div>

data/app/views/alchemy/essences/_essence_audio_editor.html.erb

@@ -0,0 +1,4 @@
+<%= render(
+  "alchemy/essences/essence_file_editor",
+  essence_file_editor: essence_audio_editor
+) %>

data/app/views/alchemy/essences/_essence_audio_view.html.erb

@@ -0,0 +1,15 @@
+<% content = local_assigns[:content] || local_assigns[:essence_audio_view] %>
+<%- if content.ingredient -%>
+  <%= content_tag :audio,
+      controls: content.essence.controls,
+      autoplay: content.essence.autoplay,
+      loop: content.essence.loop,
+      muted: content.essence.muted do %>
+    <%= tag :source,
+      src: alchemy.show_attachment_path(
+        content.ingredient,
+        format: content.ingredient.suffix
+      ),
+      type: content.ingredient.file_mime_type %>
+  <% end %>
+<%- end -%>

data/app/views/alchemy/essences/_essence_file_editor.html.erb

@@ -1,6 +1,6 @@
 <% dialog_link = link_to_dialog render_icon(:file, style: 'regular'),
   alchemy.admin_attachments_path(
-    content_id: essence_file_editor.id,
+    form_field_id: essence_file_editor.form_field_id(:attachment_id),
     only: essence_file_editor.settings[:only],
     except: essence_file_editor.settings[:except]
   ),
@@ -22,17 +22,26 @@
       <div class="file_icon">
         <%= render_icon(essence_file_editor.ingredient.icon_css_class) %>
       </div>
-    <% else %>
-      <%= dialog_link %>
     <% end %>
     <div class="file_name">
-      <%= essence_file_editor.ingredient.try(:name) ||
-        ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
+      <%= essence_file_editor.ingredient.try(:name) %>
     </div>
+    <%= link_to render_icon(:times), "#",
+      class: [
+        "remove_file_link",
+        essence_file_editor.ingredient ? nil : "hidden"
+      ],
+      data: {
+        form_field_id: essence_file_editor.form_field_id(:attachment_id)
+      } %>
     <div class="essence_file_tools">
       <%= dialog_link %>
       <%= link_to_dialog render_icon(:edit),
-        alchemy.edit_admin_essence_file_path(id: essence_file_editor.essence.id),
+        alchemy.polymorphic_url([
+          :edit,
+          :admin,
+          essence_file_editor.essence
+        ]),
         {
           title: Alchemy.t(:edit_file_properties),
           size: '400x215'

data/app/views/alchemy/essences/_essence_headline_editor.html.erb

@@ -0,0 +1,36 @@
+<%= content_tag :div,
+  id: essence_headline_editor.dom_id,
+  class: essence_headline_editor.css_classes,
+  data: essence_headline_editor.data_attributes do %>
+  <%= content_label(essence_headline_editor) %>
+  <%= text_field_tag(
+    essence_headline_editor.form_field_name,
+    essence_headline_editor.essence.body,
+    id: essence_headline_editor.form_field_id
+  ) %>
+
+  <div class="input-row">
+    <% essence = essence_headline_editor.essence %>
+    <% if essence.level_options.length > 1 %>
+      <div class="input-column">
+        <%= label_tag Alchemy::EssenceHeadline.human_attribute_name(:level) %>
+        <%= select_tag(
+          essence_headline_editor.form_field_name(:level),
+          options_for_select(essence_headline_editor.essence.level_options, essence_headline_editor.essence.level),
+          class: "alchemy_selectbox full_width"
+        ) %>
+      </div>
+    <% end %>
+
+    <% if essence.size_options.length > 1 %>
+      <div class="input-column">
+        <%= label_tag Alchemy::EssenceHeadline.human_attribute_name(:size) %>
+        <%= select_tag(
+          essence_headline_editor.form_field_name(:size),
+          options_for_select(essence_headline_editor.essence.size_options, essence_headline_editor.essence.size),
+          class: "alchemy_selectbox full_width"
+        ) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/alchemy/essences/_essence_headline_view.html.erb

@@ -0,0 +1,10 @@
+<% content = local_assigns[:content] || local_assigns[:essence_headline_view] %>
+<%- html_options = local_assigns.fetch(:html_options, {}) -%>
+
+<%= content_tag "h#{content.essence.level}",
+    content.essence.ingredient,
+    class: [
+      content.essence.size ? "h#{content.essence.size}" : nil,
+      html_options[:class]
+    ]
+%>

data/app/views/alchemy/essences/_essence_link_editor.html.erb

@@ -10,13 +10,17 @@
     disabled: true
   %>
   <%= hidden_field_tag essence_link_editor.form_field_name(:link),
-    essence_link_editor.essence.link %>
+    essence_link_editor.essence.link,
+    "data-link-value": true %>
   <%= hidden_field_tag essence_link_editor.form_field_name(:link_title),
-    essence_link_editor.essence.link_title %>
+    essence_link_editor.essence.link_title,
+    "data-link-title": true %>
   <%= hidden_field_tag essence_link_editor.form_field_name(:link_class_name),
-    essence_link_editor.essence.link_class_name %>
+    essence_link_editor.essence.link_class_name,
+    "data-link-class": true %>
   <%= hidden_field_tag essence_link_editor.form_field_name(:link_target),
-    essence_link_editor.essence.link_target %>
+    essence_link_editor.essence.link_target,
+    "data-link-target": true %>
   <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_link_editor.content %>
 <% end %>
 <script type="text/javascript" charset="utf-8">

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -5,11 +5,18 @@
   class: essence_picture_editor.css_classes,
   data: essence_picture_editor.data_attributes do %>
   <%= content_label(essence_picture_editor) %>
-  <div class="picture_thumbnail">
-    <span class="picture_tool delete">
-      <%= link_to render_icon(:times), '#',
-        onclick: "return Alchemy.removePicture('##{essence_picture_editor.form_field_id(:picture_id)}');" %>
-    </span>
+  <%= content_tag :div,
+    data: {
+      target_size: essence_picture_editor.essence.content.settings[:size] || [
+        essence_picture_editor.essence.image_file_width.to_i,
+        essence_picture_editor.essence.image_file_height.to_i
+      ].join("x"),
+      image_cropper: essence_picture_editor.essence.thumbnail_url_options[:crop],
+    },
+    class: "picture_thumbnail" do %>
+    <a class="picture_tool delete">
+      <%= render_icon(:times) %>
+    </a>
     <div class="picture_image">
       <div class="thumbnail_background">
         <%- if essence_picture_editor.ingredient -%>
@@ -27,18 +34,26 @@
     <%- end -%>
     <div class="edit_images_bottom">
       <%= render 'alchemy/essences/shared/essence_picture_tools', {
-        content: essence_picture_editor.content
+        essence_picture_editor: essence_picture_editor
       } %>
     </div>
-  </div>
+  <% end %>
   <%= hidden_field_tag essence_picture_editor.form_field_name(:picture_id),
-    essence_picture_editor.ingredient.try!(:id) %>
+    essence_picture_editor.ingredient&.id, data: {
+      picture_id: true,
+      image_file_width: essence_picture_editor.ingredient&.image_file_width,
+      image_file_height: essence_picture_editor.ingredient&.image_file_height
+    } %>
   <%= hidden_field_tag essence_picture_editor.form_field_name(:link),
-    essence_picture_editor.essence.link %>
+    essence_picture_editor.essence.link, data: { link_value: true }%>
   <%= hidden_field_tag essence_picture_editor.form_field_name(:link_title),
-    essence_picture_editor.essence.link_title %>
+    essence_picture_editor.essence.link_title, data: { link_title: true } %>
   <%= hidden_field_tag essence_picture_editor.form_field_name(:link_class_name),
-    essence_picture_editor.essence.link_class_name %>
+    essence_picture_editor.essence.link_class_name, data: { link_class: true } %>
   <%= hidden_field_tag essence_picture_editor.form_field_name(:link_target),
-    essence_picture_editor.essence.link_target %>
+    essence_picture_editor.essence.link_target, data: { link_target: true } %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:crop_from),
+    essence_picture_editor.essence.crop_from, data: { crop_from: true } %>
+  <%= hidden_field_tag essence_picture_editor.form_field_name(:crop_size),
+    essence_picture_editor.essence.crop_size, data: { crop_size: true } %>
 <% end %>

data/app/views/alchemy/essences/_essence_picture_view.html.erb

@@ -1,6 +1,6 @@
 <% content = local_assigns[:content] || local_assigns[:essence_picture_view] %>
 <%= Alchemy::EssencePictureView.new(
   content,
-  local_assigns[:options],
-  local_assigns[:html_options]
-).render %>
+  local_assigns[:options] || {},
+  local_assigns[:html_options] || {}
+).render %>

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -12,10 +12,18 @@
     type: essence_text_editor.settings[:input_type] || "text"
   ) %>
   <% if essence_text_editor.settings[:linkable] %>
-    <%= hidden_field_tag essence_text_editor.form_field_name(:link), essence_text_editor.essence.link %>
-    <%= hidden_field_tag essence_text_editor.form_field_name(:link_title), essence_text_editor.essence.link_title %>
-    <%= hidden_field_tag essence_text_editor.form_field_name(:link_class_name), essence_text_editor.essence.link_class_name %>
-    <%= hidden_field_tag essence_text_editor.form_field_name(:link_target), essence_text_editor.essence.link_target %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link),
+      essence_text_editor.essence.link,
+      "data-link-value": true %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link_title),
+      essence_text_editor.essence.link_title,
+      "data-link-title": true %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link_class_name),
+      essence_text_editor.essence.link_class_name,
+      "data-link-class": true %>
+    <%= hidden_field_tag essence_text_editor.form_field_name(:link_target),
+      essence_text_editor.essence.link_target,
+      "data-link-target": true %>
     <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_text_editor.content %>
   <% end %>
 <% end %>

data/app/views/alchemy/essences/_essence_video_editor.html.erb

@@ -0,0 +1,4 @@
+<%= render(
+  "alchemy/essences/essence_file_editor",
+  essence_file_editor: essence_video_editor
+) %>

data/app/views/alchemy/essences/_essence_video_view.html.erb

@@ -0,0 +1,18 @@
+<% content = local_assigns[:content] || local_assigns[:essence_video_view] %>
+<%- if content.ingredient -%>
+  <%= content_tag :video,
+    controls: content.essence.controls,
+    autoplay: content.essence.autoplay,
+    loop: content.essence.loop,
+    muted: content.essence.muted,
+    preload: content.essence.preload.presence,
+    width: content.essence.width.presence,
+    height: content.essence.height.presence do %>
+    <%= tag :source,
+      src: alchemy.show_attachment_path(
+        content.ingredient,
+        format: content.ingredient.suffix
+      ),
+      type: content.ingredient.file_mime_type %>
+  <% end %>
+<%- end -%>

data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb

@@ -1,22 +1,27 @@
+<% content = essence_picture_editor.essence.content %>
 <% linkable = content.settings[:linkable] != false %>
+<% croppable = content.essence && content.essence.allow_image_cropping? %>
 
-<% if content.essence && content.essence.allow_image_cropping? %>
-  <%= link_to_dialog render_icon(:crop),
-    alchemy.crop_admin_essence_picture_path(content.essence), {
-      size: "1080x615",
-      title: Alchemy.t('Edit Picturemask'),
-      image_loader: false,
-      padding: false
-    }, {title: Alchemy.t('Edit Picturemask')} %>
-<%- else -%>
-  <a href="#" class="disabled" tabindex="-1"><%= render_icon(:crop) %></a>
-<%- end -%>
+<%= link_to_dialog render_icon(:crop),
+  alchemy.crop_admin_essence_picture_path(content.essence, {
+    crop_from_form_field_id: essence_picture_editor.form_field_id(:crop_from),
+    crop_size_form_field_id: essence_picture_editor.form_field_id(:crop_size),
+    picture_id: content.essence.picture_id
+  }), {
+    size: "1080x615",
+    title: Alchemy.t('Edit Picturemask'),
+    image_loader: false,
+    padding: false
+  }, {
+    title: Alchemy.t('Edit Picturemask'),
+    class: croppable ? "crop_link" : "disabled crop_link",
+    tabindex: croppable ? nil : "-1",
+    onclick: "return false"
+  } %>
 
 <%= link_to_dialog render_icon('file-image', style: 'regular'),
   alchemy.admin_pictures_path(
-    element_id: content.element,
-    content_id: content.id,
-    swap: true
+    form_field_id: essence_picture_editor.form_field_id(:picture_id)
   ),
   {
     title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
@@ -29,14 +34,14 @@
   onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
   class: content.linked? ? 'linked' : nil,
   title: Alchemy.t(:link_image),
-  'data-content-id' => content.id,
+  "data-parent-selector": "##{content.dom_id}",
   id: "edit_link_#{content.id}"
 } do %>
   <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>
 <% end %>
 
 <%= link_to_if linkable, render_icon(:unlink), '', {
-  onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
+  onclick: "return Alchemy.LinkDialog.removeLink(this, '##{content.dom_id}')",
   class: content.linked? ? 'linked' : 'disabled',
   tabindex: content.linked? ? nil : '-1',
   title: Alchemy.t(:unlink)