alchemy_cms 4.0.6 → 4.1.0.beta

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

@@ -4,7 +4,7 @@
     'file_type_filter',
     options_for_select(
       Alchemy::Attachment.file_types_for_select,
-      params[:file_type]
+      search_filter_params[:file_type]
     ),
     include_blank: Alchemy.t('Show all files'),
     data: { remote: !!request.xhr? },
@@ -20,9 +20,8 @@
       if ($this.data('remote') === true) {
         $.get(url, {file_type: $this.val()}, null, 'script');
       } else {
-        Alchemy.pleaseWaitOverlay();
         delimiter = url.match(/\?/) ? '&' : '?';
-        window.location = url + delimiter + 'file_type=' + encodeURIComponent($this.val());
+        Turbolinks.visit(url + delimiter + 'file_type=' + encodeURIComponent($this.val()));
       }
       return false;
     });

data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb

@@ -1,12 +1,11 @@
 <% if @attachments.empty? %>
-  <div class="info">
-    <%= render_icon('info') %>
-    <% if params[:q].present? %>
+  <%= render_message do %>
+    <% if search_filter_params[:q].present? %>
       <%= Alchemy.t(:no_search_results) %>
     <% else %>
       <%= Alchemy.t(:no_files_in_archive) %>
     <% end %>
-  </div>
+  <% end %>
 <% else %>
   <ul class="list">
     <li class="list-header">

data/app/views/alchemy/admin/attachments/_replace_button.html.erb

@@ -4,7 +4,7 @@
     name: "#{f.object_name}[#{file_attribute}]",
     id: "replace_#{dom_id(object)}" %>
   <%= label_tag "replace_#{dom_id(object)}", title: Alchemy.t(:replace_file) do %>
-    <%= render_icon :file_change %>
+    <%= render_icon :sync %>
   <% end %>
 <% end %>
 
@@ -17,8 +17,7 @@
       selector: '#replace_<%= dom_id(object) %>',
       file_types: '<%= file_types.join("|") %>',
       complete: function() {
-        Alchemy.pleaseWaitOverlay();
-        window.location.href = '<%= redirect_url.html_safe %>';
+        Turbolinks.visit('<%= redirect_url.html_safe %>');
       }
     };
     Alchemy.Uploader(options);

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

@@ -4,12 +4,12 @@
   <ul>
     <%= render_tag_list('Alchemy::Attachment') %>
   </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/attachments/destroy.js.erb

@@ -1 +1 @@
-window.location.href = '<%= @url %>';
+Turbolinks.visit('<%= @url %>');

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

@@ -1,8 +1,8 @@
 <%= alchemy_form_for([:admin, @attachment],
-  url: {action: :update, q: params[:q], page: params[:page]}) do |f| -%>
+  url: {action: :update, q: search_filter_params[:q], page: params[:page]}) do |f| -%>
   <%= f.input :name, input_html: {autofocus: true} %>
   <%= f.input :file_name, input_html: {autofocus: true}, hint: Alchemy.t(:attachment_filename_notice) %>
-  <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/attachments/index.html.erb

@@ -7,7 +7,8 @@
         file_attribute: 'file' %>
     <% end %>
   </div>
-  <%= render 'alchemy/admin/partials/search_form' %>
+  <%= render 'alchemy/admin/partials/search_form',
+    additional_params: [:file_type, :tagged_with] %>
 <% end %>
 
 <div id="archive_all" class="with_tag_filter resources-table-wrapper">
@@ -18,7 +19,7 @@
     <%= render 'filter_bar' %>
 
     <% if Alchemy::Attachment.tag_counts.any? %>
-      <div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
+      <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">
         <%= render 'tag_list' %>
       </div>
     <% end %>

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

@@ -1,7 +1,7 @@
 <div class="resource_info">
   <div class="value">
     <label>
-      <%= render_icon @attachment.icon_css_class %>
+      <%= render_icon @attachment.icon_css_class, style: 'regular', size: 'lg' %>
     </label>
     <p><%= @attachment.file_name %></p>
   </div>
@@ -9,33 +9,32 @@
     <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
     <p><%= alchemy.show_attachment_url(@attachment) %></p>
     <a data-clipboard-text="<%= alchemy.show_attachment_url(@attachment) %>" class="icon_button--right">
-      <%= render_icon('clipboard full') %>
+      <%= render_icon(:clipboard, style: 'regular') %>
     </a>
   </div>
   <div class="value with-icon">
     <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
     <p><%= alchemy.download_attachment_url(@attachment) %></p>
     <a data-clipboard-text="<%= alchemy.download_attachment_url(@attachment) %>" class="icon_button--right">
