alchemy_cms 4.0.6 → 4.1.0.beta

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

@@ -7,7 +7,7 @@
       [Alchemy.t(:last_upload_only), 'last_upload'],
       [Alchemy.t(:recently_uploaded_only), 'recent'],
       [Alchemy.t(:without_tag), 'without_tag']
-    ], params[:filter]),
+    ], search_filter_params[:filter]),
     :data => { :remote => !!request.xhr? },
     :class => 'alchemy_selectbox'
   ) %>
@@ -21,9 +21,8 @@
       if ($this.data('remote') === true) {
         $.get(url, {filter: $this.val()}, null, 'script');
       } else {
-        Alchemy.pleaseWaitOverlay();
         delimiter = url.match(/\?/) ? '&' : '?';
-        window.location = url + delimiter + 'filter=' + $this.val();
+        Turbolinks.visit(url + delimiter + 'filter=' + $this.val());
       }
       return false;
     });

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

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

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

@@ -1,8 +1,7 @@
 <% if @pictures.empty? %>
-  <div class="info">
-    <%= render_icon('info') %>
+  <%= render_message do %>
     <%= Alchemy.t(:no_images_in_archive) %>
-  </div>
+  <% end %>
 <% else %>
   <%= render partial: 'picture_to_assign',
     collection: @pictures,

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

