RubyGems - alchemy_cms - Versions diffs - 2.9.1 → 3.0.0.rc5 - Mend

alchemy_cms 2.9.1 → 3.0.0.rc5

Files changed (695) hide show

data/app/views/alchemy/base/update.js.erb CHANGED

@@ -1,5 +1,5 @@
-Alchemy.closeCurrentWindow();
-<%- unless flash[:notice].blank? -%>
-  Alchemy.growl('<%= flash[:notice] -%>');
-<%- end -%>
+Alchemy.closeCurrentDialog();
+<% unless flash[:notice].blank? -%>
+Alchemy.growl('<%= j flash[:notice] %>');
+<% end -%>
 Alchemy.reloadPreview();

data/app/views/alchemy/breadcrumb/_spacer.html.erb CHANGED

	@@ -1 +1 @@
1	- <%= options[:~~seperator~~].html_safe %>
1	+ <%= options[:separator].html_safe %>

data/app/views/alchemy/elements/show.js.erb CHANGED

@@ -1,5 +1 @@
-(function($) {
-  $('#<%= @container_id -%>').html('<%= escape_javascript(
-    render @element, :element => @element, :options => @options
-  ) -%>');
-})(jQuery);
+$('#<%= @container_id %>').html('<%= j render(@element, element: @element, options: @options) %>');

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

@@ -1,5 +1,5 @@
 <% cache(content) do %>
-  <div class="content_editor essence_boolean" id="<%= content_dom_id(content) %>">
+  <div class="content_editor essence_boolean" id="<%= content.dom_id %>">
     <input type="hidden" value="0" name="<%= content.form_field_name %>" />
     <%= check_box_tag(content.form_field_name, 1,
       !content.ingredient.nil? ? content.ingredient : options[:default_value],

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

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

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

@@ -1,9 +1,10 @@
-<div class="content_editor essence_date" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_date" id="<%= content.dom_id %>">
   <%= label_and_remove_link(content) %>
   <%= alchemy_datepicker(
     content.essence, :date, {
-      :name => content.form_field_name,
-      :id => content.form_field_id
+      name: content.form_field_name,
+      id: content.form_field_id,
+      value: options[:default_value]
     }
   ) %>
   <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 CHANGED

@@ -1,5 +1,9 @@
-<%- if content.essence.date.present? -%>
-<%= l(content.essence.date, :format => (options[:date_format])) -%>
-<%- elsif options[:date_format] == :rfc822 -%>
-<%= content.essence.date.to_s(:rfc822) -%>
-<%- end -%>
+<% cache(content) do %>
+<% if content.ingredient.present? %>
+<% if options[:date_format].to_s == 'rfc822' %>
+<%= content.ingredient.to_s(:rfc822) %>
+<% else %>
+<%= l(content.ingredient, format: options[:date_format]) %>
+<% end %>
+<% end %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<div class="content_editor essence_file" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_file" id="<%= content.dom_id %>">
   <label style="display: inline">
     <%= render_content_name(content) %>
     <%= delete_content_link(content) %>
@@ -6,21 +6,21 @@
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
     <% if content.ingredient.nil? %>
-      <%= link_to_overlay_window("",
+      <%= link_to_dialog '',
         alchemy.admin_attachments_path(
-          :content_id => content.id,
-          :only => options[:file_assign_show_only],
-          :except => options[:file_assign_do_not_show],
-          :options => options
+          content_id: content.id,
+          only: options[:file_assign_show_only],
+          except: options[:file_assign_do_not_show],
+          options: options.to_json
         ),
         {
-          :title => _t(:assign_file),
-          :size => '780x580',
-          :close_on_escape => false
+          title: _t(:assign_file),
+          size: '780x585',
+          padding: false
         },
-        :class => 'assign_file',
-        :title => _t(:assign_file)
-      ) %>
+        class: 'assign_file',
+        title: _t(:assign_file)
+      %>
     <% else %>
       <%= render_icon(content.ingredient.icon_css_class) %>
     <% end %>
@@ -31,34 +31,35 @@
     <% unless content.ingredient.nil? %>
     <%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
     <div class="essence_file_tools">
-      <%= link_to_overlay_window("",
+      <%= link_to_dialog '',
         alchemy.admin_attachments_path(
-          :content_id => content.id,
-          :only => options[:file_assign_show_only],
-          :except => options[:file_assign_do_not_show],
-          :options => options
+          content_id: content.id,
+          only: options[:file_assign_show_only],
+          except: options[:file_assign_do_not_show],
+          options: options.to_json
         ),
         {
-          :title => _t(:assign_file),
-          :size => '780x580',
-          :close_on_escape => false
+          title: _t(:assign_file),
+          size: '780x585',
+          padding: false
         },
-        :class => 'assign_file',
-        :title => _t(:assign_file)
-      ) %>
-      <%= link_to_overlay_window("",
+        class: 'assign_file',
+        title: _t(:assign_file)
+      %>
+      <%= link_to_dialog '',
         url_for(
-          :controller => 'essence_files',
-          :action => 'edit',
-          :id => content
+          controller: 'essence_files',
+          action: 'edit',
+          options: options.to_json,
+          id: content
         ),
         {
-          :title => _t(:edit_file_properties),
-          :size => '400x150'
+          title: _t(:edit_file_properties),
+          size: '400x165'
         },
-        :class => 'edit_file',
-        :title => _t(:edit_file_properties)
-      ) %>
+        class: 'edit_file',
+        title: _t(:edit_file_properties)
+      %>
     </div>
     <% end %>
   </div>

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

@@ -1,8 +1,10 @@
-<% if attachment = content.essence.attachment %>
-  <%= link_to(
-    h(attachment.name),
-    download_alchemy_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}"
-  ) %>
+<% 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}"
+) %>
+<% end %>
 <% end %>

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

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

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

