alchemy_cms 4.0.5 → 4.1.0.beta

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

@@ -7,7 +7,7 @@
   <div class="button_with_label">
     <%= form_tag alchemy.unlock_admin_page_path(@page, redirect_to: @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), id: 'unlock_page_form' do %>
       <button class="icon_button" title="<%= Alchemy.t(:explain_unlocking) %>" data-alchemy-hotkey="alt+x">
-        <%= render_icon('close') %>
+        <%= render_icon('sign-out-alt', transform: 'flip-horizontal') %>
       </button>
       <label><%= Alchemy.t(:unlock_page) %></label>
     <% end %>
@@ -17,7 +17,7 @@
   <div class="button_with_label">
     <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
       <button class="icon_button" title="<%= Alchemy.t('Visit page') %>">
-        <%= render_icon('visit_page') %>
+        <%= render_icon('external-link-alt') %>
       </button>
       <label><%= Alchemy.t("Visit page") %></label>
     <% end %>
@@ -25,7 +25,7 @@
   <% end %>
   <div class="button_with_label">
     <%= link_to_dialog(
-      render_icon('info'),
+      render_icon('info-circle'),
       alchemy.info_admin_page_path(@page),
       {
         title: Alchemy.t(:page_infos),
@@ -41,7 +41,7 @@
   <div class="button_with_label">
     <% if @page.layoutpage? %>
       <%= link_to_dialog(
-        render_icon('settings'),
+        render_icon(:cog),
         alchemy.edit_admin_layoutpage_path(@page),
         {
           title: Alchemy.t(:edit_page_properties),
@@ -53,7 +53,7 @@
       ) %>
     <% else %>
       <%= link_to_dialog(
-        render_icon('settings'),
+        render_icon(:cog),
         alchemy.configure_admin_page_path(@page),
         {
           title: Alchemy.t(:edit_page_properties),
@@ -70,7 +70,7 @@
     <div class="button_with_label">
       <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
         <%= button_tag class: 'icon_button', title: Alchemy.t(:explain_publishing) do %>
-          <%= render_icon('publish') %>
+          <%= render_icon('cloud-upload-alt') %>
         <% end %>
         <label><%= Alchemy.t("Publish page") %></label>
       <% end %>
@@ -89,7 +89,7 @@
   </div>
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
-    <%= link_to render_icon(:reload), '#', {
+    <%= link_to render_icon(:redo), nil, {
       title: Alchemy.t('Reload Preview'),
       class: 'icon_button',
       id: 'reload_preview_button'
@@ -99,7 +99,7 @@
 </div>
 <div class="toolbar_buttons right">
   <div class="button_with_label" id="element_window_button">
-    <%= link_to render_icon(:element_window), '', {
+    <%= link_to render_icon(:bars), nil, {
       title: Alchemy.t(:hide_elements),
       class: 'icon_button'
     } %>
@@ -142,7 +142,7 @@
           title: '<%= Alchemy.t("New Element") %>',
           label: '<%= Alchemy.t("New Element") %>',
           hotkey: 'alt+n',
-          iconClass: 'new_element',
+          iconClass: 'plus',
           onClick: function() {
             Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_id: @page.id) %>', {
               title: '<%= Alchemy.t("New Element") %>',
@@ -153,7 +153,7 @@
         {
           title: '<%= Alchemy.t("Clipboard") %>',
           label: '<%= Alchemy.t("Show clipboard") %>',
-          iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" %>',
+          iconClass: '<%= clipboard_empty?("elements") ? "clipboard" : "paste" %>',
           buttonId: 'clipboard_button',
           onClick: function() {
             Alchemy.openDialog('<%= alchemy.admin_clipboard_path(remarkable_type: "elements") %>', {
@@ -165,7 +165,7 @@
         {
           title: '<%= Alchemy.t("Show trash") %>',
           label: '<%= Alchemy.t("Show trash") %>',
-          iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" %>',
+          iconClass: 'trash-alt<%= trash_empty?("elements") ? "" : " full" %>',
           buttonId: 'element_trash_button',
           onClick: function() {
             Alchemy.TrashWindow.open(<%= @page.id %>, '<%= Alchemy.t("Trash") %>');
@@ -178,7 +178,12 @@
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element-editor');
       Alchemy.Tinymce.init(<%= @page.richtext_contents_ids.to_json %>);
-      $('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
+      $('#cells').tabs().tabs('paging', {
+        follow: true,
+        followOnSelect: true,
+        prevButton: '<i class="fas fa-angle-double-left"></i>',
+        nextButton: '<i class="fas fa-angle-double-right"></i>'
+      });
       Alchemy.ElementDirtyObserver('#element_area');
       if (window.location.hash) {
         $(window.location.hash).trigger('FocusElementEditor.Alchemy');
@@ -195,17 +200,13 @@
       $('#top_menu').css('z-index', 30);
     });
 
-    $('select#preview_size').on('change', function(e) {
+    $('select#preview_size').on('change', function() {
       var width = this.value;
-      if (this.value === 'auto') {
-        width = Alchemy.PreviewWindow.currentWidth;
+      if (width === 'auto') {
+        Alchemy.PreviewWindow.currentWindow.css('width', '');
+      } else {
+        Alchemy.PreviewWindow.resize(width);
       }
-      Alchemy.PreviewWindow.currentWindow.css('width', width);
-    });
-
-    $(window).resize(function() {
-      Alchemy.PreviewWindow.resize();
-      Alchemy.ElementsWindow.resize();
     });
   });
 

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

@@ -1,7 +1,3 @@
-<% content_for :javascript_includes do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
-<% end %>
-
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render 'alchemy/admin/partials/site_select' %>
@@ -9,7 +5,7 @@
   <% if can?(:flush, Alchemy::Page) %>
   <div class="button_with_label">
     <%= link_to(
-      render_icon('flush'),
+      render_icon(:eraser),
       alchemy.flush_admin_pages_path,
       :remote => true,
       :method => :post,
@@ -22,10 +18,10 @@
   <% if can?(:sort, Alchemy::Page) %>
   <div class="button_with_label">
     <%= link_to(
-      render_icon(:sort),
+      render_icon(:random),
       alchemy.sort_admin_pages_path,
       method: :get,
-      class: 'icon_button please_wait',
+      class: 'icon_button',
       title: Alchemy.t('Sort pages')
     ) %>
     <label><%= Alchemy.t('Sort pages') %></label>
@@ -33,7 +29,7 @@
   <% end %>
   <div class="button_with_label" id="clipboard_button">
     <%= link_to_dialog(
-      render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
+      render_icon(clipboard_empty?('pages') ? :clipboard : :paste),
       alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
       {
         :title => Alchemy.t('Clipboard'),
@@ -51,7 +47,7 @@
     placeholder: Alchemy.t(:search),
     id: nil %>
   <%= render_icon :search %>
-  <%= link_to('', '#', {
+  <%= link_to(render_icon(:times, size: 'xs'), '#', {
     class: "js_filter_field_clear",
     title: Alchemy.t(:click_to_show_all)
   }) %>
@@ -60,18 +56,6 @@
 
 <div id="archive_all">
 <% if @page_root %>
-
-  <div id="sort_panel" style="display: none">
-    <div class="info">
-      <%= render_icon('info') %>
-      <%= Alchemy.t(:explain_sitemap_dragndrop_sorting) %>
-    </div>
-    <div class="buttons">
-      <%= link_to( Alchemy.t(:cancel), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
-      <%= submit_tag( Alchemy.t('save order'), :id => 'save_page_order', :class => 'button' ) %>
-    </div>
-  </div>
-
   <h1 id="page_filter_result"></h1>
 
   <%= render 'sitemap', page_partial: 'page', full: !!@sorting %>

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

@@ -26,26 +26,26 @@
     <label><%= Alchemy.t(:page_status) %></label>
     <p>
       <span class="page_status">
-        <%= render_icon @page.public? ? :public : :not_public %>
+        <%= render_icon(:compass, transform: 'shrink-2', class: @page.public? ? nil : 'disabled') %>
         <%= @page.status_title(:public) %>
       </span>
       <span class="page_status">
-        <%= render_icon @page.visible? ? :visible : :not_visible %>
+        <%= render_icon(:eye, transform: 'shrink-2', class: @page.visible? ? nil : 'disabled') %>
         <%= @page.status_title(:visible) %>
       </span>
       <span class="page_status">
-        <%= render_icon @page.restricted? ? :restricted : :not_restricted %>
+        <%= render_icon(:lock, transform: 'shrink-2', class: @page.restricted? ? nil : 'disabled') %>
         <%= @page.status_title(:restricted) %>
       </span>
     </p>
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_was_created) %></label>
-    <p><%= Alchemy.t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :page_status)} %></p>
+    <p><%= Alchemy.t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :'alchemy.page_status')} %></p>
   </div>
   <div class="value">
     <label><%= Alchemy.t(:page_was_updated) %></label>
-    <p><%= Alchemy.t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :page_status)} %></p>
+    <p><%= Alchemy.t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :'alchemy.page_status')} %></p>
   </div>
   <% if @page.locked? %>
   <div class="value">

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

@@ -1,7 +1,7 @@
 <% content_for :toolbar do %>
   <div class="button_with_label">
     <%= link_to alchemy.admin_pages_path, class: 'icon_button' do %>
-      <%= render_icon :back %>
+      <%= render_icon 'angle-double-left' %>
     <% end %>
     <label><%= Alchemy.t(:cancel) %></label>
   </div>

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

@@ -1,8 +1,6 @@
 (function($) {
   $('#locked_page_<%= @page.id -%>').remove();
-  $('#page_<%= @page.id -%> .sitemap_page').removeClass('locked');
-  <%- if @pages_locked_by_user.blank? -%>
-  $('#locked_pages label').hide();
-  <%- end -%>
+  $('#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);

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

@@ -1,4 +1,4 @@
 <div class="flash <%= flash_type %>">
-  <%= render_icon(flash_type.to_s) %>
+  <%= render_icon message_icon_class(flash_type) %>
   <%= message %>
 </div>

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

@@ -3,10 +3,14 @@
     <%= link_to url_for_module(alchemy_module) do %>
       <% if navigation["image"] %>
         <%= image_tag(navigation["image"]) %>
+      <% elsif navigation["inline_image"] %>
+        <span class="icon fa-fw">
+          <%== navigation["inline_image"] %>
+        </span>
       <% elsif navigation["icon"] %>
-        <span class="module icon <%= navigation["icon"] %>"></span>
+        <i class="module icon fas fa-<%= navigation["icon"] %> fa-lg fa-fw"></i>
       <% else %>
-        <span class="module icon"></span>
+        <i class="module icon fas fa-table fa-lg fa-fw"></i>
       <% end %>
       <label><%= Alchemy.t(navigation['name']) %></label>
     <% end %>

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

@@ -11,7 +11,7 @@
       placeholder: Alchemy.t(:search),
       class: 'search_input_field',
       id: nil %>
-    <%= link_to '', url_for(
+    <%= link_to render_icon(:times, size: 'xs'), url_for(
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
@@ -22,6 +22,6 @@
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),
-      style: params[:q].blank? ? 'display: none' : 'display: block' %>
+      style: search_filter_params[:q].blank? ? 'display: none' : 'display: block' %>
   </div>
 <% end %>

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

@@ -9,13 +9,13 @@
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
       <%= f.hidden_field field %>
     <% end %>
-    <%= link_to '', url,
+    <%= link_to render_icon(:times, size: 'xs'), url,
         class: 'search_field_clear',
         id: 'search_field_clear',
         title: Alchemy.t(:click_to_show_all),
-        style: params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
+        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, params[additional_param] %>
+      <%= hidden_field_tag additional_param, search_filter_params[additional_param] %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,21 +1,25 @@
 <div id="library_sidebar">
   <%= render 'filter_bar' %>
-  <div class="tag-list with_filter_bar<%= params[:tagged_with].present? ? ' filtered' : '' %>">
-    <%= render 'tag_list' %>
-  </div>
+
+  <% if Alchemy::Picture.tag_counts.any? %>
+    <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">
+      <%= render 'tag_list' %>
+    </div>
+  <% end %>
 </div>
+
 <%= form_tag delete_multiple_admin_pictures_path, method: :delete do %>
   <div class="selected_item_tools">
     <h2><%= Alchemy.t(:edit_selected_pictures) %></h2>
     <%= link_to(
-      render_icon('edit') + Alchemy.t("Edit"),
+      render_icon(:edit, size: 'xs') + Alchemy.t("Edit"),
       edit_multiple_admin_pictures_path,
       class: 'button with_icon',
       title: Alchemy.t('Edit multiple pictures'),
       id: 'edit_multiple_pictures',
       style: 'float: none'
     ) %>
-    <%= button_tag render_icon('destroy') + Alchemy.t("Delete"), 'data-alchemy-confirm' => {
+    <%= button_tag render_icon(:minus, size: 'xs') + Alchemy.t("Delete"), 'data-alchemy-confirm' => {
       title: Alchemy.t(:please_confirm),
       message: Alchemy.t(:confirm_to_delete_images_from_server),
       ok_label: Alchemy.t("Yes"),
@@ -23,28 +27,26 @@
     }.to_json, class: 'button with_icon' %>
     &nbsp;<%= Alchemy.t(:or) %>&nbsp;
     <%= link_to(
-      render_icon('delete-small') + Alchemy.t("Clear selection"),
+      render_icon(:times, size: 'xs') + Alchemy.t("Clear selection"),
       admin_pictures_path(
-        q: params[:q],
-        tagged_with: params[:tagged_with],
+        q: search_filter_params[:q],
+        tagged_with: search_filter_params[:tagged_with],
         size: params[:size],
-        filter: params[:filter]
+        filter: search_filter_params[:filter]
       ),
-      class: 'button with_icon',
+      class: 'secondary button with_icon',
       style: 'float: none'
     ) %>
   </div>
   <div id="pictures">
-  <% if @pictures.blank? and @recent_pictures.blank? and params[:q].blank? %>
-    <div class="info">
-      <%= render_icon('info') %>
+  <% if @pictures.blank? and @recent_pictures.blank? and search_filter_params[:q].blank? %>
+    <%= render_message do %>
       <%= Alchemy.t(:no_images_in_archive) %>
-    </div>
+    <% end %>
   <% elsif @pictures.blank? and @recent_pictures.blank? %>
-    <div class="info">
-      <%= render_icon('info') %>
+    <%= render_message do %>
       <%= Alchemy.t(:no_search_results) %>
-    </div>
+    <% end %>
   <% else %>
     <%= render partial: 'picture', collection: @pictures %>
     <%= paginate @pictures, theme: 'alchemy' %>

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

@@ -1,7 +1,7 @@
 <div id="overlay_toolbar">
   <%= render 'filter_and_size_bar' %>
 </div>
-<div id="assign_image_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
+<div id="assign_image_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
   <div id="library_sidebar">
     <%= render 'filter_bar' %>
     <div class="tag-list">

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

@@ -6,7 +6,7 @@
       file_attribute: 'image_file',
       in_dialog: true,
       redirect_url: alchemy.admin_pictures_path(
-        size: params[:size],
+        size: search_filter_params[:size],
         filter: 'last_upload',
         content_id: @content.try(:id),
         element_id: @element.try(:id),
@@ -17,15 +17,15 @@
   <div class="button_group">
     <div class="button_with_label">
       <%= link_to(
-        render_icon('zoom-out'),
+        render_icon('search-minus'),
         alchemy.admin_pictures_path({
           size: "small",
           content_id: @content,
           element_id: @element,
-          q: params[:q],
+          q: search_filter_params[:q],
           options: options_from_params,
-          filter: params[:filter],
-          tagged_with: params[:tagged_with]
+          filter: search_filter_params[:filter],
+          tagged_with: search_filter_params[:tagged_with]
         }),
         remote: true,
         title: Alchemy.t(:small_thumbnails),
@@ -34,15 +34,15 @@
     </div>
     <div class="button_with_label">
       <%= link_to(
-        render_icon('zoom-equal'),
+        render_icon('search'),
         alchemy.admin_pictures_path({
           size: "medium",
           content_id: @content,
           element_id: @element,
-          q: params[:q],
+          q: search_filter_params[:q],
           options: options_from_params,
-          filter: params[:filter],
-          tagged_with: params[:tagged_with]
+          filter: search_filter_params[:filter],
+          tagged_with: search_filter_params[:tagged_with]
         }),
         remote: true,
         title: Alchemy.t(:medium_thumbnails),
@@ -51,15 +51,15 @@
     </div>
     <div class="button_with_label">
       <%= link_to(
-        render_icon('zoom-in'),
+        render_icon('search-plus'),
         alchemy.admin_pictures_path({
           size: "large",
           content_id: @content,
           element_id: @element,
-          q: params[:q],
+          q: search_filter_params[:q],
           options: options_from_params,
-          filter: params[:filter],
-          tagged_with: params[:tagged_with]
+          filter: search_filter_params[:filter],
+          tagged_with: search_filter_params[:tagged_with]
         }),
         remote: true,
         title: Alchemy.t(:big_thumbnails),