alchemy_cms 4.5.0 → 5.0.0.rc1

data/app/views/alchemy/admin/pages/unlock.js.erb

@@ -1,6 +1,13 @@
-(function($) {
-  $('#locked_page_<%= @page.id -%>').remove();
-  $('#page_<%= @page.id -%> .sitemap_left_images .with-hint').remove();
-  $('#page_<%= @page.id -%> .sitemap_left_images').append('<%= j render_icon(:file, style: 'regular', size: 'lg') %>');
-  Alchemy.growl('<%= flash[:notice] -%>');
-})(jQuery);
+(function() {
+  var locked_page_tab = document.querySelector('#locked_page_<%= @page.id -%>')
+  var locked_page_icon = document.querySelector(
+    '#page_<%= @page.id -%> > .sitemap_page > .sitemap_left_images .with-hint'
+  )
+  if (locked_page_tab) {
+    locked_page_tab.remove()
+  }
+  if (locked_page_icon) {
+    locked_page_icon.innerHTML = '<%= j render_icon(:file, style: 'regular', size: 'lg') %>'
+  }
+  Alchemy.growl('<%= flash[:notice] -%>')
+})()

data/app/views/alchemy/admin/partials/_remote_search_form.html.erb

@@ -1,6 +1,5 @@
 <%= search_form_for @query, url: url_for(
     action: 'index',
-    options: options_from_params,
     size: @size
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
@@ -17,7 +16,6 @@
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
-        options: options_from_params,
         size: @size,
         overlay: true
       ),

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

@@ -9,8 +9,7 @@
         size: search_filter_params[:size],
         filter: 'last_upload',
         content_id: @content.try(:id),
-        element_id: @element.try(:id),
-        options: options_from_params
+        element_id: @element.try(:id)
       ) %>
     <div class="toolbar_spacer"></div>
   <% end %>
@@ -23,7 +22,6 @@
           content_id: @content,
           element_id: @element,
           q: search_filter_params[:q],
-          options: options_from_params,
           filter: search_filter_params[:filter],
           tagged_with: search_filter_params[:tagged_with]
         }),
@@ -40,7 +38,6 @@
           content_id: @content,
           element_id: @element,
           q: search_filter_params[:q],
-          options: options_from_params,
           filter: search_filter_params[:filter],
           tagged_with: search_filter_params[:tagged_with]
         }),
@@ -57,7 +54,6 @@
           content_id: @content,
           element_id: @element,
           q: search_filter_params[:q],
-          options: options_from_params,
           filter: search_filter_params[:filter],
           tagged_with: search_filter_params[:tagged_with]
         }),

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

@@ -5,6 +5,6 @@
 <% else %>
   <%= render partial: 'picture_to_assign',
     collection: @pictures,
-    locals: {options: options_from_params, size: @size} %>
+    locals: {size: @size} %>
   <%= paginate @pictures, theme: 'alchemy', remote: true, hide_per_page_select: true %>
 <% end %>

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

@@ -6,8 +6,7 @@
     ),
     alchemy.assign_admin_essence_pictures_path(
       picture_id: picture_to_assign.id,
-      content_id: @content,
-      options: options
+      content_id: @content
     ),
     remote: true,
     onclick: '$(self).attr("href", "#").off("click"); return false',

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

@@ -14,7 +14,12 @@
       <div class="button_with_label">
         <%= link_to(
           render_icon('search-minus'),
-          alchemy.admin_pictures_path(size: "small", q: search_filter_params[:q]),
+          alchemy.admin_pictures_path(
+            size: "small",
+            q: search_filter_params[:q],
+            filter: search_filter_params[:filter],
+            tagged_with: search_filter_params[:tagged_with]
+          ),
           title: Alchemy.t(:small_thumbnails),
           class: "icon_button"
         ) %>
@@ -22,7 +27,12 @@
       <div class="button_with_label">
         <%= link_to(
           render_icon('search'),
-          alchemy.admin_pictures_path(size: "medium", q: search_filter_params[:q]),
+          alchemy.admin_pictures_path(
+            size: "medium",
+            q: search_filter_params[:q],
+            filter: search_filter_params[:filter],
+            tagged_with: search_filter_params[:tagged_with]
+          ),
           title: Alchemy.t(:medium_thumbnails),
           class: "icon_button"
         ) %>
@@ -30,7 +40,12 @@
       <div class="button_with_label">
         <%= link_to(
           render_icon('search-plus'),
-          alchemy.admin_pictures_path(size: "large", q: search_filter_params[:q]),
+          alchemy.admin_pictures_path(
+            size: "large",
+            q: search_filter_params[:q],
+            filter: search_filter_params[:filter],
+            tagged_with: search_filter_params[:tagged_with]
+          ),
           title: Alchemy.t(:big_thumbnails),
           class: "icon_button"
         ) %>

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

