alchemy_cms 3.2.1 → 3.3.0.rc1

data/app/views/alchemy/admin/tags/new.html.erb

@@ -1,7 +1,7 @@
 <%= alchemy_form_for [:admin, @tag], as: 'tag', url: admin_tags_path do |form| %>
   <%= render_message do %>
-    <p><%= _t(:tags_get_created_if_used_the_first_time) %></p>
+    <p><%= Alchemy.t(:tags_get_created_if_used_the_first_time) %></p>
   <% end %>
   <%= form.input :name, autofocus: true %>
-  <%= form.submit _t(:save) %>
+  <%= form.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -1,4 +1,4 @@
-Alchemy.growl('<%= _t("Cleared trash") %>');
+Alchemy.growl('<%= Alchemy.t("Cleared trash") %>');
 Alchemy.TrashWindow.refresh();
 jQuery('#element_trash_button .icon').removeClass('full');
 Alchemy.pleaseWaitOverlay(false);

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

@@ -1,29 +1,31 @@
 <%- if @elements.blank? -%>
 <div id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %> class="info">
   <%= render_icon('info') %>
-  <%= _t('Your trash is empty') %>
+  <%= Alchemy.t('Your trash is empty') %>
 </div>
 <%- else -%>
 <%= render_message do %>
-  <%= _t('Drag an element over to the element window to restore it') %>
+  <%= Alchemy.t('Drag an element over to the element window to restore it') %>
 <% end %>
 <div id="trash_items">
 <%- @elements.each do |element| -%>
   <%= render partial: 'alchemy/admin/elements/element',
     object: element,
     locals: {
-      draggable: @allowed_elements.any? { |e| e['name'] == element.name }
+      draggable: @allowed_elements.any? do |e|
+        e['name'] == element.name || e.fetch('nestable_elements', []).include?(element.name)
+      end
     } %>
 <%- end -%>
 </div>
 <p>
-  <%= link_to_confirm_dialog _t('clear trash'),
-    _t('Do you really want to clear the trash?'),
+  <%= link_to_confirm_dialog Alchemy.t('clear trash'),
+    Alchemy.t('Do you really want to clear the trash?'),
     alchemy.clear_admin_trash_path(page_id: @page.id),
     class: 'button' %>
 </p>
 <%- end -%>
 <script type="text/javascript" charset="utf-8">
-  Alchemy.DraggableTrashItems(<%= @draggable_trash_items.to_json.html_safe %>);
+  Alchemy.DraggableTrashItems();
   Alchemy.TrashWindow.updateIcon();
 </script>

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

@@ -0,0 +1,39 @@
+<%= form_for [:admin, model_class.new], html: {multipart: true, class: 'upload-button'} do |f| %>
+  <%= f.file_field file_attribute,
+    class: 'fileupload', multiple: true,
+    name: "#{f.object_name}[#{file_attribute}]" %>
+  <%= hidden_field_tag "#{f.object_name}[upload_hash]", Time.current.hash %>
+  <%= f.label file_attribute, data: {alchemy_hotkey: 'alt+n'} do %>
+    <div class="button_with_label">
+      <span class="icon_button"><%= render_icon :upload %></span>
+      <label>
+        <%= local_assigns[:label] ||
+          Alchemy.t(:button_label, scope: [:uploader, model_class.model_name.i18n_key]) %>
+      </label>
+    </div>
+  <% end %>
+<% end %>
+
+<% file_types = (
+  local_assigns.fetch(:file_types, []).presence ||
+    configuration(:uploader)['allowed_filetypes'][model_class.model_name.collection]
+) %>
+
+<script type='text/javascript'>
+  $(function() {
+    var options = {
+      file_types: '<%= file_types.join("|") %>',
+      dropzone: '<%= local_assigns[:dropzone] || '#main_content' %>',
+      complete: function() {
+        var url = '<%= redirect_url.html_safe %>';
+      <% if local_assigns[:in_dialog] %>
+        $.get(url, null, null, 'script');
+      <% else %>
+        Alchemy.pleaseWaitOverlay();
+        window.location.href = url;
+      <% end %>
+      }
+    };
+    Alchemy.Uploader(options);
+  });
+</script>

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

