RubyGems - alchemy_cms - Versions diffs - 4.0.5 → 4.1.0.beta - Mend

alchemy_cms 4.0.5 → 4.1.0.beta

Files changed (340) hide show

data/app/views/alchemy/admin/elements/_new_element_form.html.erb CHANGED

@@ -1,8 +1,7 @@
 <%- if @elements.blank? -%>
-  <div class="info">
-    <%= render_icon('info') %>
+  <%= render_message do %>
     <%= Alchemy.t(:no_more_elements_to_add) %>
-  </div>
+  <% end %>
 <%- else -%>
   <%= alchemy_form_for [:admin, @element] do |form| %>
     <%= form.hidden_field :page_id %>

data/app/views/alchemy/admin/elements/index.html.erb CHANGED

@@ -10,9 +10,7 @@
         </li>
       <% end %>
     </ul>
-    <div id="cell_for_other_elements"
-      class="sortable_cell for_other_elements_cell"
-      data-droppable-elements="<%= @page.element_names_from_definition.join(' ') %>">
+    <div id="cell_for_other_elements" class="sortable_cell for_other_elements_cell">
       <%= render partial: 'alchemy/admin/elements/element',
         collection: @page.elements.not_trashed.not_in_cell %>
     </div>
@@ -20,7 +18,7 @@
       <%= content_tag :div,
         id: "cell_#{cell.name}",
         class: ["sortable_cell", "#{cell.name}_cell"].join(' '),
-        data: {'cell-id' => cell.id, 'droppable-elements' => cell.element_definitions.join(' ')} do %>
+        data: {'cell-id' => cell.id, 'data-droppable-elements' => cell.element_definitions.join(' ')} do %>
         <%= render partial: 'alchemy/admin/elements/element', collection: elements %>
       <% end %>
     <% end %>

data/app/views/alchemy/admin/elements/new.html.erb CHANGED

@@ -11,8 +11,7 @@
   </div>
   <div id="paste_element_tab">
     <%= alchemy_form_for([:admin, @element]) do |f| %>
-      <%= f.hidden_field :page_id %>
-      <%= f.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
+      <%= f.hidden_field(:page_id) %>
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
         <%= select_tag 'paste_from_clipboard',

data/app/views/alchemy/admin/elements/publish.js.erb CHANGED

@@ -1,14 +1,14 @@
 var el = $('.element-editor[data-element-id="<%= @element.id %>"]');
-var icon = el.find('> .element-header > .element-handle .icon:not(.element)');
+var icon = el.find('> .element-header > .element-handle > .icon');
 var label = el.find('> .element-toolbar .publish-element-button label');
 <%- if @element.public? -%>
-  icon.removeClass('element_draft');
-  icon.addClass('element_public');
+  icon.removeClass('fa-window-close fas');
+  icon.addClass('fa-window-maximize far');
   label.text('<%= Alchemy.t(:hide_element) %>');
 <%- else -%>
-  icon.removeClass('element_public');
-  icon.addClass('element_draft');
+  icon.removeClass('fa-window-maximize far');
+  icon.addClass('fa-window-close fas');
   label.text('<%= Alchemy.t(:show_element) %>');
 <%- end -%>

data/app/views/alchemy/admin/languages/_language.html.erb CHANGED

@@ -21,28 +21,23 @@
     <%= Alchemy::PageLayout.human_layout_name(language.page_layout) %>
   </td>
   <td class="center">
-    <%= language.public? ? render_icon('true') : '' %>
+    <%= language.public? ? render_icon(:check) : nil %>
   </td>
   <td class="center">
-    <%= language.default? ? render_icon('true') : '' %>
+    <%= language.default? ? render_icon(:check) : nil %>
   </td>
   <td class="tools">
   <%- if can?(:destroy, language) -%>
     <%= delete_button resource_path(language) %>
   <%- end -%>
   <%- if can?(:edit, language) -%>
-    <%= link_to_dialog(
-      '',
+    <%= link_to_dialog render_icon(:edit),
       alchemy.edit_admin_language_path(language),
       {
         title: Alchemy.t("Edit"),
         size: "430x415"
       },
-      {
-        class: "icon edit",
-        title: Alchemy.t("Edit")
-      }
-    ) -%>
+      title: Alchemy.t("Edit") %>
   <%- end -%>
   </td>
 </tr>

data/app/views/alchemy/admin/languages/_table.html.erb CHANGED

@@ -36,7 +36,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/languages/index.html.erb CHANGED

@@ -3,7 +3,7 @@
 <% content_for :toolbar do %>
   <div class="toolbar_buttons">
     <%= render 'alchemy/admin/partials/site_select' %>