@@ -1,5 +1,5 @@
 <tr class="<%= cycle('even', 'odd') %>">
-<% resource_handler.attributes.each do |attribute| %>
+<% resource_handler.sorted_attributes.each do |attribute| %>
   <td class="<%= attribute[:type] %> <%= attribute[:name] %>">
   <% if attribute[:type] == :boolean %>
     <%= resource.public_send(attribute[:name]) ? render_icon(:check) : nil %>

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

@@ -2,12 +2,12 @@
 <table class="list" id="<%= resource_handler.resources_name %>_list">
   <thead>
     <tr>
-    <% resource_handler.attributes.each do |attribute| %>
+    <% resource_handler.sorted_attributes.each do |attribute| %>
       <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
         <%= sort_link [:resource_url_proxy, @query],
           sortable_resource_header_column(attribute),
           resource_handler.model.human_attribute_name(attribute[:name]),
-          hide_indicator: true %>
+          default_order: attribute[:type].to_s =~ /date|time/ ? 'desc' : 'asc' %>
       </th>
     <% end %>
       <th class="tools"></th>

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

@@ -0,0 +1,8 @@
+<%= alchemy_form_for site, url: alchemy.admin_sites_path(site, search_filter_params) do |f| %>
+  <%= f.input :host, hint: resource_handler.help_text_for(name: :host).html_safe %>
+  <%= f.input :name %>
+  <%= f.input :public %>
+  <%= f.input :aliases, hint: resource_handler.help_text_for(name: :aliases), input_html: {rows: 4} %>
+  <%= f.input :redirect_to_primary_host %>
+  <%= f.submit Alchemy.t(:save) %>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render 'form', site: @site %>

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

@@ -1,8 +1,8 @@
 <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
-<% toolbar(
-  buttons: [
-    {
+<% content_for :toolbar do %>
+  <div class="toolbar_buttons">
+    <%= toolbar_button(
       icon: :plus,
       label: label_title,
       url: new_resource_path,
@@ -10,14 +10,26 @@
       hotkey: 'alt+n',
       dialog_options: {
         title: label_title,
-        size: resource_window_size
+        size: "430x415"
       },
       if_permitted_to: [:create, Alchemy::Site]
-    }
-  ]
-) %>
+    ) if @sites.any? %>
+  </div>
+  <%= render 'alchemy/admin/partials/search_form' %>
+<% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <%= render 'alchemy/admin/resources/table_header' %>
-  <%= render 'table' %>
+  <% if @sites.any? %>
+    <%= render 'alchemy/admin/resources/table_header' %>
+    <%= render 'table' %>
+  <% elsif search_filter_params[:q].present? %>
+    <%= render_message { Alchemy.t('Nothing found') } %>
+  <% else %>
+    <div class="panel no-resource-found">
+      <%= render_message do %>
+        <%== Alchemy.t('alchemy/site', scope: :no_resource_found) %>
+      <% end %>
+      <%= render 'form', site: Alchemy::Site.new(Alchemy::Config.get(:default_site).merge(public: true)) %>
+    </div>
+  <% end %>
 </div>

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

@@ -0,0 +1 @@
+<%= render 'form', site: @site %>

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

@@ -23,9 +23,9 @@
     <thead>
       <tr>
         <th class="icon"></th>
-        <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
+        <th class="name"><%= sort_link(@query, :name) %></th>
         <th class="count"><%= Gutentag::Tag.human_attribute_name(:taggings_types) %></th>
-        <th class="count"><%= sort_link(@query, :taggings_count, hide_indicator: true) %></th>
+        <th class="count"><%= sort_link(@query, :taggings_count) %></th>
         <th class="tools"></th>
       </tr>
     </thead>

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

@@ -1,13 +1,11 @@
-<div class="content_editor essence_boolean" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <input type="hidden" value="0" name="<%= content.form_field_name %>">
-  <%= check_box_tag content.form_field_name, 1,
-    content.ingredient.presence || content.settings_value(
-      :default_value, local_assigns.fetch(:options, {})
-    ),
-    class: local_assigns.fetch(:html_options, {})[:class],
-    style: local_assigns.fetch(:html_options, {})[:style] %>
-  <label for="<%= content.form_field_id %>" style="display: inline">
-    <%= render_content_name(content) %>
+<%= content_tag :div,
+  id: essence_boolean_editor.dom_id,
+  class: essence_boolean_editor.css_classes,
+  data: essence_boolean_editor.data_attributes do %>
+  <input type="hidden" value="0" name="<%= essence_boolean_editor.form_field_name %>">
+  <%= check_box_tag essence_boolean_editor.form_field_name, 1, essence_boolean_editor.ingredient %>
+  <label for="<%= essence_boolean_editor.form_field_id %>" style="display: inline">
+    <%= render_content_name(essence_boolean_editor) %>
   </label>