@@ -0,0 +1,13 @@
+<div class="overall-upload">
+  <div class="progress">
+    <span class="progress-status">0%</span>
+    (<span class="uploaded-files-count">0</span>/<span class="total-files-count">0</span>)
+  </div>
+  <div class="upload-progress-container"></div>
+</div>
+<script>
+  Alchemy.uploader_defaults = {
+    file_size_limit: <%= configuration(:uploader)['file_size_limit'] || 100 -%>,
+    file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>
+  }
+</script>

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

@@ -3,17 +3,17 @@
     {
       icon: 'back',
       url: request.referer || "#{Alchemy::MountPoint.get}/admin/dashboard",
-      label: _t(:back),
-      title: _t(:back),
+      label: Alchemy.t(:back),
+      title: Alchemy.t(:back),
       hotkey: 'alt+z',
       dialog: false,
       skip_permission_check: true
     }
-  ]
+  ], search: false
 ) %>
 
 <%= render_message(:error) do %>
-  <h1><%= _t('An error happened') %></h1>
+  <h1><%= Alchemy.t('An error happened') %></h1>
   <h2>
     <%= @error.class %>
     <%= @notice %>

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

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

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

@@ -2,15 +2,14 @@
   <div class="content_editor essence_boolean" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
     <input type="hidden" value="0" name="<%= content.form_field_name %>">
     <%= check_box_tag content.form_field_name, 1,
-      content.ingredient.presence || content_settings_value(
-        content, :default_value,
-        local_assigns.fetch(:options, {})),
+      content.ingredient.presence || content.settings_value(
+        :default_value, local_assigns.fetch(:options, {})
+      ),
       class: local_assigns.fetch(:html_options, {})[:class],
       style: local_assigns.fetch(:html_options, {})[:style] %>
     <label for="<%= content.form_field_id %>" style="display: inline">
       <%= render_content_name(content) %>
     </label>
-    <%= delete_content_link(content) %>
     <%= render_hint_for(content) %>
   </div>
 <% end %>

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

@@ -1,3 +1,3 @@
 <%- cache(content) do -%>
-<%= _t(content.ingredient) -%>
+<%= Alchemy.t(content.ingredient) -%>
 <%- end -%>

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

@@ -1,15 +1,11 @@
 <% cache(content) do %>
 <div class="content_editor essence_date" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= label_and_remove_link(content) %>
+  <%= content_label(content) %>
   <%= alchemy_datepicker(
     content.essence, :date, {
       name: content.form_field_name,
       id: content.form_field_id,
-      value: content_settings_value(
-        content,
-        :default_value,
-        local_assigns.fetch(:options, {})
-      )
+      value: content.settings_value(:default_value, local_assigns.fetch(:options, {}))
     }
   ) %>
   <label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">

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

@@ -1,5 +1,5 @@
 <%- cache(content) do -%>
-<%- date_format = content_settings_value(content, :date_format,
+<%- date_format = content.settings_value(:date_format,
   local_assigns.fetch(:options, {})) -%>
 <%- if content.ingredient.present? -%>
 <%- if date_format == 'rfc822' -%>

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

@@ -3,25 +3,23 @@
 <% dialog_link = link_to_dialog('',
   alchemy.admin_attachments_path(
     content_id: content.id,
-    only: content_settings_value(content, :only,
-      local_assigns.fetch(:options, {})),
-    except: content_settings_value(content, :except,
-      local_assigns.fetch(:options, {})),
+    only: content.settings_value(:only, local_assigns.fetch(:options, {})),
+    except: content.settings_value(:except, local_assigns.fetch(:options, {})),
     options: local_assigns.fetch(:options, {}).to_json
   ),
   {
-    title: _t(:assign_file),
+    title: Alchemy.t(:assign_file),
     size: '780x585',
     padding: false
   },
   {
     class: 'assign_file',
-    title: _t(:assign_file)
+    title: Alchemy.t(:assign_file)
   }
 ) %>
 
 <div class="content_editor essence_file" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= label_and_remove_link(content) %>
+  <%= content_label(content) %>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
     <% if content.ingredient %>
@@ -32,7 +30,7 @@
     </div>
     <div class="file_name">
       <%= content.ingredient.try(:name) ||
-        ("&#x2190;" + _t(:assign_file_from_archive)).html_safe %>
+        ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
     </div>
     <div class="essence_file_tools">
       <%= dialog_link %>
@@ -42,11 +40,11 @@
           options: local_assigns.fetch(:options, {}).to_json
         ),
         {
-          title: _t(:edit_file_properties),
-          size: '400x165'
+          title: Alchemy.t(:edit_file_properties),
+          size: '400x215'
         },
         class: 'edit_file',
