alchemy_cms 5.0.3 → 5.1.1

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

@@ -3,81 +3,48 @@
 <% end %>
 
 <% content_for :toolbar do %>
-<div class="toolbar_buttons">
-  <%= render 'alchemy/admin/partials/site_select' %>
-  <%= render 'alchemy/admin/partials/language_tree_select' %>
-  <% if can?(:flush, Alchemy::Page) %>
-  <div class="button_with_label">
-    <%= link_to(
-      render_icon(:eraser),
-      alchemy.flush_admin_pages_path,
-      :remote => true,
-      :method => :post,
-      :class => 'icon_button please_wait',
-      :title => Alchemy.t('Flush page cache')
-    ) %>
-    <label><%= Alchemy.t('Flush page cache') %></label>
-  </div>
-  <% end %>
-  <% if can?(:sort, Alchemy::Page) %>
-  <div class="button_with_label">
-    <%= link_to(
-      render_icon(:random),
-      alchemy.sort_admin_pages_path,
-      method: :get,
-      class: 'icon_button',
-      title: Alchemy.t('Sort pages')
-    ) %>
-    <label><%= Alchemy.t('Sort pages') %></label>
-  </div>
-  <% end %>
-  <div class="button_with_label" id="clipboard_button">
-    <%= link_to_dialog(
-      render_icon(clipboard_empty?('pages') ? :clipboard : :paste),
-      alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
-      {
-        :title => Alchemy.t('Clipboard'),
-        :size => '380x305'
-      },
-      :class => 'icon_button',
-      :title => Alchemy.t('Show clipboard')
-    ) %>
-    <label><%= Alchemy.t('Show clipboard') %></label>
-  </div>
-</div>
-<div class="search_form">
-  <div class="search_field">
-    <label>
-      <%= text_field_tag 'filter', '',
-        class: 'search_input_field',
-        placeholder: Alchemy.t(:search),
-        id: nil %>
-      <%= render_icon :search %>
-    </label>
-    <%= link_to(render_icon(:times, size: 'xs'), '#', {
-      class: "search_field_clear",
-      title: Alchemy.t(:click_to_show_all)
-    }) %>
-  </div>
-</div>
+  <%= render "alchemy/admin/pages/toolbar" %>
 <% end %>
 
-<div id="archive_all">
-<% if @page_root %>
-  <h2 id="page_filter_result"></h2>
-
-  <%= render 'sitemap', page_partial: 'page', full: !!@sorting %>
-
-<% elsif can?(:create, Alchemy::Page) %>
-
-  <%= render partial: 'create_language_form' %>
-
-<% else %>
-
-  <%= render_message :warn do %>
-    <h2>No language root page found.</h2>
-    <p>Please ask the admin to create one.</p>
+<%= content_tag :div,
+  id: "archive_all",
+  class: [@view == "list" && "resources-table-wrapper with_tag_filter"] do %>
+  <% if @view == "list" %>
+    <%= render "alchemy/admin/resources/table_header", resources_instance_variable: @pages %>
+    <% if @pages.any? %>
+      <%= render "table" %>
+    <% elsif search_filter_params.present? %>
+      <%= render_message do %>
+        <%= Alchemy.t("No pages found") %>
+      <% end %>
+    <% elsif can?(:create, Alchemy::Page) %>
+      <%= render partial: "create_language_form" %>
+    <% end %>
+
+    <%= paginate @pages, scope: alchemy, theme: "alchemy" %>
+
+    <div id="library_sidebar">
+      <%= render "page_layout_filter" %>
+
+      <%= render "filter_bar",
+        label: Alchemy::Page.human_attribute_name(:status),
+        url: alchemy.admin_pages_path(search_filter_params.except(:filter, :page).merge(view: "list")) %>
+
+      <% if resource_has_tags %>
+        <%= render "tag_list" %>
+      <% end %>
+    </div>
+  <% else %>
+    <% if @page_root %>
+      <h2 id="page_filter_result"></h2>
+      <%= render "sitemap", page_partial: "page", full: !!@sorting %>
+    <% elsif can?(:create, Alchemy::Page) %>
+      <%= render partial: "create_language_form" %>
+    <% else %>
+      <%= render_message :warn do %>
+        <h2>No language root page found.</h2>
+        <p>Please ask the admin to create one.</p>
+      <% end %>
+    <% end %>
   <% end %>