@@ -5,15 +5,15 @@
   <% if picture.deletable? && can?(:destroy, picture) %>
   <span class="picture_tool delete">
     <%= link_to_confirm_dialog(
-      "",
+      render_icon(:minus),
       Alchemy.t(:confirm_to_delete_image_from_server),
       alchemy.admin_picture_path(
         id: picture,
-        q: params[:q],
+        q: search_filter_params[:q],
         page: params[:page],
-        tagged_with: params[:tagged_with],
+        tagged_with: search_filter_params[:tagged_with],
         size: params[:size],
-        filter: params[:filter]
+        filter: search_filter_params[:filter]
       ),
       {
         title: Alchemy.t('Delete image')
@@ -31,11 +31,11 @@
       image,
       alchemy.admin_picture_path(
         id: picture,
-        q: params[:q],
+        q: search_filter_params[:q],
         page: params[:page],
-        tagged_with: params[:tagged_with],
+        tagged_with: search_filter_params[:tagged_with],
         size: params[:size],
-        filter: params[:filter]
+        filter: search_filter_params[:filter]
       ),
       class: 'thumbnail_background'
     ) %>

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

@@ -4,12 +4,12 @@
   <ul>
     <%= render_tag_list('Alchemy::Picture') %>
   </ul>
-  <% if params[:tagged_with].present? %>
+  <% if search_filter_params[:tagged_with].present? %>
     <%= link_to(
-      render_icon('delete-small') + Alchemy.t('Remove tag filter'),
+      render_icon(:times, size: 'xs') + Alchemy.t('Remove tag filter'),
       url_for(search_filter_params.except(:tagged_with)),
       remote: request.xhr?,
-      class: 'button small with_icon please_wait'
+      class: 'secondary button small with_icon'
     ) %>
   <% end %>
 <% end %>

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

@@ -1,17 +1,16 @@
 <%= form_tag update_multiple_admin_pictures_path do %>
-  <%= hidden_field_tag :q, params[:q] %>
+  <%= hidden_field_tag :q, search_filter_params[:q] %>
   <%= hidden_field_tag :size, params[:size] %>
-  <%= hidden_field_tag :tagged_with, params[:tagged_with] %>
-  <%= hidden_field_tag :filter, params[:filter] %>
+  <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
+  <%= hidden_field_tag :filter, search_filter_params[:filter] %>
 
   <% @pictures.pluck(:id).each do |id| %>
   <%= hidden_field_tag "picture_ids[]", id %>
   <% end %>
 
-  <div class="info">
-    <%= render_icon :info %>
-    <p><%= Alchemy.t('You are about to edit many pictures at once') % {length: @pictures.size} %></p>
-  </div>
+  <%= render_message do %>
+    <%= Alchemy.t('You are about to edit many pictures at once') % {length: @pictures.size} %>
+  <% end %>
 
   <div class="input text">
     <%= label_tag :pictures_name, Alchemy.t('Name'), class: 'control-label' %>

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

@@ -13,26 +13,26 @@
     <div class="button_group">
       <div class="button_with_label">
         <%= link_to(
-          render_icon('zoom-out'),
-          alchemy.admin_pictures_path(size: "small", q: params[:q]),
+          render_icon('search-minus'),
+          alchemy.admin_pictures_path(size: "small", q: search_filter_params[:q]),
           title: Alchemy.t(:small_thumbnails),
-          class: "icon_button please_wait"
+          class: "icon_button"
         ) %>
       </div>
       <div class="button_with_label">
         <%= link_to(
-          render_icon('zoom-equal'),
-          alchemy.admin_pictures_path(size: "medium", q: params[:q]),
+          render_icon('search'),
+          alchemy.admin_pictures_path(size: "medium", q: search_filter_params[:q]),
           title: Alchemy.t(:medium_thumbnails),
-          class: "icon_button please_wait"
+          class: "icon_button"
         ) %>
       </div>
       <div class="button_with_label">
         <%= link_to(
-          render_icon('zoom-in'),
-          alchemy.admin_pictures_path(size: "large", q: params[:q]),
+          render_icon('search-plus'),
+          alchemy.admin_pictures_path(size: "large", q: search_filter_params[:q]),
           title: Alchemy.t(:big_thumbnails),
-          class: "icon_button please_wait"
+          class: "icon_button"
         ) %>
       </div>
       <label><%= Alchemy.t('Image size') %></label>
@@ -41,8 +41,8 @@
     <div class="toolbar_spacer"></div>
     <div class="button_with_label">
       <%= link_to(
-        render_icon('select_all'),
-        '',
+        render_icon('check-square', style: 'regular'),
+        nil,
         id: 'select_all_pictures',
         class: 'icon_button',
         'data-alchemy-hotkey' => 'alt+a'
@@ -59,7 +59,7 @@
   <h1>
     <%= @pictures.total_count %>
     <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-    <%= Alchemy.t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
+    <%= Alchemy.t("picture_library.filter.#{search_filter_params[:filter]}") if search_filter_params[:filter].present? %>
   </h1>
   <%= render 'archive' %>
 </div>

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

@@ -1,3 +1,2 @@
-Alchemy.pleaseWaitOverlay(false);
 $('#archive_all').html('<%= j render("archive") %>');
 $('#filter_bar').replaceWith('<%= j render("filter_bar") %>');

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

@@ -6,29 +6,29 @@
   <% if @previous %>
     <%= link_to alchemy.admin_picture_path(
         id: @previous,
-        q: params[:q],
+        q: search_filter_params[:q],
         page: params[:page],
-        tagged_with: params[:tagged_with],
+        tagged_with: search_filter_params[:tagged_with],
         size: params[:size],
-        filter: params[:filter]
+        filter: search_filter_params[:filter]
       ),
       class: "previous-picture",
       remote: true do %>
-      <span class="icon-angle-left"></span>
+      <i class="icon fas fa-angle-left fa-fw"></i>
     <% end %>
   <% end %>
   <% if @next %>
     <%= link_to alchemy.admin_picture_path(
         id: @next,
-        q: params[:q],
+        q: search_filter_params[:q],
         page: params[:page],
-        tagged_with: params[:tagged_with],
+        tagged_with: search_filter_params[:tagged_with],
         size: params[:size],
-        filter: params[:filter]
+        filter: search_filter_params[:filter]
       ),
       class: "next-picture",
       remote: true do %>
-      <span class="icon-angle-right"></span>
+      <i class="icon fas fa-angle-right fa-fw"></i>
     <% end %>
   <% end %>
 </div>
@@ -39,5 +39,5 @@
 </div>
 
 <div class="picture-overlay-handle">
-  <span class="icon-angle-double-right"></span>
+  <i class="icon fas fa-angle-double-right fa-fw"></i>
 </div>

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

@@ -3,7 +3,7 @@
   <%= select_tag(
     'resource_filter',
     options_for_select(
-      resource_filter_select, params[:filter]
+      resource_filter_select, search_filter_params[:filter]
     ),
     include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
     data: { remote: !!request.xhr? },
@@ -19,9 +19,8 @@
       if ($this.data('remote') === true) {
         $.get(url, {filter: $this.val()}, null, 'script');
       } else {
-        Alchemy.pleaseWaitOverlay();
         delimiter = url.match(/\?/) ? '&' : '?';
-        window.location = url + delimiter + 'filter=' + encodeURIComponent($this.val());
+        Turbolinks.visit(url + delimiter + 'filter=' + encodeURIComponent($this.val()));
       }
       return false;
     });

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

@@ -1,16 +1,24 @@
-<%= alchemy_form_for resource_instance_variable, url: resource_path(resource_instance_variable, current_location_params) do |f| %>
+<%= alchemy_form_for resource_instance_variable, url: resource_path(resource_instance_variable, search_filter_params) do |f| %>
   <% resource_handler.editable_attributes.each do |attribute| %>
     <% if relation = attribute[:relation] %>
       <%= f.association relation[:name].to_sym,
         label_method: relation[:attr_method],
         include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
         input_html: {class: 'alchemy_selectbox'} %>
+    <% elsif attribute[:type] == :datetime || attribute[:type] == :time %>
+      <div class="input <%= attribute[:type] %>">
+        <label class="control-label">
+          <%= f.object.class.human_attribute_name(attribute[:name]) %>
+        </label>
+        <%= alchemy_datepicker resource_instance_variable, attribute[:name],
+          type: attribute[:type] %>
+      </div>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>
   <% end %>
   <% if f.object.respond_to?(:tag_list) %>
-    <div class="input string">
+    <div class="input string autocomplete_tag_list">
       <%= f.label :tag_list %>
       <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
     </div>

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

@@ -2,29 +2,24 @@
 <% resource_handler.attributes.each do |attribute| %>
   <td class="<%= attribute[:type] %> <%= attribute[:name] %>">
   <% if attribute[:type] == :boolean %>
-    <%= render_icon !!resource.send(attribute[:name]) %>
+    <%= resource.public_send(attribute[:name]) ? render_icon(:check) : nil %>
   <% else %>
     <%= render_attribute(resource, attribute) %>
   <% end %>
   </td>
 <% end %>
   <td class="tools">
-    <% if can?(:destroy, resource) %>
-    <%= delete_button resource_path(resource, current_location_params) %>
-    <% end %>
-    <% if can?(:edit, resource) %>
-    <%= link_to_dialog(
-      '',
-      edit_resource_path(resource, current_location_params),
+  <% if can?(:destroy, resource) %>
+    <%= delete_button resource_path(resource, search_filter_params) %>
+  <% end %>
+  <% if can?(:edit, resource) %>
+    <%= link_to_dialog render_icon(:edit),
+      edit_resource_path(resource, search_filter_params),
       {
         title: Alchemy.t('Edit'),
         size: resource_window_size
       },
-      {
-        class: 'icon edit',
-        title: Alchemy.t('Edit')
-      }
-    ) %>
-    <% end %>
+      title: Alchemy.t('Edit') %>
+  <% end %>
   </td>
 </tr>

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

@@ -17,7 +17,7 @@
     <%= render_resources %>
   </tbody>
 </table>
-<% elsif params[:q].present? %>
+<% elsif search_filter_params[:q].present? %>
 <p><%= Alchemy.t('Nothing found') %></p>
 <% end %>
 

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

@@ -1,15 +1,15 @@
-<div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
+<div class="tag-list<%= ' with_filter_bar' if resource_has_filters %><%= ' filtered' if search_filter_params[:tagged_with].present? %>">
   <h2><%= Alchemy.t("Filter by tag") %></h2>
   <%= js_filter_field '.tag-list li' %>
   <ul>
     <%= render_tag_list(resource_model.name) %>
   </ul>
-  <% if params[:tagged_with].present? %>
+  <% if search_filter_params[:tagged_with].present? %>
     <%= link_to(
-      render_icon('delete-small') + Alchemy.t('Remove tag filter'),
+      render_icon(:times, size: 'xs') + Alchemy.t('Remove tag filter'),
       url_for(search_filter_params.except(:tagged_with)),
       remote: request.xhr?,
-      class: 'button small with_icon please_wait'
+      class: 'secondary button small with_icon'
     ) %>
   <% end %>
 </div>

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

@@ -3,7 +3,7 @@
 <% toolbar(
   buttons: [
     {
-      icon: 'create',
+      icon: :plus,
       label: label_title,
       url: new_resource_path,
       title: label_title,
@@ -16,11 +16,10 @@
     },
     {
       icon: 'download',
-      url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: params[:q], sort: params[:sort]),
+      url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
       label: Alchemy.t(:download_csv),
       title: Alchemy.t(:download_csv),
       dialog: false,
-      loading_indicator: false,
       if_permitted_to: [:index, resource_model]
     }
   ]

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

@@ -3,7 +3,7 @@
 <% toolbar(
   buttons: [
     {
-      icon: 'create',
+      icon: :plus,
       label: label_title,
       url: new_resource_path,
       title: label_title,

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

@@ -6,25 +6,21 @@
   </td>
   <td class="count"><%= tag.taggings.count %></td>
   <td class="tools">
-    <% if can?(:destroy, Alchemy::Tag) %>
+  <% if can?(:destroy, Alchemy::Tag) %>
     <%= delete_button admin_tag_path(tag), {
       message: Alchemy.t(:do_you_really_want_to_delete_this_tag?),
-      icon: 'tag_delete',
+      icon: :minus,
       title: Alchemy.t(:delete_tag)
     } %>
-    <% end %>
-    <% if can?(:edit, Alchemy::Tag) %>
-    <%= link_to_dialog '',
+  <% end %>
+  <% if can?(:edit, Alchemy::Tag) %>
+    <%= link_to_dialog render_icon(:edit),
       edit_admin_tag_path(tag),
       {
         title: Alchemy.t(:edit_tag),
         size: '360x410'
       },
-      {
-        title: Alchemy.t(:edit_tag),
-        class: 'icon tag_edit'
-      }
-    %>
-    <% end %>
+      title: Alchemy.t(:edit_tag) %>
+  <% end %>
   </td>
 </tr>

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

@@ -1,7 +1,7 @@
 <%= toolbar(
   buttons: [
     {
-      icon: 'tag_add',
+      icon: :plus,
       label: Alchemy.t('New Tag'),
       url: alchemy.new_admin_tag_path,
       title: Alchemy.t('New Tag'),
@@ -18,7 +18,7 @@
 <div id="archive_all" class="resources-table-wrapper">
   <h1 class="resources-header">
     <%= @tags.total_count %>
-    <%= ActsAsTaggableOn::Tag.model_name.human(count: @tags.total_count) %>
+    <%= Gutentag::Tag.model_name.human(count: @tags.total_count) %>
   </h1>
   <% if @tags.any? %>
 
@@ -27,7 +27,7 @@
       <tr>
         <th class="icon"></th>
         <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
-        <th class="count"><%= ActsAsTaggableOn::Tag.human_attribute_name(:taggings_types) %></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="tools"></th>
       </tr>
@@ -43,7 +43,7 @@
 
   <%= render_message do %>
     <h2><%= Alchemy.t('No Tags found') %></h2>
-    <% if params[:q].blank? %>
+    <% if search_filter_params[:q].blank? %>
       <p><%= Alchemy.t(:tags_get_created_if_used_the_first_time) %></p>
     <% end %>
   <% end %>