-        title: _t(:edit_file_properties) %>
+        title: Alchemy.t(:edit_file_properties) %>
     </div>
     <% if content.ingredient %>
       <%= hidden_field_tag content.form_field_name(:attachment_id),

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

@@ -1,10 +1,16 @@
 <%- cache(content) do -%>
 <%- if attachment = content.ingredient -%>
 <%= link_to(
-  h(attachment.name),
-  alchemy.download_attachment_path(attachment),
-  class: "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
-  title: "#{content.essence.title.blank? ? attachment.file_name : content.essence.title}"
+  content.essence.link_text.presence ||
+    content.settings_value(:link_text, local_assigns.fetch(:options, {})) ||
+    attachment.name,
+  alchemy.download_attachment_path(
+    attachment,
+    name: attachment.urlname,
+    format: attachment.suffix
+  ),
+  class: content.essence.css_class.presence,
+  title: content.essence.title.presence
 ) -%>
 <%- end -%>
-<%- end -%>
+<%- end -%>

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

@@ -1,6 +1,6 @@
 <% cache(content) do %>
 <div class="content_editor essence_html_editor" data-content-id="<%= content.id %>">
-  <%= label_and_remove_link(content) %>
+  <%= content_label(content) %>
   <%= text_area_tag(
     content.form_field_name,
     content.ingredient

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

@@ -1,6 +1,6 @@
 <% cache(content) do %>
 <div class="content_editor essence_link" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= label_and_remove_link(content) %>
+  <%= content_label(content) %>
   <%= text_field_tag '', content.ingredient,
     class: "thin_border text_with_icon disabled",
     name: nil,

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

@@ -4,7 +4,7 @@
   target: content.essence.link_target == "blank" ? "_blank" : nil
 }.merge(local_assigns.fetch(:html_options, {})) -%>
 <%= link_to(content.ingredient, html_options) do -%>
-<%= content_settings_value(content, :text, local_assigns.fetch(:options, {})) ||
+<%= content.settings_value(:text, local_assigns.fetch(:options, {})) ||
   content.ingredient -%>
 <%- end -%>
 <%- end -%>

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

@@ -1,59 +1,54 @@
 <% cache(content) do %>
-<div id="<%= content.dom_id %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>" data-content-id="<%= content.id %>">
-  <% unless options[:grouped] %>
-  <%= label_and_remove_link(content) %>
-  <% end %>
-  <div class="picture_thumbnail">
-    <span class="picture_tool delete">
-      <% if options[:grouped] %>
-      <%= link_to_confirm_dialog(
-        "",
-        _t(:confirm_to_delete_image),
-        alchemy.admin_essence_picture_path(
-          id: content,
-          options: options
-        ),
-        {
-          title: _t(:delete_image)
-        }
-      ) -%>
-      <% else %>
-      <%= link_to(
-        '',
-        '#',
-        onclick: "Alchemy.removePicture('##{content.form_field_id(:picture_id)}'); return false"
-      ) %>
-      <% end %>
-    </span>
-    <%- if content.ingredient -%>
-    <div class="picture_handle" title="<%= _t(:drag_to_sort) if options[:dragable] %>"></div>
-    <%- end -%>
-    <div class="picture_image">
-      <div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
-        <%- if content.ingredient -%>
-        <%= essence_picture_thumbnail(content, options) %>
-        <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
+  <%= content_tag :div, id: content.dom_id, data: {"content-id" => content.id}, class: [
+      "essence_picture_editor",
+      options[:dragable] ? "dragable_picture" : nil,
+      options[:grouped] ? nil : "content_editor"
+    ].compact.join(" ") do %>
+    <% unless options[:grouped] %><%= content_label(content) %><% end %>
+    <div class="picture_thumbnail">
+      <span class="picture_tool delete">
+        <% if options[:grouped] %>
+          <%= link_to_confirm_dialog "", Alchemy.t(:confirm_to_delete_image),
+            alchemy.admin_essence_picture_path(
+              id: content,
+              options: options
+            ), {title: Alchemy.t(:delete_image)} %>
+        <% else %>
+          <%= link_to '', '#',
+            onclick: "return Alchemy.removePicture('##{content.form_field_id(:picture_id)}');" %>
         <% end %>
