alchemy_cms 2.6.3 → 2.7.0

data/app/views/alchemy/admin/pages/fold.js.erb

@@ -1,4 +1,5 @@
 (function($) {
   $('#page_<%= @page.id -%>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
   Alchemy.overlayObserver('#page_<%= @page.id -%>');
+  Alchemy.Spinner.watch('#page_<%= @page.id -%>');
 })(jQuery);

data/app/views/alchemy/admin/pages/info.html.erb

@@ -0,0 +1,32 @@
+<div class="with_padding">
+  <table>
+    <tr>
+      <td class="label"><label><%= _t(:page_type) %></label></td>
+      <td class="value"><p><%= @page.layout_display_name %></p></td>
+    </tr>
+    <tr>
+      <td class="label"><label><%= _t(:page_status) %></label></td>
+      <td class="value">
+        <p><%= combined_page_status(@page) %></p>
+      </td>
+    </tr>
+    <tr>
+      <td class="label"><label><%= _t(:page_was_created) %></label></td>
+      <td class="value">
+        <p><%= _t(:from_at) % {by: @page.creator_name, at: l(@page.created_at, format: :page_status)} %></p>
+      </td>
+    </tr>
+    <tr>
+      <td class="label"><label><%= _t(:page_was_updated) %></label></td>
+      <td class="value">
+        <p><%= _t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :page_status)} %></p>
+      </td>
+    </tr>
+    <%- if @page.locked? -%>
+      <tr>
+        <td class="label"><label><%= _t(:currently_edited_by) %></label></td>
+        <td class="value"><p><%= @page.locker_name %></p></td>
+      </tr>
+    <% end %>
+  </table>
+</div>

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

@@ -1,14 +1,12 @@
-<%- permitted_to? *navigate_module(navigation) do -%>
-
-<%= 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>
-  <%- end -%>
-  <label><%= truncate _t(navigation["name"]), :length => 10 -%></label>
+<% if permitted_to? *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>
+    <% end %>
+    <label><%= truncate _t(navigation["name"]), length: 10 %></label>
+  <% end %>
 <% end %>
-
-<%- end -%>

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

@@ -1,38 +1,38 @@
 <%= form_tag(
   url_for({
-    :action => 'index',
-    :options => @options,
-    :size => @size
+    action: 'index',
+    options: @options.to_json,
+    size: @size
   }),
-  :remote => true,
-  :method => :get
+  remote: true,
+  method: 'get'
 ) do %>
   <%= 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') %>
     <%= text_field_tag(
-      "query",
+      :query,
       params['query'],
-      :class => 'thin_border',
-      :id => "search_input_field"
+      class: 'thin_border',
+      id: "search_input_field"
     ) %>
     <%= link_to(
       "",
       url_for({
-        :action => 'index',
-        :element_id => @element.blank? ? "" : @element.id,
-        :content_id => @content.blank? ? "" : @content.id,
-        :options => @options,
-        :size => @size,
-        :overlay => true
+        action: 'index',
+        element_id: @element.blank? ? "" : @element.id,
+        content_id: @content.blank? ? "" : @content.id,
+        options: @options.to_json,
+        size: @size,
+        overlay: true
       }),
-      :remote => true,
-      :class => "search_field_clear",
-      :id => "search_field_clear",
-      :title => _t(:click_to_show_all),
-      :style => (params[:query].nil? ? "display: none" : "display: block")
+      remote: true,
+      class: 'search_field_clear',
+      id: 'search_field_clear',
+      title: _t(:click_to_show_all),
+      style: (params[:query].nil? ? 'display: none' : 'display: block')
     ) %>
   </div>
-  <%= submit_tag _t(:search), :name => nil, :class => 'button' %>
+  <%= submit_tag _t(:search), name: nil, class: 'button' %>
 <% end %>

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

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

data/app/views/alchemy/admin/partials/_toolbar_button.html.erb