-      <%= render_icon('clipboard full') %>
+      <%= render_icon(:clipboard, style: 'regular') %>
     </a>
   </div>
 </div>
 
 <% case @attachment.icon_css_class %>
-<% when "image" %>
+<% when "file-image" %>
 <div class="attachment_preview_container image-preview">
   <%= image_tag(alchemy.show_attachment_path(@attachment), class: "full_width") %>
 </div>
-<% when "audio" %>
+<% when "file-audio" %>
 <div class="attachment_preview_container player-preview">
   <%= audio_tag(alchemy.show_attachment_path(@attachment), preload: "none", controls: true, class: "full_width") %>
 </div>
-<% when "video" %>
+<% when "file-video" %>
 <div class="attachment_preview_container player-preview">
   <%= video_tag(alchemy.show_attachment_path(@attachment), preload: "metadata", controls: true, class: "full_width") %>
 </div>
-<% when "archive", "file" %>
-<% else %>
+<% when "file-pdf" %>
 <iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 class="full-iframe">
   Your browser does not support frames.
 </iframe>

data/app/views/alchemy/admin/clipboard/clear.js.erb

@@ -1,3 +1,3 @@
 $("#clipboard_items").replaceWith("<%= j render_message { Alchemy.t('No items in your clipboard') } -%>");
-$('#clipboard_button .icon.clipboard').removeClass('full');
+$('#clipboard_button .icon').removeClass('fa-paste').addClass('fa-clipboard');
 Alchemy.pleaseWaitOverlay(false);

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

@@ -1,22 +1,38 @@
 <%- if @clipboard_items.blank? -%>
-<div class="info">
-  <%= render_icon('info') %>
+<%= render_message do %>
   <%= Alchemy.t('No items in your clipboard') %>
-</div>
+<% end %>
 <%- else -%>
 <div id="clipboard_items">
   <ul>
     <%- @clipboard_items.each do |item| -%>
     <% item_class = item.class.name.demodulize.underscore.pluralize %>
     <li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
-      <%= render_icon("clipboard_#{item_class}") %>
-      <%= item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text(60) : item.name %>
-      <span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(remarkable_type: item_class, remarkable_id: item.id), remote: true, method: 'delete', title: Alchemy.t('Remove item from clipboard')) %></span>
+      <% if item_class == 'pages' %>
+        <%= render_icon(:file, style: 'regular') %>
+        <%= item.name %>
+      <% else %>
+        <% if item.public? %>
+          <%= render_icon('window-maximize', style: 'regular', class: 'element') %>
+        <% else %>
+          <%= render_icon('window-close', class: 'element') %>
+        <% end %>
+        <%= item.display_name_with_preview_text(60) %>
+      <% end %>
+      <span class="float_right">
+        <%= link_to render_icon(:times, size: 'xs'),
+          alchemy.remove_admin_clipboard_path(remarkable_type: item_class, remarkable_id: item.id),
+          remote: true, method: 'delete',
+          title: Alchemy.t('Remove item from clipboard') %>
+      </span>
     </li>
     <%- end -%>
   </ul>
   <p>
-    <%= link_to_confirm_dialog(Alchemy.t('clear clipboard'), Alchemy.t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path(remarkable_type: params[:remarkable_type]), class: 'button') %>
+    <%= link_to_confirm_dialog Alchemy.t('clear clipboard'),
+      Alchemy.t('Do you really want to clear the clipboard?'),
+      alchemy.clear_admin_clipboard_path(remarkable_type: params[:remarkable_type]),
+      class: 'button' %>
   </p>
 </div>
 <%- end -%>

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -16,4 +16,4 @@ Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.to_
 
 <% end -%>
 
-$('#clipboard_button .icon.clipboard').addClass('full');
+$('#clipboard_button .icon').removeClass('fa-clipboard').addClass('fa-paste');

data/app/views/alchemy/admin/clipboard/remove.js.erb

@@ -3,8 +3,8 @@
   $("#clipboard_item_<%= @item.id -%>").remove();
   Alchemy.growl('<%= Alchemy.t("item removed from clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- if @clipboard.blank? -%>
-  $('#clipboard_button .icon.clipboard').removeClass('full');
-  $("#clipboard_items").replaceWith("<p><%= Alchemy.t('No items in your clipboard') -%></p>");
+  $('#clipboard_button .icon').removeClass('fa-paste').addClass('fa-clipboard');
+  $("#clipboard_items").replaceWith("<%= j render_message { Alchemy.t('No items in your clipboard') } %>");
 <%- end -%>
 
 })(jQuery);

