alchemy_cms 7.0.11 → 7.1.0.pre.b1

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

@@ -1,21 +1,23 @@
-<div id="image_assign_filter_and_image_sizing">
+<div class="toolbar_buttons">
   <% if can? :create, Alchemy::Picture %>
-    <%= render 'alchemy/admin/uploader/button',
-      object: Alchemy::Picture.new,
-      dropzone: '#assign_image_list',
-      file_attribute: 'image_file',
-      in_dialog: true,
-      redirect_url: alchemy.admin_pictures_path(
-        size: search_filter_params[:size],
-        filter: { misc: 'last_upload' },
-        form_field_id: @form_field_id
-      ) %>
+    <div class="toolbar_button">
+      <%= render 'alchemy/admin/uploader/button',
+        object: Alchemy::Picture.new,
+        dropzone: '#assign_image_list',
+        file_attribute: 'image_file',
+        in_dialog: true,
+        redirect_url: alchemy.admin_pictures_path(
+          size: search_filter_params[:size],
+          filter: { misc: 'last_upload' },
+          form_field_id: @form_field_id
+        ) %>
+    </div>
     <div class="toolbar_spacer"></div>
   <% end %>
   <div class="button_group">
-    <div class="button_with_label">
+    <sl-tooltip content="<%= Alchemy.t(:small_thumbnails) %>">
       <%= link_to(
-        render_icon('search-minus'),
+        render_icon('zoom-out'),
         alchemy.admin_pictures_path({
           size: "small",
           form_field_id: @form_field_id,
@@ -24,11 +26,10 @@
           tagged_with: search_filter_params[:tagged_with]
         }),
         remote: true,
-        title: Alchemy.t(:small_thumbnails),
         class: "icon_button"
       ) %>
-    </div>
-    <div class="button_with_label">
+    </sl-tooltip>
+    <sl-tooltip content="<%= Alchemy.t(:medium_thumbnails) %>">
       <%= link_to(
         render_icon('search'),
         alchemy.admin_pictures_path({
@@ -39,13 +40,12 @@
           tagged_with: search_filter_params[:tagged_with]
         }),
         remote: true,
-        title: Alchemy.t(:medium_thumbnails),
         class: "icon_button"
       ) %>
-    </div>
-    <div class="button_with_label">
+    </sl-tooltip>
+    <sl-tooltip content="<%= Alchemy.t(:big_thumbnails) %>">
       <%= link_to(
-        render_icon('search-plus'),
+        render_icon('zoom-in'),
         alchemy.admin_pictures_path({
           size: "large",
           form_field_id: @form_field_id,
@@ -54,11 +54,9 @@
           tagged_with: search_filter_params[:tagged_with]
         }),
         remote: true,
-        title: Alchemy.t(:big_thumbnails),
         class: "icon_button"
       ) %>
-    </div>
-    <label><%= Alchemy.t('Image size') %></label>
+    </sl-tooltip>
     <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
   </div>
   <%= render partial: 'alchemy/admin/partials/remote_search_form' %>

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

@@ -26,7 +26,7 @@
           <% if page %>
             <li>
               <h3>
-                <%= render_icon 'file-alt' %>
+                <%= render_icon 'file' %>
                 <p><%= link_to page.name, edit_admin_page_path(page) %></p>
               </h3>
               <ul class="list">
@@ -35,11 +35,7 @@
                     <% page_link = link_to element.display_name_with_preview_text,
                                    edit_admin_page_path(page, anchor: "element_#{element.id}") %>
                     <% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
-                    <% if element.public? %>
-                      <%= render_icon('window-maximize', style: 'regular') %>
-                    <% else %>
-                      <%= render_icon('window-close') %>
-                    <% end %>
+                    <%= render_icon('draggable', style: nil) %>
                     <p>
                       <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
                     </p>

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

@@ -4,27 +4,25 @@
   </span>
   <% 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: search_filter_params[:q],
