RubyGems - alchemy_cms - Versions diffs - 3.4.2 → 3.5.0.rc1 - Mend

alchemy_cms 3.4.2 → 3.5.0.rc1

Files changed (247) hide show

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

@@ -1,12 +1,16 @@
 <% if can? *navigate_module(navigation) %>
-  <%= link_to url_for_module(alchemy_module), class: main_navigation_css_classes(navigation) do %>
-    <% if navigation["image"] %>
-    <%= image_tag(navigation["image"]) %>
-    <% elsif navigation["icon"] %>
-    <span class="module icon <%= navigation["icon"] %>"></span>
-    <% else %>
-    <span class="module icon"></span>
+  <%= content_tag :div, class: main_navigation_css_classes(navigation) do %>
+    <%= link_to url_for_module(alchemy_module) do %>
+      <% if navigation["image"] %>
+        <%= image_tag(navigation["image"]) %>
+      <% elsif navigation["icon"] %>
+        <span class="module icon <%= navigation["icon"] %>"></span>
+      <% else %>
+        <span class="module icon"></span>
+      <% end %>
+      <label><%= Alchemy.t(navigation['name']) %></label>
     <% end %>
-    <label><%= truncate Alchemy.t(navigation["name"]), length: 10 %></label>
+    <%= render 'alchemy/admin/partials/sub_navigation',
+      entries: navigation['sub_navigation'] %>
   <% end %>
 <% end %>

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

@@ -2,14 +2,15 @@
     action: 'index',
     options: @options.to_json,
     size: @size
-  ), remote: true, html: {class: 'remote-search-form', id: nil} do |f| %>
+  ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
   <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
   <div class="search_field">
     <%= render_icon('search') %>
     <%= f.search_field resource_handler.search_field_name,
-      id: 'search_input_field',
-      placeholder: Alchemy.t(:search) %>
+      placeholder: Alchemy.t(:search),
+      class: 'search_input_field',
+      id: nil %>
     <%= link_to '', url_for(
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
@@ -20,7 +21,6 @@
       ),
       remote: true,
       class: 'search_field_clear',
-      id: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),
       style: params[:q].blank? ? 'display: none' : 'display: block' %>
   </div>

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

@@ -4,7 +4,7 @@
   <div class="search_field">
     <%= render_icon('search') %>
     <%= f.search_field resource_handler.search_field_name,
-      id: 'search_input_field',
+      class: 'search_input_field',
       placeholder: Alchemy.t(:search) %>
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
       <%= f.hidden_field field %>

data/app/views/alchemy/admin/partials/_sub_navigation.html.erb CHANGED

@@ -1,8 +1,11 @@
-<% entries.each do |entry| %>
-  <% entry.stringify_keys! %>
-  <% if can? *navigate_module(entry) %>
-  <div class="subnavi_tab<%= entry_active?(entry) ? ' active' : nil %>">
-    <%= link_to Alchemy.t(entry['name']), url_for_module_sub_navigation(entry) %>
+<% if entries.present? %>
+  <div class="sub_navigation">
+    <% entries.each do |entry| %>
+      <% if can? *navigate_module(entry) %>
+        <div class="subnavi_tab<%= entry_active?(entry) ? ' active' : nil %>">
+          <%= link_to Alchemy.t(entry['name']), url_for_module_sub_navigation(entry) %>
+        </div>
+      <% end %>
+    <% end %>
   </div>
-  <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div id="image_assign_filter_and_image_sizing">
   <% if can? :create, Alchemy::Picture %>
     <%= render 'alchemy/admin/uploader/button',
-      model_class: Alchemy::Picture,
+      object: Alchemy::Picture.new,
       dropzone: '#assign_image_list',
       file_attribute: 'image_file',
       in_dialog: true,

data/app/views/alchemy/admin/pictures/_picture.html.erb CHANGED