data/app/views/alchemy/admin/contents/create.js.erb

@@ -23,7 +23,7 @@ $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('c
 <% if @gallery_pictures %>
 
 <% if @gallery_pictures.size > 1 %>
-$('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('draggable_picture');
+$('#element_<%= @element.id %>_contents .essence_picture').addClass('draggable_picture');
 <% end %>
 
 <% if !max_image_count.blank? && @gallery_pictures.size >= max_image_count %>

data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb

@@ -1,13 +1,16 @@
+<% colspan = multi_site? ? 5 : 4 %>
 <div class="widget">
-  <h2><%= Alchemy.t('Currently locked pages') %>:</h2>
-  <table>
+  <table class="list">
+    <tr>
+      <th colspan="<%= colspan %>"><%= Alchemy.t('Currently locked pages') %></th>
+    </tr>
   <% if @all_locked_pages.blank? %>
-    <tr class="even">
-      <td><%= Alchemy.t('no pages') %></td>
+    <tr>
+      <td colspan="<%= colspan %>"><%= Alchemy.t('no pages') %></td>
     </tr>
   <% else %>
     <% @all_locked_pages.each do |page| %>
-    <tr class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
+    <tr class="<%= cycle('even', 'odd', name: 'locked_pages') %>">
       <td>
         <% if current_alchemy_user.id == page.locked_by %>
         <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %>
@@ -36,7 +39,7 @@
         <% if current_alchemy_user.id == page.locked_by %>
         <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
           <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
-            <%= render_icon('close small') %>
+            <%= render_icon(:times, size: 'xs') %>
           </button>
         <% end %>
         <% end %>

data/app/views/alchemy/admin/dashboard/_recent_pages.html.erb

@@ -1,9 +1,11 @@
 <div class="widget">
-  <h2><%= Alchemy.t('Your last updated pages') %>:</h2>
-  <table>
+  <table class="list">
+    <tr>
+      <th colspan="4"><%= Alchemy.t('Your last updated pages') %></th>
+    </tr>
   <% if @last_edited_pages.blank? %>
     <tr class="even">
-      <td><%= Alchemy.t('no pages') %></td>
+      <td colspan="4"><%= Alchemy.t('no pages') %></td>
     </tr>
   <% else %>
     <% @last_edited_pages.each do |page| %>
@@ -22,7 +24,7 @@
         <% end %>
       </td>
       <td>
-        <small><%= l(page.updated_at, format: :short) %></small>
+        <small><%= l(page.updated_at, format: :'alchemy.short_datetime') %></small>
       </td>
     </tr>
     <% end %>

data/app/views/alchemy/admin/dashboard/_sites.html.erb

@@ -1,6 +1,8 @@
 <div class="widget sites">
-  <h2><%= Alchemy::Site.model_name.human(count: 2) %>:</h2>
-  <table>
+  <table class="list">
+    <tr>
+      <th colspan="2"><%= Alchemy::Site.model_name.human(count: 2) %></th>
+    </tr>
     <% @sites.each do |site| %>
     <tr class="<%= cycle('even', 'odd', name: 'sites') %>">
       <td>

data/app/views/alchemy/admin/dashboard/_users.html.erb

@@ -1,9 +1,11 @@
 <div class="widget">
-  <h2><%= Alchemy.t('Who else is online') %>:</h2>
-  <table>
+  <table class="list">
+    <tr>
+      <th colspan="2"><%= Alchemy.t('Who else is online') %></th>
+    </tr>
   <% if @online_users.blank? %>
-    <tr class="even">
-      <td><%= Alchemy.t('no users') %></td>
+    <tr>
+      <td colspan="2"><%= Alchemy.t('no users') %></td>
     </tr>
   <% else %>
     <% @online_users.each do |user| %>

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

@@ -1,7 +1,7 @@
 <%= toolbar(
   buttons: [
     {
-      icon: 'info',
+      icon: 'info-circle',
       label: Alchemy.t(:info),
       url: alchemy.dashboard_info_path,
       title: Alchemy.t(:info),
@@ -26,7 +26,7 @@
   </h1>
   <% if @last_sign_at %>
   <p>
-    <small><%= Alchemy.t('Your last login was on', time: l(@last_sign_at)) %></small>
+    <small><%= Alchemy.t('Your last login was on', time: l(@last_sign_at, format: :'alchemy.default')) %></small>
   </p>
   <% end %>
   <div class="column left">
@@ -34,7 +34,7 @@
     <%= render 'recent_pages' %>
   </div>
   <div class="column right">
-    <% if @online_users %>
+    <% if @online_users.any? %>
       <%= render 'users' %>
     <% end %>
     <% if multi_site? %>

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

@@ -5,21 +5,20 @@
 <% if can? :update_check, :alchemy_admin_dashboard %>
 <p class="center" id="update_check">
   <span id="update_available">
-    <%= render_icon('warning') %>
+    <%= render_icon(:exclamation) %>
     <%= Alchemy.t 'Update available' %>
   </span>
   <span id="up_to_date">
-    <%= render_icon('ok') %>
+    <%= render_icon(:check) %>
     <%= Alchemy.t 'Alchemy is up to date' %>
   </span>
   <span id="error">
-    <%= render_icon('warning') %>
+    <%= render_icon(:exclamation) %>
     <%= Alchemy.t 'Update status unavailable' %>
   </span>
 </p>
 <% end %>
-<div class="info">
-  <%= render_icon('info') %>
+<%= render_message do %>
   <p><%= Alchemy.t('Alchemy is open software and itself uses open software and free resources:') %></p>
   <ul>
     <li>
@@ -38,10 +37,10 @@
       <a href="http://blueimp.github.io/jQuery-File-Upload/" target="_blank">jQuery File Upload</a>
     </li>
     <li>
-      <a href="http://p.yusukekamiyamane.com" target="_blank">Fugue Icons by Yusuke Kamiyamane</a>
+      <a href="https://fontawesome.com" target="_blank">FontAwesome Icons</a>
     </li>
   </ul>
-</div>
+<% end %>
 <% if can? :update_check, :alchemy_admin_dashboard %>
 <script type="text/javascript">
   (function() {

data/app/views/alchemy/admin/elements/_add_picture.html.erb

@@ -1,6 +1,6 @@
 <div class="add_picture" id="add_picture_<%= element.id %>">
   <%= link_to_dialog(
-    render_icon('add'),
+    render_icon(:plus),
     alchemy.admin_pictures_path(
       element_id: element,
       options: options

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -39,7 +39,7 @@
       <% end %>
 
       <% if element.expanded? %>
-        <%= link_to_dialog render_icon(:create) + Alchemy.t("New Element"),
+        <%= link_to_dialog render_icon(:plus, size: 'xs') + Alchemy.t("New Element"),
           alchemy.new_admin_element_path(
             parent_element_id: element.id,
             page_id: element.page.id

data/app/views/alchemy/admin/elements/_element_header.html.erb

@@ -1,13 +1,13 @@
 <div class="element-header<%= ' has-hint' if element.has_hint? %>">
   <span class="element-handle">
-    <%= render_icon(:element) %>
     <% if element.definition.blank? %>
-      <%= hint_with_tooltip(
-        Alchemy.t(:element_definition_missing),
-        class: 'warning icon'
-      ) %>
+      <%= hint_with_tooltip Alchemy.t(:element_definition_missing) %>
     <% else %>
-      <%= render_icon("element_#{element.public? ? 'public' : 'draft'}") %>
+      <% if element.public? %>
+        <%= render_icon('window-maximize', style: 'regular', class: 'element') %>
+      <% else %>
+        <%= render_icon('window-close', class: 'element') %>
+      <% end %>
     <% end %>
   </span>
   <span class="element-title">
@@ -17,12 +17,12 @@
     </span>
   </span>
   <%= render_hint_for(element) unless element.trashed? %>
-  <span class="ajax-folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>
-    <%= link_to '', '#', {
-      'data-element-toggle' => element.id,
-      class: element.folded? ? 'expand_element' : 'fold_element',
-      title: element.folded? ? Alchemy.t(:show_element_content) : Alchemy.t(:hide_element_content),
-      id: "element_#{element.id}_folder"
-    } %>
-  </span>
+  <%= link_to '#', {
+    'data-element-toggle' => element.id,
+    title: Alchemy.t(element.folded? ? :show_element_content : :hide_element_content),
+    id: "element_#{element.id}_folder",
+    class: "ajax-folder"
+  } do %>
+    <%= render_icon element.folded? ? 'plus-square' : 'minus-square' %>
+  <% end %>
 </div>