@@ -1,5 +1,5 @@
 <% cache(content) do %>
-<div class="content_editor essence_link" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_link" id="<%= content.dom_id %>">
   <label><%= render_content_name(content) %></label>
   <%= text_field_tag(
     '',
@@ -17,7 +17,7 @@
 </div>
 <script type="text/javascript" charset="utf-8">
   $('#<%= content.form_field_id(:link) %>').on('change', function() {
-    $('#<%= content_dom_id(content) %> input.text_with_icon').val($(this).val());
+    $('#<%= content.dom_id %> input.text_with_icon').val($(this).val());
   });
 </script>
 <% end %>

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

@@ -1,3 +1,7 @@
+<% cache(content) do %>
+<% if content.ingredient %>
 <%- options[:text] ||= content.ingredient %>
 <%- html_options = { target: content.essence.link_target == "blank" ? "_blank" : nil }.merge(html_options) %>
-<%= link_to options[:text], content.ingredient, html_options %>
+<%= link_to options[:text], content.ingredient, html_options -%>
+<% end %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<div id="<%= content_dom_id(content) %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>">
+<div id="<%= content.dom_id %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>">
   <% unless options[:grouped] %>
   <label>
     <% if content.has_hint? %>
@@ -10,22 +10,22 @@
   <div class="picture_thumbnail">
     <span class="picture_tool delete">
       <% if options[:grouped] %>
-      <%= link_to_confirmation_window(
+      <%= link_to_confirm_dialog(
         "",
         _t(:confirm_to_delete_image),
         alchemy.admin_essence_picture_path(
-          :id => content,
-          :options => options
+          id: content,
+          options: options
         ),
         {
-          :title => _t(:delete_image)
+          title: _t(:delete_image)
         }
       ) -%>
       <% else %>
       <%= link_to(
         '',
         '#',
-        :onclick => "Alchemy.removePicture('##{content.form_field_id(:picture_id)}');"
+        onclick: "Alchemy.removePicture('##{content.form_field_id(:picture_id)}'); return false"
       ) %>
       <% end %>
     </span>
@@ -42,15 +42,15 @@
     </div>
     <%- unless options[:css_class].blank? || content.essence.css_class.blank? -%>
     <div class="essence_picture_css_class">
-      <%= _t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", :default => content.essence.css_class.camelcase) %>
+      <%= _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 => {
-          :content => content,
-          :options => options
+        partial: 'alchemy/essences/shared/essence_picture_tools',
+        locals: {
+          content: content,
+          options: options
         }
       ) %>
     </div>

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

@@ -1 +1,3 @@
-<%= render_essence_picture_view(content, options, html_options) %>
+<% cache(content) do %>
+<%= render_essence_picture_view(content, options, html_options) %>
+<% end %>

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

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

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

@@ -1,5 +1,4 @@
-<%- if options[:shorten_to].blank? -%>
+<% cache(content) do %>
+<% options = local_assigns.fetch(:options, {}) %>
 <%= raw content.essence.send(options[:plain_text] ? :stripped_body : :body) %>
-<%- else -%>
-<%= raw content.essence.send(options[:plain_text] ? :stripped_body : :body).split(" ").first(options[:shorten_to]).join(" ") + (options[:shorten_suffix] || '…') %>
-<%- end -%>
+<% end %>

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

@@ -1,5 +1,5 @@
 <% cache(content) do %>
-  <div class="content_editor essence_select<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
+  <div class="content_editor essence_select<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
   <%= label_and_remove_link(content) %>

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

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

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

@@ -1,32 +1,18 @@
 <% cache(content) do %>
-  <div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
-    <% if content.settings[:display_as].present? %>
-      <%= warning 'The display_as setting is deprecated! Please run rake alchemy:upgrade', 'You are using the display_as setting in your elements.yml. Please run rake alchemy:upgrade' %>
-    <% else %>
-      <%= label_and_remove_link(content) %>
-      <%= text_field_tag(
-        content.form_field_name,
-        content.ingredient,
-        :class => ["thin_border #{content.settings[:linkable] ? ' text_with_icon' : ''}", html_options[:class]].join(' '),
-        :style => html_options[:style]
-      ) %>
-      <% if content.settings[:linkable] %>
-        <%= 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 %>
-        <%= render 'alchemy/essences/shared/linkable_essence_tools', :content => content %>
-      <% end %>
+  <div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
+    <%= label_and_remove_link(content) %>
+    <%= text_field_tag(
+      content.form_field_name,
+      content.ingredient,
+      class: ["thin_border #{content.settings[:linkable] ? ' text_with_icon' : ''}", html_options[:class]].join(' '),
+      style: html_options[:style]
+    ) %>
+    <% if content.settings[:linkable] %>
+      <%= 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 %>
+      <%= render 'alchemy/essences/shared/linkable_essence_tools', content: content %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,3 +1,6 @@
+<% cache(content) do %>
+<% options = local_assigns.fetch(:options, {}) %>
+<% html_options = local_assigns.fetch(:html_options, {}) %>
 <%- if content.essence.link.blank? || options[:disable_link] -%>
 <%= content.ingredient -%>
 <%- else -%>
@@ -11,3 +14,4 @@
   }.merge(html_options)
 ) %>
 <%- end -%>