@@ -0,0 +1,25 @@
+<div class="button_with_label<%= options[:active] ? ' active' : '' %>">
+<% if options[:overlay] %>
+  <%= link_to_overlay_window(
+    render_icon(options[:icon]),
+    options[:url],
+    options[:overlay_options],
+    {
+      class: 'icon_button',
+      title: options[:title],
+      'data-alchemy-hotkey' => options[:hotkey]
+    }.merge(options[:link_options])
+  ) %>
+<% else %>
+  <%= link_to(
+    options[:url], {
+      class: "icon_button#{options[:loading_indicator] ? ' please_wait' : ''}",
+        title: options[:title],
+        'data-alchemy-hotkey' => options[:hotkey]
+      }.merge(options[:link_options])
+  ) do %>
+    <%= render_icon(options[:icon]) %>
+  <% end %>
+<% end %>
+  <label><%= options[:label] %></label>
+</div>

data/app/views/alchemy/admin/partials/_upload_form.html.erb

@@ -1,22 +1,22 @@
 <div class="info">
   <%= render_icon('info') %>
-  <p><%= _t('explain_upload.intro', :name => item_type) %>:</p>
+  <p><%= _t('explain_upload.intro', name: item_type) %>:</p>
   <ol>
-    <li><%= _t('explain_upload.step1', :name => item_type) %></li>
-    <li><%= _t('explain_upload.step2', :name => item_type) %>*</li>
+    <li><%= _t('explain_upload.step1', name: item_type) %></li>
+    <li><%= _t('explain_upload.step2', name: item_type) %>*</li>
     <li id="explain_step3"><%= _t('explain_upload.step3') %></li>
-    <li id="explain_drag_n_drop"><%= _t('explain_upload.dragndrop', :name => item_type) %></li>
+    <li id="explain_drag_n_drop"><%= _t('explain_upload.dragndrop', name: item_type) %></li>
   </ol>
   <%- unless file_types.first == '*' -%>
-    <p><%= _t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
+    <p><%= _t('You may upload files with following extensions', file_types_description: file_types_description, file_types: file_types.to_sentence) %>.</p>
   <%- end -%>
-  <small>*<%= _t('explain_upload.footnote', :name => item_type) %></small>
+  <small>*<%= _t('explain_upload.footnote', name: item_type) %></small>
 </div>
 
 <%= render 'alchemy/admin/partials/flash_upload' %>
 
 <div class="browse">
-  <%= label_tag :multiple, _t(:browse), :style => 'display:none;' %>
+  <%= label_tag :multiple, _t(:browse), style: 'display:none;' %>
   <input name="Filedata" id="multiple" type="file" multiple value="<%= _t(:browse) %>">
   <a href="#" class="button no-spinner" id="cancelHTML5Queue" style="display: none">
     <%= _t("swfupload.cancel_uploads") %>
@@ -33,12 +33,12 @@
 <div id="uploadProgressContainer"></div>
 
 <%- post_params = {
-  :while_assigning => @while_assigning ? "true" : "false",
-  :content_id => @content.blank? ? nil : @content.id,
-  :element_id => @element.blank? ? nil : @element.id,
-  :size => @size,
-  :upload_hash => Time.now.hash,
-  :options => @options.to_param
+  while_assigning: @while_assigning ? "true" : "false",
+  content_id: @content.blank? ? nil : @content.id,
+  element_id: @element.blank? ? nil : @element.id,
+  size: @size,
+  upload_hash: Time.now.hash,
+  options: @options.to_json
 }.delete_if { |k, v| v.nil? }.to_json -%>
 
 <script type='text/javascript'>