+      </span>
+      <%- if content.ingredient -%>
+        <div class="picture_handle" title="<%= Alchemy.t(:drag_to_sort) if options[:dragable] %>"></div>
+      <%- end -%>
+      <div class="picture_image">
+        <div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
+          <%- if content.ingredient -%>
+          <%= essence_picture_thumbnail(content, options) %>
+          <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
+          <% end %>
+        </div>
       </div>
-    </div>
-    <%- if content.essence.css_class.present? -%>
-    <div class="essence_picture_css_class">
-      <%= _t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", default: content.essence.css_class.camelcase) %>
-    </div>
-    <%- end -%>
-    <div class="edit_images_bottom">
-      <%= render(
-        partial: 'alchemy/essences/shared/essence_picture_tools',
-        locals: {
+      <%- if content.essence.css_class.present? -%>
+        <div class="essence_picture_css_class">
+          <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}",
+            default: content.essence.css_class.camelcase) %>
+        </div>
+      <%- end -%>
+      <div class="edit_images_bottom">
+        <%= render 'alchemy/essences/shared/essence_picture_tools', {
           content: content,
           options: options
-        }
-      ) %>
+        } %>
+      </div>
     </div>
-  </div>
-  <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
-  <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
-  <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
-  <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
-</div>
+    <%= hidden_field_tag content.form_field_name(:link),
+      content.essence.link %>
+    <%= hidden_field_tag content.form_field_name(:link_title),
+      content.essence.link_title %>
+    <%= hidden_field_tag content.form_field_name(:link_class_name),
+      content.essence.link_class_name %>
+    <%= hidden_field_tag content.form_field_name(:link_target),
+      content.essence.link_target %>
+  <% end %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <% cache(content) do -%>
 <div class="content_editor essence_richtext" id="<%= content.dom_id %>">
-  <%= label_and_remove_link(content) %>
+  <%= content_label(content) %>
   <div class="tinymce_container">
     <%= text_area_tag(
       content.form_field_name,

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

@@ -1,5 +1,5 @@
 <%- cache(content) do -%>
 <%- options = local_assigns.fetch(:options, {}) -%>
-<%- plain_text = !!content_settings_value(content, :plain_text, options) -%>
+<%- plain_text = !!content.settings_value(:plain_text, options) -%>
 <%= raw content.essence.send(plain_text ? :stripped_body : :body) -%>
 <%- end -%>

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

@@ -1,23 +1,33 @@
 <% cache(content) do %>
-  <%- select_values = content_settings_value(content,
-    :select_values, local_assigns.fetch(:options, {})) -%>
+  <% select_values = content.settings_value(:select_values, local_assigns.fetch(:options, {})) %>
+  <% inline = content.settings_value(:display_inline, local_assigns.fetch(:options, {})) %>
 
-  <div class="content_editor essence_select<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-    <%= label_and_remove_link(content) %>
+  <%= content_tag :div,
+    id: content.dom_id,
+    class: [
+      "content_editor",
+      "essence_select",
+      inline ? 'display_inline' : nil
+    ].compact, data: {content_id: content.id} do %>
+    <%= content_label(content) %>
 
     <% if select_values.nil? %>
-      <%= warning(':select_values is nil', "<strong>No select values given.</strong><br>Please provide :<code>select_values</code> either as argument to <code>render_essence_editor</code> helper or as setting on the content definition in <code>elements.yml</code>.".html_safe) %>
+      <%== warning(':select_values is nil',
+      "<strong>No select values given.</strong>
+      <br>Please provide :<code>select_values</code> either as argument to
+      <code>render_essence_editor</code> helper or as setting on the content definition in
+      <code>elements.yml</code>.") %>
     <% else %>
-      <%  if select_values.is_a?(Hash)
-            options_tags = grouped_options_for_select(select_values, content.ingredient)
-          else
-            options_tags = options_for_select(select_values, content.ingredient)
-          end %>
-
+      <%
+      if select_values.is_a?(Hash)
+        options_tags = grouped_options_for_select(select_values, content.ingredient)
+      else
+        options_tags = options_for_select(select_values, content.ingredient)
+      end %>
       <%= select_tag content.form_field_name, options_tags, {
-        class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
+        class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].compact,
         style: html_options[:style]
       } %>
     <% end %>
-  </div>
+  <% end %>
 <% end %>