-
 <% end %>
-</div>

data/app/views/alchemy/admin/pages/list/_table.html.erb

@@ -0,0 +1,31 @@
+<% if @pages.any? %>
+  <table class="list">
+    <thead>
+      <tr>
+        <th class="icon"></th>
+        <th class="string name">
+          <%= sort_link [:alchemy, @query],
+            "name",
+            Alchemy::Page.human_attribute_name(:name),
+            default_order: "asc" %>
+        </th>
+        <th><%= Alchemy::Page.human_attribute_name(:urlname) %></th>
+        <th><%= Alchemy::Page.human_attribute_name(:page_type) %></th>
+        <th><%= Alchemy::Page.human_attribute_name(:tag_list) %></th>
+        <th class="status center"><%= Alchemy::Page.human_attribute_name(:status) %></th>
+        <th class="tools"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: "page", collection: @pages %>
+    </tbody>
+  </table>
+<% elsif search_filter_params.present? %>
+  <%= render_message do %>
+    <%= Alchemy.t('No pages found') %>
+  <% end %>
+<% else %>
+  <%= render partial: 'alchemy/admin/pages/create_language_form' %>
+<% end %>
+
+<%= paginate @pages, scope: alchemy, theme: 'alchemy' %>

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

@@ -2,12 +2,12 @@
   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'
-  )
+  ) || document.querySelector('[data-page-id="<%= @page.id -%>"] > .icon')
   if (locked_page_tab) {
     locked_page_tab.remove()
   }
   if (locked_page_icon) {
-    locked_page_icon.innerHTML = '<%= j render_icon(:file, style: 'regular', size: 'lg') %>'
+    locked_page_icon.innerHTML = '<i class="icon far fa-file fa-lg"></i>'
   }
   Alchemy.growl('<%= flash[:notice] -%>')
 })()

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

@@ -1,5 +1,5 @@
 (function() {
-  var $page;
+  var page = document.querySelector('#page_<%= @page.id %>');
 
 <% if @old_page_layout != @page.page_layout -%>
   Alchemy.ElementsWindow.reload();
@@ -9,18 +9,27 @@
 <% if @while_page_edit -%>
 
   Alchemy.reloadPreview();
-  $('#page_<%= @page.id %>_status').replaceWith('<%= j render("current_page", current_page: @page) %>');
+  document.querySelector('#page_<%= @page.id %>_status').outerHTML = '<%= j render("current_page", current_page: @page) %>';
+  Alchemy.growl("<%= j @notice %>");
+  Alchemy.closeCurrentDialog();
 
 <% else -%>
 
-  var page_html = "<%= j render('page', page: @page) %>";
-  var compiler = Handlebars.compile(page_html);
-  var tree = <%== @tree.to_json %>;
-  var html = compiler(tree.pages[0]);
-  $('#page_<%= @page.id %>').replaceWith(html);
+  if (page) {
+    var page_html = "<%= j render('page', page: @page) %>";
+    var compiler = Handlebars.compile(page_html);
+    var tree = <%== @tree.to_json %>;
+    page.outerHTML = compiler(tree.pages[0]);
+    Alchemy.growl("<%= j @notice %>");
+    Alchemy.closeCurrentDialog();
+  } else {
+    document.addEventListener('turbolinks:load', function () {
+      Alchemy.growl("<%= j @notice %>");
+    }, { once: true })
+    Alchemy.closeCurrentDialog(function() {
+      Turbolinks.visit(location.toString(), { action: "replace" });
+    });
+  }
 
 <% end -%>
-
-  Alchemy.growl("<%= j @notice %>");
-  Alchemy.closeCurrentDialog();
 })()

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

@@ -1,24 +1,25 @@
-<%= search_form_for @query, url: url_for(
-    action: 'index',
-    size: @size
+<%= search_form_for @query, url: url_for({
+      action: 'index',
+      size: @size,
+    }.merge(search_filter_params.except(:q))
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
-  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
-  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
+  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id, id: nil) %>
+  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id, id: nil) %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        placeholder: Alchemy.t(:search),
-        class: 'search_input_field',
-        id: nil %>
-    </label>
-    <%= link_to render_icon(:times, size: 'xs'), url_for(
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      placeholder: Alchemy.t(:search),
+      class: 'search_input_field',
+      id: nil %>
+    <%= link_to render_icon(:times, size: 'xs'), url_for({
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
         size: @size,
         overlay: true
-      ),
+      }.merge(search_filter_params.except(:q))),
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),

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