-        page: params[:page],
-        tagged_with: search_filter_params[:tagged_with],
-        size: @size,
-        filter: search_filter_params[:filter]
-      ),
-      {
-        title: Alchemy.t('Delete image')
-      }
-    ) -%>
+    <sl-tooltip content="<%= Alchemy.t('Delete image') %>">
+      <%= link_to_confirm_dialog(
+        render_icon("delete-bin-2"),
+        Alchemy.t(:confirm_to_delete_image_from_server),
+        alchemy.admin_picture_path(
+          id: picture,
+          q: search_filter_params[:q],
+          page: params[:page],
+          tagged_with: search_filter_params[:tagged_with],
+          size: @size,
+          filter: search_filter_params[:filter]
+        )
+      ) -%>
+    </sl-tooltip>
   </span>
   <% end %>
   <% image = image_tag(
     picture.url(size: preview_size(@size), flatten: true) || "alchemy/missing-image.svg",
-    alt: picture.name,
-    title: Alchemy.t(:zoom_image)
+    alt: picture.name
   ) %>
   <% if can?(:edit, picture) %>
     <%= link_to(

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

@@ -1,19 +1,20 @@
-<div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="assignable_<%= picture_to_assign.id %>">
-  <%= link_to(
-    image_tag(
-      picture_to_assign.url(size: preview_size(size), flatten: true) || "alchemy/missing-image.svg",
-      alt: picture_to_assign.name
-    ),
-    alchemy.assign_admin_picture_path(
-      id: picture_to_assign.id,
-      form_field_id: @form_field_id
-    ),
-    remote: true,
-    onclick: '$(self).attr("href", "#").off("click"); return false',
-    method: 'put',
-    title: Alchemy.t(:assign_image),
-    class: 'thumbnail_background'
-  ) %>
+<div class="picture_thumbnail" name="<%= picture_to_assign.name %>" id="assignable_<%= picture_to_assign.id %>">
+  <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
+    <%= link_to(
+      image_tag(
+        picture_to_assign.url(size: preview_size(size), flatten: true) || "alchemy/missing-image.svg",
+        alt: picture_to_assign.name
+      ),
+      alchemy.assign_admin_picture_path(
+        id: picture_to_assign.id,
+        form_field_id: @form_field_id
+      ),
+      remote: true,
+      onclick: '$(self).attr("href", "#").off("click"); return false',
+      method: 'put',
+      class: 'thumbnail_background'
+    ) %>
+  </sl-tooltip>
   <div class="picture_name" title="<%= picture_to_assign.name %>">
     <%= picture_to_assign.name %>
   </div>

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

@@ -6,7 +6,7 @@
   </ul>
   <% if search_filter_params[:tagged_with].present? %>
     <%= link_to(
-      render_icon(:times, size: 'xs') + Alchemy.t('Remove tag filter'),
+      render_icon(:close) + Alchemy.t('Remove tag filter'),
       url_for(search_filter_params.except(:tagged_with)),
       remote: request.xhr?,
       class: 'secondary button small with_icon'

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

@@ -1,7 +1,7 @@
 (function() {
   var dialog = Alchemy.currentDialog();
   dialog.dialog_body.html('<%= j render("archive_overlay") %>');
-  Alchemy.SelectBox('#filter_bar');
   Alchemy.ImageLoader('#assign_image_list');
   Alchemy.ListFilter(dialog.dialog_body);
 })();
+

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

@@ -5,6 +5,6 @@
   $form_field.attr("data-image-file-width", <%= @picture.image_file_width %>)
   $form_field.attr("data-image-file-height", <%= @picture.image_file_height %>)
   Alchemy.closeCurrentDialog(function() {
-    Alchemy.setElementDirty($form_field.closest(".element-editor"))
+    $form_field[0].closest("alchemy-element-editor").setDirty()
   })
 })()

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

@@ -1,30 +1,31 @@
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
     <% if can? :create, Alchemy::Picture %>
-      <%= render 'alchemy/admin/uploader/button',
-        object: Alchemy::Picture.new,
-        file_attribute: 'image_file',
-        redirect_url: alchemy.admin_pictures_path(
-          size: @size,
-          filter: { misc: 'last_upload' }
-        ) %>
+      <div class="toolbar_button">
+        <%= render 'alchemy/admin/uploader/button',
+          object: Alchemy::Picture.new,
+          file_attribute: 'image_file',
+          redirect_url: alchemy.admin_pictures_path(
+            size: @size,
+            filter: { misc: 'last_upload' }
+          ) %>
+      </div>
       <div class="toolbar_spacer"></div>
     <% end %>
     <div class="button_group">