@@ -55,11 +55,11 @@
       onQueueComplete: function() {
         // While assigning picture in page edit mode
         <% if @while_assigning && model_name == 'picture' %>
-        var url = '<%= alchemy.admin_pictures_path(:size => params[:size], :filter => :last_upload, :element_id => @element.id, :content_id => @content ? @content.id : nil, :options => @options).html_safe %>';
+        var url = '<%= alchemy.admin_pictures_path(size: params[:size], filter: "last_upload", element_id: @element.id, content_id: @content ? @content.id : nil, options: @options.to_json).html_safe %>';
         $.get(url, null, null, 'script');
         // While uploading picture in library
         <% elsif controller.class.name == 'Alchemy::Admin::PicturesController' %>
-        var url = '<%= alchemy.admin_pictures_path(:size => params[:size], :filter => :last_upload).html_safe %>';
+        var url = '<%= alchemy.admin_pictures_path(size: params[:size], filter: "last_upload").html_safe %>';
         Alchemy.pleaseWaitOverlay();
         window.location = url;
         <% end %>

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

@@ -3,70 +3,70 @@
     <%= link_to(
       render_icon('zoom-out'),
       alchemy.admin_pictures_path({
-        :size => "small",
-        :content_id => @content,
-        :element_id => @element,
-        :swap => @swap,
-        :query => params[:query],
-        :options => @options
+        size: "small",
+        content_id: @content,
+        element_id: @element,
+        swap: @swap,
+        query: params[:query],
+        options: @options.to_json
       }),
-      :remote => true,
-      :title => _t(:small_thumbnails),
-      :class => "icon_button"
+      remote: true,
+      title: _t(:small_thumbnails),
+      class: "icon_button"
     ) %>
     <%= link_to(
       render_icon('zoom-equal'),
       alchemy.admin_pictures_path({
-        :size => "medium",
-        :content_id => @content,
-        :element_id => @element,
-        :swap => @swap,
-        :query => params[:query],
-        :options => @options
+        size: "medium",
+        content_id: @content,
+        element_id: @element,
+        swap: @swap,
+        query: params[:query],
+        options: @options.to_json
       }),
-      :remote => true,
-      :title => _t(:medium_thumbnails),
-      :class => "icon_button"
+      remote: true,
+      title: _t(:medium_thumbnails),
+      class: "icon_button"
     ) %>
     <%= link_to(
       render_icon('zoom-in'),
       alchemy.admin_pictures_path({
-        :size => "large",
-        :content_id => @content,
-        :element_id => @element,
-        :swap => @swap,
-        :query => params[:query],
-        :options => @options
+        size: "large",
+        content_id: @content,
+        element_id: @element,
+        swap: @swap,
+        query: params[:query],
+        options: @options.to_json
       }),
-      :remote => true,
-      :title => _t(:big_thumbnails),
-      :class => "icon_button"
+      remote: true,
+      title: _t(:big_thumbnails),
+      class: "icon_button"
     ) %>
     <label><%= _t('Image size') %></label>
-    <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+    <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
   </div>
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
     <%= link_to_overlay_window(
       render_icon('upload'),
       alchemy.new_admin_picture_path(
-        :element_id => @element.blank? ? nil : @element.id,
-        :content_id => @content.blank? ? nil : @content.id,
-        :swap => @swap,
-        :page => params[:page],
-        :size => @size,
-        :options => @options
+        element_id: @element.blank? ? nil : @element.id,
+        content_id: @content.blank? ? nil : @content.id,
+        swap: @swap,
+        page: params[:page],
+        size: @size,
+        options: @options.to_json
       ),
       {
-        :size => "540x550",
-        :title => _t(:upload_image)
+        size: "540x550",
+        title: _t(:upload_image)
       },
       {
-        :class => 'icon_button',
-        :title => _t(:upload_image)
+        class: 'icon_button',
+        title: _t(:upload_image)
       }
     ) %>
     <label><%= _t(:upload_image) %></label>
   </div>
-  <%= render :partial => 'alchemy/admin/partials/remote_search_form' %>
+  <%= render partial: 'alchemy/admin/partials/remote_search_form' %>
 </div>

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

@@ -3,24 +3,24 @@
   <% action_url = params[:image_assign_url] + "?picture_id=#{picture_to_assign.id}" %>
   <% action_method = params[:image_assign_method] %>
 <% else %>
-  <% action_url = create_or_assign_url(picture_to_assign, @options) %>
+  <% action_url = create_or_assign_url(picture_to_assign, @options.to_json) %>
   <% action_method = @content.blank? ? 'post' : 'put' %>
 <% end %>
   <%= link_to(
     image_tag(
       alchemy.thumbnail_path(
-        :id => picture_to_assign,
-        :size => size,
-        :sh => picture_to_assign.security_token(:size => size)
+        id: picture_to_assign,
+        size: size,
+        sh: picture_to_assign.security_token(size: size)
       ),
-      :alt => picture_to_assign.name
+      alt: picture_to_assign.name
     ),
     action_url,
-    :remote => true,
-    :onclick => '$(self).attr("href", "#").off("click")',
-    :method => action_method,
-    :title => _t(:assign_image),
-    :class => 'thumbnail_background'
+    remote: true,
+    onclick: '$(self).attr("href", "#").off("click")',
+    method: action_method,
+    title: _t(:assign_image),
+    class: 'thumbnail_background'
   ) %>
   <div class="picture_name" title="<%= picture_to_assign.name %>">
     <%= picture_to_assign.name.empty? ? "&nbsp;" : picture_to_assign.name %>

data/app/views/alchemy/admin/pictures/_tag_list.html.erb

@@ -3,22 +3,7 @@
   <h2><%= _t("Filter by tag") %></h2>
   <%= js_filter_field '#tag_list li' %>
   <ul>
-    <% Alchemy::Picture.tag_counts.each do |t| %>
-      <% picture_tags = filtered_by_tag?(t) ? tag_filter(remove: t) : tag_filter(add: t) %>
-      <%= content_tag 'li', name: t.name, class: p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
-        <%= link_to(
-          "#{t.name} (#{t.count})",
-          url_for(
-            p.delete_if { |k, v| k == "page" }.merge(
-              action: 'index',
-              tagged_with: picture_tags
-            )
-          ),
-          remote: request.xhr?,
-          class: 'please_wait'
-        ) %>
-      <% end %>
-    <% end %>
+    <%= render_tag_list('Alchemy::Picture', p) %>
   </ul>
   <% if p[:tagged_with].present? %>
     <%= link_to(

data/app/views/alchemy/admin/resources/destroy.js.erb

@@ -1 +1 @@
-window.location.replace('<%= resource_url_proxy.url_for({:action => :index}) %>');
+window.location.href = "<%= resource_url_proxy.url_for(action: 'index') %>";

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

@@ -2,7 +2,7 @@
   buttons: [
     {
       icon: 'back',
-      url: request.referer || alchemy.admin_dashboard_path,
+      url: request.referer || "#{Alchemy::MountPoint.get}/admin/dashboard",
       label: _t(:back),
       title: _t(:back),
       hotkey: 'alt-z',

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

@@ -1,2 +1,2 @@
 Alchemy.closeCurrentWindow();
-window.location.replace('<%= alchemy.login_path %>');
+window.location.href = '<%= alchemy.login_path %>';

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

@@ -1 +1 @@
-window.location.replace('<%= url_for(@redirect_url) %>');
+window.location.href = '<%= url_for(@redirect_url) %>';

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

@@ -13,7 +13,7 @@
   <%= 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/linkable_essence_tools', :content => content %>
+  <%= render 'alchemy/essences/shared/linkable_essence_tools', :content => content %>
 </div>
 <script type="text/javascript" charset="utf-8">
   $('#<%= content.form_field_id(:link) %>').on('change', function() {

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

@@ -47,7 +47,7 @@
     <%- end -%>
     <div class="edit_images_bottom">
       <%= render(
-        :partial => 'alchemy/essences/essence_picture_tools',
+        :partial => 'alchemy/essences/shared/essence_picture_tools',
         :locals => {
           :content => content,
           :options => options

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

@@ -5,7 +5,7 @@
     <%= text_area_tag(
       content.form_field_name,
       content.ingredient || '',
-      :class => content.tinymce_class_name
+      class: content.tinymce_class_name
     ) %>
   </div>
 </div>