@@ -22,12 +22,7 @@
   </span>
   <% end %>
   <% image = image_tag(
-    alchemy.thumbnail_path(
-      id: picture,
-      size: @size,
-      sh: picture.security_token(size: @size),
-      format: picture.image_file_format
-    ),
+    picture.url(size: preview_size(@size), flatten: true),
     alt: picture.name,
     title: Alchemy.t(:zoom_image)
   ) %>

data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb CHANGED

@@ -2,12 +2,7 @@
   <% action_url = create_or_assign_url(picture_to_assign, @options.to_json) %>
   <%= link_to(
     image_tag(
-      alchemy.thumbnail_path(
-        id: picture_to_assign,
-        size: size,
-        sh: picture_to_assign.security_token(size: size),
-        format: picture_to_assign.image_file_format
-      ),
+      picture_to_assign.url(size: preview_size(size), flatten: true),
       alt: picture_to_assign.name
     ),
     action_url,

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

@@ -2,7 +2,7 @@
   <div class="toolbar_buttons">
     <% if can? :create, Alchemy::Picture %>
       <%= render 'alchemy/admin/uploader/button',
-        model_class: Alchemy::Picture,
+        object: Alchemy::Picture.new,
         file_attribute: 'image_file',
         redirect_url: alchemy.admin_pictures_path(
           size: params[:size],

data/app/views/alchemy/admin/pictures/show.html.erb CHANGED

@@ -1,10 +1,5 @@
 <div class="zoomed-picture-background">
-  <%= image_tag alchemy.zoom_picture_path(
-    id: @picture.id,
-    name: @picture.urlname,
-    format: @picture.image_file_format,
-    sh: @picture.security_token
-  ) %>
+  <%= image_tag @picture.url(format: @picture.image_file_format) %>
 </div>
 <div class="picture-overlay-navigation">

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

@@ -1,6 +1,6 @@
-<%= form_for [:admin, model_class.new], html: {multipart: true, class: 'upload-button'} do |f| %>
+<%= form_for [:admin, object], html: {multipart: true, class: 'upload-button'} do |f| %>
   <%= f.file_field file_attribute,
-    class: 'fileupload', multiple: true,
+    class: 'fileupload fileupload--field', 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 %>
@@ -8,14 +8,14 @@
       <span class="icon_button"><%= render_icon :upload %></span>
       <label>
         <%= local_assigns[:label] ||
-          Alchemy.t(:button_label, scope: [:uploader, model_class.model_name.i18n_key]) %>
+          Alchemy.t(:button_label, scope: [:uploader, object.class.model_name.i18n_key]) %>
       </label>
     </div>
   <% end %>
 <% end %>
 <% file_types = local_assigns[:file_types].presence ||
-  configuration(:uploader)['allowed_filetypes'][model_class.model_name.collection] || ['*'] %>
+  configuration(:uploader)['allowed_filetypes'][object.class.model_name.collection] || ['*'] %>
 <script type='text/javascript'>
   $(function() {

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

@@ -12,15 +12,29 @@
   ], search: false
 ) %>
+<% content_for(:alchemy_body_class) { 'error' } %>
 <%= render_message(:error) do %>
   <h1><%= Alchemy.t('An error happened') %></h1>
   <h2>
     <%= @error.class %>
     <%= @notice %>
   </h2>
-  <p>
+  <p class="hidden">
   <% @trace.each do |line| %>
     <%= line %><br>
   <% end %>
   </p>
+  <a href="#" class="error_details--toggle">
+    <%= Alchemy.t('Show error details') %>
+  </a>
 <% end %>
+<script>
+  $(function(){
+    $('.error_details--toggle').click(function(){
+      $('.error.message p').toggleClass('hidden');
+      return false;
+    });
+  });
+</script>

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

@@ -1,15 +1,13 @@
-<% cache(content) do %>
-  <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(
-        :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>
-    <%= render_hint_for(content) %>
-  </div>
-<% end %>
+<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(
+      :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>
+  <%= render_hint_for(content) %>
+</div>

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

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

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

@@ -1,4 +1,3 @@
-<% cache(content) do %>
 <div class="content_editor essence_date" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
   <%= content_label(content) %>
   <%= alchemy_datepicker(
@@ -12,4 +11,3 @@
     <span class="ui-icon ui-icon-calendar"></span>
   </label>
 </div>
-<% end %>

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

@@ -1,4 +1,3 @@
-<%- cache(content) do -%>
 <%- date_format = content.settings_value(:date_format,
   local_assigns.fetch(:options, {})) -%>
 <%- if content.ingredient.present? -%>
@@ -7,5 +6,4 @@
 <%- else -%>
 <%= l(content.ingredient, format: date_format) %>
 <%- end -%>
-<%- end -%>
 <%- end -%>

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

@@ -1,5 +1,3 @@
-<% cache(content) do %>
 <% dialog_link = link_to_dialog('',
   alchemy.admin_attachments_path(
     content_id: content.id,
@@ -46,10 +44,7 @@
         class: 'edit_file',
         title: Alchemy.t(:edit_file_properties) %>
     </div>
-    <% if content.ingredient %>
-      <%= hidden_field_tag content.form_field_name(:attachment_id),
-        content.ingredient.id %>
-    <% end %>
+    <%= hidden_field_tag content.form_field_name(:attachment_id),
+      content.ingredient && content.ingredient.id %>
   </div>
 </div>
-<% end %>

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

@@ -1,4 +1,3 @@
-<%- cache(content) do -%>
 <%- if attachment = content.ingredient -%>
 <%- html_options = local_assigns.fetch(:html_options, {}) -%>
 <%= link_to(
@@ -15,5 +14,4 @@
     title: content.essence.title.presence
   }.merge(html_options)
 ) -%>
-<%- end -%>
-<%- end -%>
+<%- end -%>

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

@@ -1,4 +1,3 @@
-<% cache(content) do %>
 <div class="content_editor essence_html_editor" data-content-id="<%= content.id %>">
   <%= content_label(content) %>
   <%= text_area_tag(
@@ -6,4 +5,3 @@
     content.ingredient
   ) %>
 </div>
-<% end %>

data/app/views/alchemy/essences/_essence_html_view.html.erb CHANGED

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

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

@@ -1,4 +1,3 @@
-<% cache(content) do %>
 <div class="content_editor essence_link" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
   <%= content_label(content) %>
   <%= text_field_tag '', content.ingredient,
@@ -22,4 +21,3 @@
     $('#<%= content.dom_id %> input.text_with_icon').val($(this).val());
   });
 </script>
-<% end %>

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

@@ -1,4 +1,3 @@
-<%- cache(content) do -%>
 <%- if content.ingredient.present? -%>
 <%- html_options = {
   target: content.essence.link_target == "blank" ? "_blank" : nil
@@ -7,5 +6,4 @@
 <%= content.settings_value(:text, local_assigns.fetch(:options, {})) ||
   content.ingredient -%>
 <%- end -%>
-<%- end -%>
 <%- end -%>

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

@@ -1,54 +1,52 @@
-<% cache(content) do %>
-  <%= 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)}');" %>
+<%= 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 %>
-      </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>
-      <%- 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>
+    <%- 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>
-    <%= 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 %>
+  </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 %>

data/app/views/alchemy/essences/_essence_picture_view.html.erb CHANGED

@@ -1,7 +1,5 @@
-<% cache(content) do %>
 <%= Alchemy::EssencePictureView.new(
   content,
   local_assigns[:options],
   local_assigns[:html_options]
-).render %>
-<% end %>
+).render %>

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

@@ -1,4 +1,3 @@
-<% cache(content) do -%>
 <div class="content_editor essence_richtext" id="<%= content.dom_id %>">
   <%= content_label(content) %>
   <div class="tinymce_container">
@@ -10,4 +9,3 @@
     ) %>
   </div>
 </div>
-<% end -%>