@@ -1,15 +1,15 @@
-<%- url ||= resource_url_proxy.url_for(action: 'index') -%>
+<%- url ||= resource_url_proxy.url_for({ action: 'index' }.merge(search_filter_params.except(:q, :page))) -%>
 
 <%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        class: 'search_input_field',
-        placeholder: Alchemy.t(:search) %>
-    </label>
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      class: 'search_input_field',
+      placeholder: Alchemy.t(:search) %>
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
-      <%= f.hidden_field field %>
+      <%= f.hidden_field field, id: nil %>
     <% end %>
     <%= link_to render_icon(:times, size: 'xs'), url,
         class: 'search_field_clear',
@@ -17,7 +17,7 @@
         title: Alchemy.t(:click_to_show_all),
         style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
     <% local_assigns.fetch(:additional_params, []).each do |additional_param| %>
-      <%= hidden_field_tag additional_param, search_filter_params[additional_param] %>
+      <%= hidden_field_tag additional_param, search_filter_params[additional_param], id: nil %>
     <% end %>
   </div>
 <% end %>

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

@@ -31,7 +31,7 @@
       admin_pictures_path(
         q: search_filter_params[:q],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: 'secondary button with_icon',

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

@@ -6,7 +6,7 @@
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
   </div>
   <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :size, @size %>
   <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
   <%= hidden_field_tag :filter, search_filter_params[:filter] %>
   <%= f.submit Alchemy.t(:save) %>

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

@@ -12,7 +12,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       {
@@ -22,7 +22,7 @@
   </span>
   <% end %>
   <% image = image_tag(
-    picture.url(size: preview_size(@size), flatten: true),
+    picture.url(size: preview_size(@size), flatten: true) || "alchemy/missing-image.svg",
     alt: picture.name,
     title: Alchemy.t(:zoom_image)
   ) %>
@@ -34,7 +34,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: 'thumbnail_background'

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

@@ -1,7 +1,7 @@
 <div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="picture_to_assign_<%= picture_to_assign.id %>">
   <%= link_to(
     image_tag(
-      picture_to_assign.url(size: preview_size(size), flatten: true),
+      picture_to_assign.url(size: preview_size(size), flatten: true) || "alchemy/missing-image.svg",
       alt: picture_to_assign.name
     ),
     alchemy.assign_admin_essence_pictures_path(

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

@@ -1,6 +1,6 @@
 <%= form_tag update_multiple_admin_pictures_path do %>
   <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :size, @size %>
   <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
   <%= hidden_field_tag :filter, search_filter_params[:filter] %>
 

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

@@ -5,7 +5,7 @@
         object: Alchemy::Picture.new,
         file_attribute: 'image_file',
         redirect_url: alchemy.admin_pictures_path(
-          size: params[:size],
+          size: @size,
           filter: 'last_upload'
         ) %>
       <div class="toolbar_spacer"></div>

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

@@ -1,5 +1,5 @@
 <div class="zoomed-picture-background">
-  <%= image_tag @picture.url %>
+  <%= image_tag @picture.url || "alchemy/missing-image.svg" %>
 </div>
 
 <div class="picture-overlay-navigation">
@@ -9,7 +9,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: "previous-picture",
@@ -23,7 +23,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: "next-picture",

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

@@ -1,21 +1,23 @@
 <div id="filter_bar">
-  <h3><%= 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>
+    <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>
 </div>
 
 <script type="text/javascript">
   $(function() {
     $('#resource_filter').on('change', function(e) {
       var $this = $(this);
-      var url = '<%= resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
+      var url = '<%= local_assigns[:url] || resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
       if ($this.data('remote') === true) {
         $.get(url, {filter: $this.val()}, null, 'script');
       } else {

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

@@ -2,10 +2,10 @@
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
     <% if value.is_a? Hash %>
       <% value.each do |k, v| %>
-        <%= hidden_field_tag "#{key}[#{k}]", v %>
+        <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>
     <% else %>
-      <%= hidden_field_tag key, value %>
+      <%= hidden_field_tag key, value, id: nil %>
     <% end %>
   <% end %>
   <label>
@@ -17,4 +17,4 @@
       ),
       onchange: 'this.form.submit()' %>
   </label>
-<% end %>
+<% end %>

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

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