-    <%= toolbar_button icon: 'create',
+    <%= toolbar_button icon: :plus,
       label: label_title,
       url: new_resource_path,
       title: label_title,

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb CHANGED

@@ -4,14 +4,14 @@
     <% if layoutpage.definition.blank? %>
       <%= page_layout_missing_warning %>
     <% else %>
-      <%= render_icon(:page) %>
+      <i class="icon far fa-file fa-lg"></i>
     <% end %>
     </div>
     <div class="sitemap_right_tools">
     <%- if can?(:configure, layoutpage) -%>
       <div class="button_with_label sitemap_tool">
         <%= link_to_dialog(
-          render_icon('configure_page'),
+          render_icon(:cog),
           alchemy.edit_admin_layoutpage_path(layoutpage),
           {
             title: Alchemy.t(:edit_page_properties),
@@ -24,7 +24,7 @@
     <%- if can?(:copy, layoutpage) -%>
       <div class="button_with_label sitemap_tool">
         <%= link_to(
-          render_icon("copy_page"),
+          render_icon(:copy),
           alchemy.insert_admin_clipboard_path(
             remarkable_type: layoutpage.class.name.demodulize.underscore.pluralize,
             remarkable_id: layoutpage.id
@@ -38,7 +38,7 @@
     <%- if can?(:destroy, layoutpage) -%>
       <div class="button_with_label sitemap_tool">
         <%= link_to_confirm_dialog(
-          render_icon('delete_page'),
+          render_icon(:minus),
           Alchemy.t(:confirm_to_delete_page),
           url_for(
             controller: 'pages',
@@ -50,7 +50,7 @@
       </div>
     <%- end -%>
     </div>
-    <div class="sitemap_sitename">
+    <div class="sitemap_sitename without-status">
       <%= link_to(
         layoutpage.name,
         alchemy.edit_admin_page_path(layoutpage),

data/app/views/alchemy/admin/layoutpages/index.html.erb CHANGED

@@ -3,7 +3,7 @@
   <%= render 'alchemy/admin/partials/site_select' %>
   <%= render 'alchemy/admin/partials/language_tree_select' %>
   <%= toolbar_button(
-    icon: 'add_page',
+    icon: :plus,
     url: alchemy.new_admin_page_path(parent_id: @layout_root.id, layoutpage: true),
     hotkey: 'alt+n',
     dialog_options: {
@@ -16,15 +16,16 @@
     if_permitted_to: [:create, Alchemy::Page]
   ) %>
   <%= toolbar_button(
-    icon: "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
+    icon: clipboard_empty?('pages') ? 'clipboard' : 'paste',
     url: alchemy.admin_clipboard_path(remarkable_type: 'pages'),
     dialog_options: {
       title: Alchemy.t('Clipboard'),
       size: '380x270'
     },
     title: Alchemy.t('Show clipboard'),
-    id: "clipboard_button",
-    label: Alchemy.t('Show clipboard')
+    link_options: {id: "clipboard_button"},
+    label: Alchemy.t('Show clipboard'),
+    if_permitted_to: [:create, Alchemy::Page]
   ) %>
 </div>
 <% end %>

data/app/views/alchemy/admin/leave.html.erb CHANGED

@@ -3,7 +3,7 @@
 <% end %>
 <p class="buttons">
   <label><%= Alchemy.t("Do you want to") %></label>
-  <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button' %>
+  <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button secondary' %>
 </p>
 <%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>
   <label><%= Alchemy.t('or to completely') %></label>

data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb CHANGED

@@ -5,7 +5,7 @@
       edit_admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
       {size: '400x125', title: Alchemy.t('Edit link')},
       {title: Alchemy.t(:edit)} %>
-    <%= link_to_confirm_dialog render_icon(:destroy),
+    <%= link_to_confirm_dialog render_icon(:minus),
       Alchemy.t('Are you sure?'),
       admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
       {title: Alchemy.t(:remove)} %>

data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb CHANGED

@@ -12,7 +12,7 @@
     </div>
     <div class="right-column">
       <button class="with_icon">
-        <%= render_icon(:create) %>
+        <%= render_icon(:plus, size: 'xs') %>
         <%= Alchemy.t(:add) %>
       </button>
     </div>

data/app/views/alchemy/admin/pages/_form.html.erb CHANGED

@@ -40,7 +40,7 @@
     hint: Alchemy.t('pages.update.comma_seperated') %>
   <% if @page.taggable? %>
-    <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/pages/_locked_page.html.erb CHANGED

@@ -7,7 +7,7 @@
     <% end %>
     <%= form_tag(alchemy.unlock_admin_page_path(locked_page), remote: true) do %>
       <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
-        <%= render_icon('close small') %>
+        <%= render_icon(:times, size: 'xs') %>
       </button>
     <% end %>
   </div>

data/app/views/alchemy/admin/pages/_page.html.erb CHANGED

@@ -4,34 +4,42 @@
       <% unless @sorting %>
         {{#unless root_or_leaf}}
         <%= link_to(
-          '',
           alchemy.fold_admin_page_path(page),
           remote: true,
           method: :post,
-          class: "page_folder {{#if folded}}folded{{else}}collapsed{{/if}}",
+          class: "page_folder",
           title: "{{#if folded}}#{Alchemy.t('Show childpages')}{{else}}#{Alchemy.t('Hide childpages')}{{/if}}",
           id: "fold_button_{{id}}"
-        )
-        %>
+        ) do %>
+          {{#if folded}}
+            <i class="far fa-plus-square fa-fw"></i>
+          {{else}}
+            <i class="far fa-minus-square fa-fw"></i>
+          {{/if}}
+        <% end %>
         {{/unless}}
       <% end %>
       {{#if definition_missing}}
         <%= page_layout_missing_warning %>
       {{else}}
         {{#if permissions.edit_content}}
-          <div class="page icon{{#if locked}} with-hint{{/if}}">
-            {{#if locked}}
+          {{#if locked}}
+            <span class="with-hint">
+              <i class="icon fas fa-edit fa-fw"></i>
               <span class="hint-bubble">
                 {{locked_notice}}
               </span>
-            {{/if}}
-          </div>
+            </span>
+          {{else}}
+            <i class="icon far fa-file fa-lg"></i>
+          {{/if}}
         {{else}}
-          <div class="page icon with-hint not-allowed">
+          <span class="with-hint">
+            <i class="icon fas fa-ban fa-fw"></i>
             <span class="hint-bubble">
               <%= Alchemy.t('Your user role does not allow you to edit this page') %>
             </span>
-          </div>
+          </span>
         {{/if}}
       {{/if}}
     </div>
@@ -40,7 +48,7 @@
         {{#if permissions.info}}
         <div class="button_with_label sitemap_tool">
           <%= link_to_dialog(
-            render_icon(:info),
+            render_icon('info-circle'),
             alchemy.info_admin_page_path(page),
             {
               title: Alchemy.t(:page_infos),
@@ -50,7 +58,7 @@
           <label class="center"><%= Alchemy.t(:page_infos) %></label>
         {{else}}
         <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:info) %>
+          <%= render_icon('info-circle') %>
           <span class="hint-bubble">
             <%= Alchemy.t('Your user role does not allow you to edit this page') %>
           </span>
@@ -59,7 +67,7 @@
         {{#if permissions.configure}}
         <div class="button_with_label sitemap_tool">
           <%= link_to_dialog(
-            render_icon(:configure_page),
+            render_icon(:cog),
             alchemy.configure_admin_page_path(page),
             {
               title: Alchemy.t(:edit_page_properties),
@@ -69,7 +77,7 @@
           <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
         {{else}}
         <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:configure_page) %>
+          <%= render_icon(:cog) %>
           <span class="hint-bubble">
             <%= Alchemy.t('Your user role does not allow you to edit this page') %>
           </span>
@@ -78,7 +86,7 @@
         {{#if permissions.copy}}
         <div class="button_with_label sitemap_tool">
           <%= link_to(
-            render_icon(:copy_page),
+            render_icon(:copy),
             alchemy.insert_admin_clipboard_path(
               remarkable_type: page.class.name.demodulize.underscore.pluralize,
               remarkable_id: '__ID__',
@@ -89,7 +97,7 @@
           <label class="center"><%= Alchemy.t(:copy_page) %></label>
         {{else}}
         <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:copy_page) %>
+          <%= render_icon(:copy) %>
           <span class="hint-bubble">
             <%= Alchemy.t('Your user role does not allow you to edit this page') %>
           </span>
@@ -98,7 +106,7 @@
         {{#if permissions.destroy}}
         <div class="button_with_label sitemap_tool">
           <%= link_to_confirm_dialog(
-            render_icon(:delete_page),
+            render_icon(:minus),
             Alchemy.t(:confirm_to_delete_page),
             url_for(
               controller: 'pages',
@@ -109,7 +117,7 @@
           <label class="center"><%= Alchemy.t(:delete_page) %></label>
         {{else}}
         <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:delete_page) %>
+          <%= render_icon(:minus) %>
           <span class="hint-bubble">
             <%= Alchemy.t('Your user role does not allow you to edit this page') %>
           </span>
@@ -118,7 +126,7 @@
         {{#if permissions.create}}
         <div class="button_with_label sitemap_tool">
           <%= link_to_dialog(
-            render_icon(:add_page),
+            render_icon(:plus),
             alchemy.new_admin_page_path(parent_id: '__ID__').gsub('__ID__', '{{id}}'),
             {
               title: Alchemy.t(:create_page),
@@ -129,7 +137,7 @@
           <label class="left"><%= Alchemy.t(:create_page) %></label>
         {{else}}
         <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:add_page) %>
+          <%= render_icon(:plus) %>
           <span class="hint-bubble">
             <%= Alchemy.t('Your user role does not allow you to edit this page') %>
           </span>
@@ -139,15 +147,15 @@
     </div>
     <div class="page_infos" id="page_<%= page.id %>_infos">
       <span class="page_status with-hint">
-        <span class="icon {{#unless public}}not_{{/unless}}public"></span>
+        <i class="icon fas fa-fw fa-compass {{#unless public}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.public}}</span>
       </span>
       <span class="page_status with-hint">
-        <span class="icon {{#unless visible}}not_{{/unless}}visible"></span>
+        <i class="icon fas fa-fw fa-eye {{#unless visible}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.visible}}</span>
       </span>
       <span class="page_status with-hint">
-        <span class="icon {{#unless restricted}}not_{{/unless}}restricted"></span>
+        <i class="icon fas fa-fw fa-lock {{#unless restricted}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.restricted}}</span>
       </span>
     </div>

data/app/views/alchemy/admin/pages/_page_for_links.html.erb CHANGED

@@ -1,12 +1,12 @@
 <li>
   <div class="sitemap_page ">
     <div class="sitemap_left_images">
-      <%= render_icon(:page) %>
+      <i class="icon far fa-file fa-lg"></i>
     </div>
     <div class="sitemap_right_tools">
       {{#unless redirects_to_external}}
       <div class="button_with_label sitemap_tool">
-        <%= link_to render_icon(:element_window),
+        <%= link_to render_icon('th-list'),
           alchemy.list_admin_elements_path(page_id: '__ID__').gsub('__ID__', '{{id}}'),
           remote: true,
           data: {
@@ -21,13 +21,13 @@
     </div>
     <div class="page_infos">
       <span class="page_status">
-        <span class="icon {{#unless public}}not_{{/unless}}public"></span>
+        <i class="icon fas fa-fw fa-compass {{#unless public}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
       </span>
       <span class="page_status">
-        <span class="icon {{#unless visible}}not_{{/unless}}visible"></span>
+        <i class="icon fas fa-fw fa-eye {{#unless visible}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
       </span>
       <span class="page_status">
-        <span class="icon {{#unless restricted}}not_{{/unless}}restricted"></span>
+        <i class="icon fas fa-fw fa-lock {{#unless restricted}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
       </span>
     </div>
     <div class="sitemap_sitename" id="sitemap_sitename_{{id}}" name="/<%= "#{Alchemy::Language.current.code}/" if multi_language? %>{{urlname}}">

data/app/views/alchemy/admin/pages/_page_infos.html.erb CHANGED

@@ -1,12 +1,12 @@
 <span class="page_status with-hint">
-  <%= render_icon page.public? ? :public : :not_public %>
+  <%= render_icon(:compass, transform: 'shrink-2', class: @page.public? ? nil : 'disabled') %>
   <span class="hint-bubble"><%= page.status_title(:public) %></span>
 </span>
 <span class="page_status with-hint">
-  <%= render_icon page.visible? ? :visible : :not_visible %>
+  <%= render_icon(:eye, transform: 'shrink-2', class: @page.visible? ? nil : 'disabled') %>
   <span class="hint-bubble"><%= page.status_title(:visible) %></span>
 </span>
 <span class="page_status with-hint">
-  <%= render_icon page.restricted? ? :restricted : :not_restricted %>
+  <%= render_icon(:lock, transform: 'shrink-2', class: @page.restricted? ? nil : 'disabled') %>
   <span class="hint-bubble"><%= page.status_title(:restricted) %></span>
 </span>

data/app/views/alchemy/admin/pages/_publication_fields.html.erb CHANGED

@@ -1,5 +1,5 @@
 <% checkbox = check_box_tag :page_public, nil, @page.public?, name: nil,
-  data: {date_format: I18n.t(:datetimepicker, scope: 'time.formats')},
+  data: {date_format: I18n.t(:datetimepicker, scope: 'time.formats.alchemy')},
   disabled: @page.attribute_fixed?(:public_on) %>
 <label class="checkbox">