alchemy_cms 4.0.6 → 4.1.0.beta

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

@@ -1,8 +1,7 @@
 <%- if @elements.blank? -%>
-<div id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %> class="info">
-  <%= render_icon('info') %>
+<%= render_message do %>
   <%= Alchemy.t('Your trash is empty') %>
-</div>
+<% end %>
 <%- else -%>
 <%= render_message do %>
   <%= Alchemy.t('Drag an element over to the element window to restore it') %>

data/app/views/alchemy/admin/uploader/_button.html.erb

@@ -27,8 +27,7 @@
       <% if local_assigns[:in_dialog] %>
         $.get(url, null, null, 'script');
       <% else %>
-        Alchemy.pleaseWaitOverlay();
-        window.location.href = url;
+        Turbolinks.visit(url);
       <% end %>
       }
     };

data/app/views/alchemy/base/500.html.erb

@@ -1,7 +1,7 @@
 <%= toolbar(
   buttons: [
     {
-      icon: 'back',
+      icon: 'angle-double-left',
       url: request.referer || alchemy.admin_dashboard_path,
       label: Alchemy.t(:back),
       title: Alchemy.t(:back),

data/app/views/alchemy/base/permission_denied.js.erb

@@ -1,3 +1,3 @@
 Alchemy.closeCurrentDialog(function() {
-  window.location.href = '<%= Alchemy.login_path %>';
+  Turbolinks.visit('<%= Alchemy.login_path %>');
 });

data/app/views/alchemy/base/redirect.js.erb

@@ -1,8 +1,7 @@
 (function() {
   var dialog = Alchemy.currentDialog();
   var callback = function() {
-    Alchemy.pleaseWaitOverlay();
-    window.location.href = '<%= url_for(@redirect_url) %>';
+    Turbolinks.visit('<%= url_for(@redirect_url) %>');
   };
   if (dialog) {
     Alchemy.closeCurrentDialog(callback);

data/app/views/alchemy/elements/_editor_not_found.html.erb

@@ -1,5 +1,4 @@
-<div class="error">
-  <%= render_icon('error') %>
+<%= render_message :warning do %>
   <h1><%= Alchemy.t(:element_editor_not_found) %>:</h1>
   <p><%= error.html_safe %></p>
-</div>
+<% end %>

data/app/views/alchemy/essences/_essence_date_editor.html.erb

@@ -8,6 +8,6 @@
     }
   ) %>
   <label for="<%= content.form_field_id %>" class="essence_date--label">
-    <span class="ui-icon ui-icon-calendar"></span>
+    <i class="icon far fa-calendar-alt fa-fw fa-lg"></i>
   </label>
 </div>

data/app/views/alchemy/essences/_essence_file_editor.html.erb

@@ -1,4 +1,4 @@
-<% dialog_link = link_to_dialog('',
+<% dialog_link = link_to_dialog render_icon(:file, style: 'regular'),
   alchemy.admin_attachments_path(
     content_id: content.id,
     only: content.settings_value(:only, local_assigns.fetch(:options, {})),
@@ -10,29 +10,26 @@
     size: '780x585',
     padding: false
   },
-  {
-    class: 'icon assign_file',
-    title: Alchemy.t(:assign_file)
-  }
-) %>
+  class: 'file_icon',
+  title: Alchemy.t(:assign_file) %>
 
 <div class="content_editor essence_file" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
   <%= content_label(content) %>
   <div class="file" id="file_<%= content.id %>">
-    <div class="file_icon">
     <% if content.ingredient %>
-      <%= render_icon(content.ingredient.icon_css_class) %>
+      <div class="file_icon">
+        <%= render_icon(content.ingredient.icon_css_class) %>
+      </div>
     <% else %>
       <%= dialog_link %>
     <% end %>
-    </div>
     <div class="file_name">
       <%= content.ingredient.try(:name) ||
         ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
     </div>
     <div class="essence_file_tools">
       <%= dialog_link %>
-      <%= link_to_dialog '',
+      <%= link_to_dialog render_icon(:edit),
         alchemy.edit_admin_essence_file_path(
           id: content.essence.id,
           options: local_assigns.fetch(:options, {})
@@ -41,7 +38,6 @@
           title: Alchemy.t(:edit_file_properties),
           size: '400x215'
         },
-        class: 'edit_file',
         title: Alchemy.t(:edit_file_properties) %>
     </div>
     <%= hidden_field_tag content.form_field_name(:attachment_id),

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -1,19 +1,19 @@
 <%= content_tag :div, id: content.dom_id, data: {"content-id" => content.id}, class: [
-    "essence_picture_editor",
+    "essence_picture",
     options[:sortable] ? "draggable_picture" : nil,
     options[:grouped] ? nil : "content_editor"
   ].compact.join(" ") do %>
-  <% unless options[:grouped] %><%= content_label(content) %><% end %>
+  <% unless options[:grouped] %><%= content_label(content) %><br/><% end %>
   <div class="picture_thumbnail">
     <span class="picture_tool delete">
       <% if options[:grouped] %>
-        <%= link_to_confirm_dialog "", Alchemy.t(:confirm_to_delete_image),
+        <%= link_to_confirm_dialog render_icon(:minus), Alchemy.t(:confirm_to_delete_image),
           alchemy.admin_essence_picture_path(
             id: content,
             options: options
           ), {title: Alchemy.t(:delete_image)} %>
       <% else %>
-        <%= link_to '', '#',
+        <%= link_to render_icon(:times), '#',
           onclick: "return Alchemy.removePicture('##{content.form_field_id(:picture_id)}');" %>
       <% end %>
     </span>
@@ -21,10 +21,12 @@
       <div class="picture_handle" title="<%= Alchemy.t(:drag_to_sort) if options[:sortable] %>"></div>
     <%- end -%>
     <div class="picture_image">
-      <div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
+      <div class="thumbnail_background">
         <%- if content.ingredient -%>
-        <%= essence_picture_thumbnail(content, options) %>
-        <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
+          <%= essence_picture_thumbnail(content, options) %>
+          <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
+        <% else %>
+          <%= render_icon(:image, style: 'regular') %>
         <% end %>
       </div>
     </div>

data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb

@@ -15,7 +15,7 @@
   <a href="#" class="disabled"><%= render_icon('crop') %></a>
 <%- end -%>
 
-<%= link_to_dialog render_icon('swap_picture'),
+<%= link_to_dialog render_icon('file-image', style: 'regular'),
   alchemy.admin_pictures_path(
     element_id: content.element,
     content_id: content.id,

data/app/views/alchemy/pages/_meta_data.html.erb

@@ -1,6 +1,6 @@
 <% if @page %>
   <meta charset="utf-8">
-  <title><%= page_title prefix: local_assigns.fetch(:title_prefix, nil), separator: local_assigns.fetch(:title_separator, nil) %></title>
+  <title><%= page_title prefix: local_assigns.fetch(:title_prefix, nil), suffix: local_assigns.fetch(:title_suffix, nil), separator: local_assigns.fetch(:title_separator, nil) %></title>
   <%= tag(:meta, name: 'created', content: @page.updated_at) %>
   <%= tag(:meta, name: 'robots', content: meta_robots) %>
   <%= tag(:meta, name: 'description', content: meta_description, lang: @page.language_code) if meta_description.present? %>

data/app/views/kaminari/alchemy/_first_page.html.erb

@@ -6,6 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="first">
-  <%= link_to_unless current_page.first?, '&laquo;'.html_safe, url, remote: remote, title: t('views.pagination.first'), class: 'button' %>
-</span>
+<% if current_page.first? %>
+  <span class="first-page disabled"><i class="icon fas fa-angle-double-left"></i></span>
+<% else %>
+  <%= link_to url, remote: remote, title: Alchemy.t(:first, scope: 'pagination'), class: 'first-page' do %>
+    <i class="icon fas fa-angle-double-left"></i>
+  <% end %>
+<% end %>

data/app/views/kaminari/alchemy/_gap.html.erb

@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap">&hellip;</span>
+<span class="page gap"><i class="icon fas fa-ellipsis-h"></i></span>

data/app/views/kaminari/alchemy/_last_page.html.erb

@@ -6,6 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="last">
-  <%= link_to_unless current_page.last?, '&raquo;'.html_safe, url, {remote: remote, title: t('views.pagination.last'), class: 'button'} %>
-</span>
+<% if current_page.last? %>
+  <span class="last-page disabled"><i class="icon fas fa-angle-double-right"></i></span>
+<% else %>
+  <%= link_to url, remote: remote, title: Alchemy.t(:last, scope: 'pagination'), class: 'last-page' do %>
+    <i class="icon fas fa-angle-double-right"></i>
+  <% end %>
+<% end %>

data/app/views/kaminari/alchemy/_next_page.html.erb

@@ -7,7 +7,9 @@
     remote:        data-remote
 -%>
 <% if current_page.last? -%>
-<span class="next_page disabled">&rsaquo;</span>
+  <span class="next_page disabled"><i class="icon fas fa-angle-right"></i></span>
 <% else -%>
-<%= link_to '&rsaquo;'.html_safe, url, rel: 'next', remote: remote, title: t('views.pagination.next_page'), class: 'next_page button' -%>
+  <%= link_to url, rel: 'next', remote: remote, title: Alchemy.t(:next_page, scope: 'pagination'), class: 'next_page' do %>
+    <i class="icon fas fa-angle-right"></i>
+  <% end %>
 <% end -%>

data/app/views/kaminari/alchemy/_page.html.erb

@@ -10,5 +10,5 @@
 <% if page.current? -%>
 <span class="page current"><%= page -%></span>
 <% else -%>
-<%= link_to page, url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil, class: 'button'} -%>
+<%= link_to page, url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil, class: 'page'} -%>
 <% end -%>

data/app/views/kaminari/alchemy/_prev_page.html.erb

@@ -7,7 +7,9 @@
     remote:        data-remote
 -%>
 <% if current_page.first? -%>
-<span class="previous_page disabled">&lsaquo;</span>
+  <span class="previous_page disabled"><i class="icon fas fa-angle-left"></i></span>
 <% else -%>
-<%= link_to '&lsaquo;'.html_safe, url, rel: 'prev', remote: remote, class: 'previous_page button', title: t('views.pagination.previous_page') -%>
+  <%= link_to url, rel: 'prev', remote: remote, class: 'previous_page', title: Alchemy.t(:previous_page, scope: 'pagination') do %>
+    <i class="icon fas fa-angle-left"></i>
+  <% end %>
 <% end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -54,17 +54,17 @@
         <% end %>
         <%= yield(:alchemy_main_navigation) %>
       </div>
-      <div id="logout">
+      <div id="logout" class="main_navi_entry">
         <% if current_alchemy_user %>
           <%= link_to_dialog(
-            "#{render_icon('exit module')}<label>#{Alchemy.t(:leave)}</label>".html_safe,
+            "#{render_icon('sign-out-alt', size: 'lg', class: 'module')}<label>#{Alchemy.t(:leave)}</label>".html_safe,
             alchemy.leave_admin_path, {
               size: "300x155",
               title: Alchemy.t("Leave Alchemy")
           }, {'data-alchemy-hotkey' => 'alt+q'}) %>
         <% else %>
           <%= link_to(alchemy.root_path) do %>
-            <span class="module icon exit"></span>
+            <i class="icon fas fa-sign-out-alt fa-fw fa-lg"></i>
             <label><%= Alchemy.t(:leave) %></label>
           <% end %>
         <% end %>
@@ -80,9 +80,11 @@
         <% end %>
         <div id="user_info">
           <%= current_alchemy_user_name %>
-          <%= select_tag 'change_locale',
-            options_for_select(translations_for_select, ::I18n.locale),
-            class: 'alchemy_selectbox tiny' %>
+          <% if Alchemy::I18n.available_locales.length > 1 %>
+            <%= select_tag 'change_locale',
+              options_for_select(translations_for_select, ::I18n.locale),
+              class: 'alchemy_selectbox tiny' %>
+          <% end %>
         </div>
       </div>
       <div id="toolbar">

data/bin/rails

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/alchemy/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/alchemy/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/bin/rspec

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path('../spring', __FILE__)
+  load File.expand_path('spring', __dir__)
 rescue LoadError => e
   raise unless e.message.include?('spring')
 end

data/config/alchemy/config.yml

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 # == This is the global Alchemy configuration file
 #
 

data/config/alchemy/modules.yml

@@ -7,7 +7,7 @@
     name: 'modules.dashboard'
     controller: 'alchemy/admin/dashboard'
     action: index
-    image: 'alchemy/icon.svg'
+    inline_image: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -6 32 32" class="svg-inline--fa fa-lg fa-fw"><path fill="currentColor" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/></svg>'
 
 - name: pages
   engine_name: alchemy
@@ -16,7 +16,7 @@
     name: 'modules.pages'
     controller: 'alchemy/admin/pages'
     action: index
-    icon: pages
+    icon: file-alt
     sub_navigation:
       - name: 'modules.pages'
         controller: 'alchemy/admin/pages'
@@ -35,7 +35,7 @@
     name: 'modules.languages'
     controller: 'alchemy/admin/languages'
     action: index
-    icon: languages
+    icon: flag
 
 - name: sites
   engine_name: alchemy
@@ -44,7 +44,7 @@
     name: 'modules.sites'
     controller: 'alchemy/admin/sites'
     action: index
-    icon: sites
+    icon: bullseye
 
 - name: tags
   engine_name: alchemy
@@ -62,7 +62,7 @@
     controller: 'alchemy/admin/pictures'
     action: index
     name: 'modules.library'
-    icon: library
+    icon: archive
     sub_navigation:
       - name: 'modules.pictures'
         controller: 'alchemy/admin/pictures'

data/config/initializers/simple_form.rb

@@ -1,3 +1,11 @@
+# frozen_string_literal: true
+#
+# Uncomment this and change the path if necessary to include your own
+# components.
+# See https://github.com/plataformatec/simple_form#custom-components to know
+# more about custom components.
+# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
+#
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a
@@ -6,9 +14,10 @@ SimpleForm.setup do |config|
   # stack. The options given below are used to wrap the
   # whole input.
   config.wrappers :alchemy,
-    class: 'input',
-    hint_class: 'field_with_hint',
-    error_class: 'field_with_errors' do |b|
+    class: :input,
+    hint_class: :field_with_hint,
+    error_class: :field_with_errors,
+    valid_class: :field_without_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
     # given input by passing: `f.input EXTENSION_NAME => false`.
@@ -24,14 +33,18 @@ SimpleForm.setup do |config|
     b.use :placeholder
 
     ## Optional extensions
-    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
     # to the input. If so, they will retrieve the values from the model
-    # if any exists. If you want to enable the lookup for any of those
+    # if any exists. If you want to enable any of those
     # extensions by default, you can change `b.optional` to `b.use`.
 
     # Calculates maxlength from length validations for string inputs
+    # and/or database column lengths
     b.optional :maxlength
 
+    # Calculate minlength from length validations for string inputs
+    b.optional :minlength
+
     # Calculates pattern from format validations for string inputs
     b.optional :pattern
 
@@ -42,9 +55,16 @@ SimpleForm.setup do |config|
     b.optional :readonly
 
     ## Inputs
+    # b.use :input, class: 'input', error_class: 'is-invalid'
     b.use :label_input
     b.use :error, wrap_with: { tag: :small, class: :error }
     b.use :hint,  wrap_with: { tag: :small, class: :hint }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
   end
 
   # The default wrapper to be used by the FormBuilder.
@@ -86,8 +106,7 @@ SimpleForm.setup do |config|
   config.collection_wrapper_class = 'control_group'
 
   # You can wrap each item in a collection of radio/check boxes with a tag,
-  # defaulting to :span. Please note that when using :boolean_style = :nested,
-  # SimpleForm will force this option to be a label.
+  # defaulting to :span.
   # config.item_wrapper_tag = :span
 
   # You can define a class to use in all item wrappers. Defaulting to none.
@@ -99,7 +118,8 @@ SimpleForm.setup do |config|
   # You can define the class to use on all labels. Default is nil.
   config.label_class = 'control-label'
 
-  # You can define the class to use on all forms. Default is simple_form.
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
   # config.default_form_class = nil
 
   # You can define which elements should obtain additional classes
@@ -127,6 +147,10 @@ SimpleForm.setup do |config|
   # type as key and the wrapper that will be used for all inputs with specified type.
   # config.wrapper_mappings = { string: :prepend }
 
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil
 
@@ -141,4 +165,17 @@ SimpleForm.setup do |config|
 
   # Cache SimpleForm inputs discovery
   # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  config.i18n_scope = 'alchemy.forms'
 end