+<% end %>

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

@@ -1,12 +1,12 @@
 <% if options[:crop] && content.ingredient %>
-<%= link_to_overlay_window(
+<%= link_to_dialog(
   render_icon('crop'),
   alchemy.crop_admin_essence_picture_path(content.essence, options: options.to_json),
   {
-    size: "1000x653",
+    size: "1000x615",
     title: _t('Edit Picturemask'),
     image_loader: false,
-    modal: false
+    padding: false
   },
   {
     title: _t('Edit Picturemask')
@@ -16,46 +16,46 @@
 <a href="#" class="disabled"><%= render_icon('crop') %></a>
 <%- end -%>
-<%= link_to_overlay_window(
+<%= link_to_dialog(
   render_icon('swap_picture'),
   alchemy.admin_pictures_path(
-    :element_id => content.element,
-    :content_id => content.id,
-    :swap => true,
-    :options => options.to_json
+    element_id: content.element,
+    content_id: content.id,
+    swap: true,
+    options: options.to_json
   ),
   {
-    :title => (content.ingredient ? _t(:swap_image) : _t(:insert_image)),
-    :size => '780x580',
-    :close_on_escape => false
+    title: (content.ingredient ? _t(:swap_image) : _t(:insert_image)),
+    size: '780x585',
+    padding: false
   },
-  :title => (content.ingredient ? _t(:swap_image) : _t(:insert_image))
+  title: (content.ingredient ? _t(:swap_image) : _t(:insert_image))
 ) %>
-<%= link_to(render_icon(:link), '#', {
-  :onclick => "Alchemy.LinkOverlay.open(this)",
-  :class => content.linked? ? 'linked' : nil,
-  :title => _t(:link_image),
-  :data => {'content-id' => content.id},
-  :id => "edit_link_#{content.id}"
+<%= link_to(render_icon(:link), '', {
+  onclick: 'd = new Alchemy.LinkDialog(this); d.open(); return false;',
+  class: content.linked? ? 'linked' : nil,
+  title: _t(:link_image),
+  'data-content-id' => content.id,
+  id: "edit_link_#{content.id}"
 }) %>
-<%= link_to(render_icon('unlink'), '#', {
-  :onclick => "Alchemy.LinkOverlay.removeLink(this, #{content.id})",
-  :class => content.linked? ? 'linked' : 'disabled',
-  :title => _t(:unlink)
+<%= link_to(render_icon('unlink'), '', {
+  onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
+  class: content.linked? ? 'linked' : 'disabled',
+  title: _t(:unlink)
 }) %>
-<%= link_to_overlay_window(
+<%= link_to_dialog(
   render_icon('edit'),
   alchemy.edit_admin_essence_picture_path(
-    :id => content.essence.id,
-    :content_id => content.id,
-    :options => options.to_json
+    id: content.essence.id,
+    content_id: content.id,
+    options: options.to_json
   ),
   {
-    :title => _t(:edit_image_properties),
-    :size => (options[:caption_as_textarea] ? (options[:manual_image_size] ? '380x230' : '380x210') : (options[:manual_image_size] ? '380x190' : '380x180'))
+    title: _t(:edit_image_properties),
+    size: (options[:caption_as_textarea] ? (options[:sizes] ? '380x320' : '380x300') : (options[:sizes] ? '380x290' : '380x255'))
   },
-  :title => _t(:edit_image_properties)
+  title: _t(:edit_image_properties)
 ) %>