-      <div class="button_with_label">
+      <sl-tooltip content="<%= Alchemy.t(:small_thumbnails) %>">
         <%= link_to(
-          render_icon('search-minus'),
+          render_icon('zoom-out'),
           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"
         ) %>
-      </div>
-      <div class="button_with_label">
+      </sl-tooltip>
+      <sl-tooltip content="<%= Alchemy.t(:medium_thumbnails) %>">
         <%= link_to(
           render_icon('search'),
           alchemy.admin_pictures_path(
@@ -33,36 +34,34 @@
             filter: search_filter_params[:filter],
             tagged_with: search_filter_params[:tagged_with]
           ),
-          title: Alchemy.t(:medium_thumbnails),
           class: "icon_button"
         ) %>
-      </div>
-      <div class="button_with_label">
+      </sl-tooltip>
+      <sl-tooltip content="<%= Alchemy.t(:big_thumbnails) %>">
         <%= link_to(
-          render_icon('search-plus'),
+          render_icon('zoom-in'),
           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"
         ) %>
-      </div>
-      <label><%= Alchemy.t('Image size') %></label>
+      </sl-tooltip>
       <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
     </div>
     <div class="toolbar_spacer"></div>
-    <div class="button_with_label">
-      <%= link_to(
-        render_icon('check-square', style: 'regular'),
-        nil,
-        id: 'select_all_pictures',
-        class: 'icon_button',
-        'data-alchemy-hotkey' => 'alt+a'
-      ) %>
-      <label><%= Alchemy.t("Select all") %></label>
+    <div class="toolbar_button">
+      <sl-tooltip content="<%= Alchemy.t("Select all") %>">
+        <%= link_to(
+          render_icon('checkbox-multiple'),
+          nil,
+          id: 'select_all_pictures',
+          class: 'icon_button',
+          'data-alchemy-hotkey' => 'alt+a'
+        ) %>
+      </sl-tooltip>
     </div>
   </div>
 