-  <%= render_hint_for(content) %>
-</div>
+  <%= render_hint_for(essence_boolean_editor) %>
+<% end %>

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

@@ -1,13 +1,16 @@
-<div class="content_editor essence_date" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
+<%= content_tag :div,
+  id: essence_date_editor.dom_id,
+  class: essence_date_editor.css_classes,
+  data: essence_date_editor.data_attributes do %>
+  <%= content_label(essence_date_editor) %>
   <%= alchemy_datepicker(
-    content.essence, :date, {
-      name: content.form_field_name,
-      id: content.form_field_id,
-      value: content.settings_value(:default_value, local_assigns.fetch(:options, {}))
+    essence_date_editor.essence, :date, {
+      name: essence_date_editor.form_field_name,
+      id: essence_date_editor.form_field_id,
+      value: essence_date_editor.ingredient
     }
   ) %>
-  <label for="<%= content.form_field_id %>" class="essence_date--label">
+  <label for="<%= essence_date_editor.form_field_id %>" class="essence_date--label">
     <i class="icon far fa-calendar-alt fa-fw fa-lg"></i>
   </label>
-</div>
+<% end %>

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

@@ -1,9 +1,8 @@
 <% dialog_link = link_to_dialog render_icon(:file, style: 'regular'),
   alchemy.admin_attachments_path(
-    content_id: content.id,
-    only: content.settings_value(:only, local_assigns.fetch(:options, {})),
-    except: content.settings_value(:except, local_assigns.fetch(:options, {})),
-    options: local_assigns.fetch(:options, {})
+    content_id: essence_file_editor.id,
+    only: essence_file_editor.settings[:only],
+    except: essence_file_editor.settings[:except]
   ),
   {
     title: Alchemy.t(:assign_file),
@@ -13,34 +12,34 @@
   class: 'file_icon',
   title: Alchemy.t(:assign_file) %>
 
-<div class="content_editor essence_file" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
-  <div class="file" id="file_<%= content.id %>">
-    <% if content.ingredient %>
+<%= content_tag :div,
+  id: essence_file_editor.dom_id,
+  class: essence_file_editor.css_classes,
+  data: essence_file_editor.data_attributes do %>
+  <%= content_label(essence_file_editor) %>
+  <div class="file" id="file_<%= essence_file_editor.id %>">
+    <% if essence_file_editor.ingredient %>
       <div class="file_icon">
-        <%= render_icon(content.ingredient.icon_css_class) %>
+        <%= render_icon(essence_file_editor.ingredient.icon_css_class) %>
       </div>
     <% else %>
       <%= dialog_link %>
     <% end %>
     <div class="file_name">
-      <%= content.ingredient.try(:name) ||
+      <%= essence_file_editor.ingredient.try(:name) ||
         ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
     </div>
     <div class="essence_file_tools">
       <%= dialog_link %>
       <%= link_to_dialog render_icon(:edit),
-        alchemy.edit_admin_essence_file_path(
-          id: content.essence.id,
-          options: local_assigns.fetch(:options, {})
-        ),
+        alchemy.edit_admin_essence_file_path(id: essence_file_editor.essence.id),
         {
           title: Alchemy.t(:edit_file_properties),
           size: '400x215'
         },
         title: Alchemy.t(:edit_file_properties) %>
     </div>
-    <%= hidden_field_tag content.form_field_name(:attachment_id),
-      content.ingredient && content.ingredient.id %>
+    <%= hidden_field_tag essence_file_editor.form_field_name(:attachment_id),
+      essence_file_editor.ingredient && essence_file_editor.ingredient.id %>
   </div>
-</div>
+<% end %>

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

@@ -1,7 +1,10 @@
-<div class="content_editor essence_html_editor" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
+<%= content_tag :div,
+  id: essence_html_editor.dom_id,
+  class: essence_html_editor.css_classes,
+  data: essence_html_editor.data_attributes do %>
+  <%= content_label(essence_html_editor) %>
   <%= text_area_tag(
-    content.form_field_name,
-    content.ingredient
+    essence_html_editor.form_field_name,
+    essence_html_editor.ingredient
   ) %>
-</div>
+<% end %>

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

@@ -1,23 +1,26 @@
-<div class="content_editor essence_link" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
-  <%= text_field_tag '', content.ingredient,
+<%= content_tag :div,
+  id: essence_link_editor.dom_id,
+  class: essence_link_editor.css_classes,
+  data: essence_link_editor.data_attributes do %>
+  <%= content_label(essence_link_editor) %>
+  <%= text_field_tag '', essence_link_editor.ingredient,
     class: "thin_border text_with_icon disabled",
     name: nil,
     id: nil,
     disabled: true
   %>
-  <%= hidden_field_tag content.form_field_name(:link),
-    content.essence.link %>
-  <%= hidden_field_tag content.form_field_name(:link_title),
-    content.essence.link_title %>
-  <%= hidden_field_tag content.form_field_name(:link_class_name),
-    content.essence.link_class_name %>
-  <%= hidden_field_tag content.form_field_name(:link_target),
-    content.essence.link_target %>
-  <%= render 'alchemy/essences/shared/linkable_essence_tools', content: content %>
-</div>
+  <%= hidden_field_tag essence_link_editor.form_field_name(:link),
+    essence_link_editor.essence.link %>
+  <%= hidden_field_tag essence_link_editor.form_field_name(:link_title),
+    essence_link_editor.essence.link_title %>
+  <%= hidden_field_tag essence_link_editor.form_field_name(:link_class_name),
+    essence_link_editor.essence.link_class_name %>
+  <%= hidden_field_tag essence_link_editor.form_field_name(:link_target),
+    essence_link_editor.essence.link_target %>
+  <%= render 'alchemy/essences/shared/linkable_essence_tools', content: essence_link_editor.content %>
+<% end %>
 <script type="text/javascript" charset="utf-8">
-  $('#<%= content.form_field_id(:link) %>').on('change', function() {
-    $('#<%= content.dom_id %> input.text_with_icon').val($(this).val());
+  $('#<%= essence_link_editor.form_field_id(:link) %>').on('change', function() {
+    $('#<%= essence_link_editor.dom_id %> input.text_with_icon').val($(this).val());
   });
 </script>

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

@@ -0,0 +1,27 @@
+<%= content_tag :div,
+  id: essence_node_editor.dom_id,
+  class: essence_node_editor.css_classes,
+  data: essence_node_editor.data_attributes do %>
+  <%= content_label(essence_node_editor) %>
+  <%= text_field_tag(
+    essence_node_editor.form_field_name("node_id"),
+    essence_node_editor.essence.node_id,
+    id: essence_node_editor.form_field_id,
+    class: 'alchemy_selectbox full_width'
+  ) %>
+<% end %>
+
+<script>
+  <% query_params = essence_node_editor.settings.fetch(:query_params, {}).merge({
+    include: :ancestors
+  }) %>
+  $('#<%= essence_node_editor.form_field_id %>').alchemyNodeSelect({
+    placeholder: "<%= Alchemy.t(:search_node) %>",
+    url: "<%= alchemy.api_nodes_path %>",
+    query_params: <%== query_params.to_json %>,
+    <% if essence_node_editor.essence.node %>
+    <% serialized_node = ActiveModelSerializers::SerializableResource.new(essence_node_editor.essence.node, include: :ancestors) %>
+    initialSelection: <%== serialized_node.to_json %>
+    <% end %>
+  })
+</script>

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

@@ -0,0 +1 @@
+<%= render content.ingredient if content.ingredient %>

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

@@ -1,22 +1,25 @@
-<div class="content_editor essence_spree_page" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
+<%= content_tag :div,
+  id: essence_page_editor.dom_id,
+  class: essence_page_editor.css_classes,
+  data: essence_page_editor.data_attributes do %>
+  <%= content_label(essence_page_editor) %>
   <%= text_field_tag(
-    content.form_field_name,
-    content.essence.page_id,
-    id: content.form_field_id,
+    essence_page_editor.form_field_name("page_id"),
+    essence_page_editor.essence.page_id,
+    id: essence_page_editor.form_field_id,
     class: 'alchemy_selectbox full_width'
   ) %>
-</div>
+<% end %>
 
 <script>
-  $('#<%= content.form_field_id %>').alchemyPageSelect({
+  $('#<%= essence_page_editor.form_field_id %>').alchemyPageSelect({
     placeholder: "<%= Alchemy.t(:search_page) %>",
     url: "<%= alchemy.api_pages_path %>",
-    query_params: <%== content.settings[:query_params].to_json %>,
-    <% if content.essence.page %>
+    query_params: <%== essence_page_editor.settings[:query_params].to_json %>,
+    <% if essence_page_editor.essence.page %>
     initialSelection: {
-      id: <%= content.essence.page_id %>,
-      text: "<%= content.essence.page.name %>"
+      id: <%= essence_page_editor.essence.page_id %>,
+      text: "<%= essence_page_editor.essence.page.name %>"
     }
     <% end %>
   })