@@ -91,11 +90,16 @@
     $(function() {
       Alchemy.pictureSelector();
       $('#select_all_pictures').on('click', function(e) {
-        $('.picture_tool.select :checkbox').prop('checked', true).change();
+        $(this).toggleClass("active")
+        $('.picture_tool.select :checkbox')
+          .prop('checked', function(_i, val) { return !val })
+          .closest(".picture_thumbnail")
+          .toggleClass("active");
         e.preventDefault;
+        $(".selected_item_tools").toggleClass("hidden")
         return false;
       });
-      $('.thumbnail_background').click(function(event) {
+      $('.thumbnail_background').on("click", function(event) {
         var url = $(this).attr('href');
         var overlay = new Alchemy.ImageOverlay(url);
         overlay.open();

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

@@ -14,7 +14,7 @@
       ),
       class: "previous-picture",
       remote: true do %>
-      <i class="icon fas fa-angle-left fa-fw"></i>
+      <i class="icon ri-arrow-left-s-line ri-fw"></i>
     <% end %>
   <% end %>
   <% if @next %>
@@ -28,7 +28,7 @@
       ),
       class: "next-picture",
       remote: true do %>
-      <i class="icon fas fa-angle-right fa-fw"></i>
+      <i class="icon ri-arrow-right-s-line ri-fw"></i>
     <% end %>
   <% end %>
 </div>
@@ -39,5 +39,5 @@
 </div>
 
 <div class="picture-overlay-handle">
-  <i class="icon fas fa-angle-double-right fa-fw"></i>
+  <i class="icon ri-contract-right-line ri-fw"></i>
 </div>

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

@@ -3,10 +3,10 @@
   <%= select_tag(
     filter.name,
     options_for_select(
-      filter.options_for_select, search_filter_params.dig(:filter, filter.name)
+      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'
+    is: 'alchemy-select'
   ) %>
 </label>

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

@@ -5,14 +5,14 @@
         collection: relation[:collection],
         label_method: relation[:attr_method],
         include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
-        input_html: {class: 'alchemy_selectbox'} %>
+        input_html: {is: 'alchemy-select'} %>
     <% elsif attribute[:type].in? %i[date time datetime] %>
       <%= f.datepicker attribute[:name], resource_attribute_field_options(attribute) %>
     <% elsif attribute[:enum].present? %>
       <%= f.input attribute[:name],
         collection: attribute[:enum],
         include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
-        input_html: {class: 'alchemy_selectbox'} %>
+        input_html: {is: 'alchemy-select'} %>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>

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

@@ -1,6 +1,6 @@
 <%= form_tag url_for, method: :get, class: 'per-page-select-form' do |f| %>
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
-    <% if value.is_a? ActionController::Parameters %>
+    <% if value.is_a? Hash %>
       <% value.each do |k, v| %>
         <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>

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

@@ -1,4 +1,7 @@
 <tr class="<%= cycle('even', 'odd') %>">
+  <% if local_assigns[:icon] %>
+    <td class="icon"><%= render_icon(local_assigns[:icon], size: "xl") %></td>
+  <% end %>
 <% resource_handler.sorted_attributes.each do |attribute| %>
   <td class="<%= attribute[:type] %> <%= attribute[:name] %>">
   <% if attribute[:type] == :boolean %>
@@ -10,16 +13,20 @@
 <% end %>
   <td class="tools">
   <% if can?(:destroy, resource) %>
-    <%= delete_button resource_path(resource, search_filter_params) %>
+    <sl-tooltip content="<%= Alchemy.t("Delete") %>">
+      <%= delete_button resource_path(resource, search_filter_params) %>
+    </sl-tooltip>
   <% 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
-      },
-      title: Alchemy.t('Edit') %>
-  <% end %>
+    <sl-tooltip content="<%= Alchemy.t("Edit") %>">
+      <%= link_to_dialog render_icon(:edit),
+        edit_resource_path(resource, search_filter_params),
+        {
+          title: Alchemy.t('Edit'),
+          size: resource_window_size
+        },
+        class: "icon_button" %>
+      <% end %>
+    </sl-tooltip>
   </td>
 </tr>

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

@@ -2,6 +2,9 @@
 <table class="list" id="<%= resource_handler.resources_name %>_list">
   <thead>
     <tr>
+    <% if local_assigns[:icon] %>
+      <th class="icon"></th>
+    <% end %>
     <% resource_handler.sorted_attributes.each do |attribute| %>
       <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
         <%= sort_link [:resource_url_proxy, @query],
@@ -14,7 +17,7 @@
     </tr>
   </thead>
   <tbody>
-    <%= render_resources %>
+    <%= render_resources(icon: local_assigns[:icon]) %>
   </tbody>
 </table>
 <% elsif search_filter_params[:q].present? %>

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

@@ -1,26 +1,29 @@
 <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
 <% content_for(:toolbar) do %>
-  <%= toolbar_button(
-    icon: :plus,
-    label: label_title,
-    url: new_resource_path,
-    title: label_title,
-    hotkey: 'alt+n',
-    dialog_options: {
+  <div class="toolbar_buttons">
+    <%= toolbar_button(
+      icon: "add",
+      label: label_title,
+      url: new_resource_path,
       title: label_title,
-      size: resource_window_size
-    },
-    if_permitted_to: [:create, resource_model]
-  ) %>
-  <%= toolbar_button(
-    icon: :download,
-    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,
-    if_permitted_to: [:index, resource_model]
-  ) %>
+      hotkey: 'alt+n',
+      tooltip_placement: "top-start",
+      dialog_options: {
+        title: label_title,
+        size: resource_window_size
+      },
+      if_permitted_to: [:create, resource_model]
+    ) %>
+    <%= toolbar_button(
+      icon: :download,
+      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,
+      if_permitted_to: [:index, resource_model]
+    ) %>
+  </div>
   <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 

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

@@ -8,6 +8,7 @@
       url: new_resource_path,
       title: label_title,
       hotkey: 'alt+n',
+      tooltip_placement: "top-start",
       dialog_options: {
         title: label_title,
         size: "430x415"
@@ -21,7 +22,7 @@
 <div id="archive_all" class="resources-table-wrapper">
   <% if @sites.any? %>
     <%= render 'alchemy/admin/resources/table_header' %>
-    <%= render 'table' %>
+    <%= render 'table', icon: "global" %>
   <% elsif search_filter_params[:q].present? %>
     <%= render_message { Alchemy.t('Nothing found') } %>
   <% else %>