alchemy_cms 2.6.3 → 2.7.0

data/app/views/alchemy/admin/elements/update.js.erb

@@ -1,25 +1,22 @@
-var $el = $('#element_<%= @element.id %>');
-<% if @element_validated %>
-
-$('div.element_handle span.icon', $el).removeClass('element_<%= @element.public? ? "draft" : "public" %>').addClass('element_<%= @element.public? ? "public" : "draft" %>');
-$('.element_heading .preview_text_element_name', $el).html('<%= @element.display_name %>');
-$('.element_heading .preview_text_quote', $el).html('<%= escape_javascript(@element.preview_text) %>');
-$('div.content_editor').removeClass('validation_failed');
-$("#element_<%= @element.id %>_errors").hide();
-Alchemy.setElementSaved($el);
-Alchemy.growl('<%= _t(:element_saved) %>');
-Alchemy.PreviewWindow.refresh();
-
-<%=raw update_elements_with_essence_selects(@page, @element) %>
-
-<% else %>
-
-Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
-$('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>").html_safe %></li></ul>');
-$("#element_<%= @element.id %>_errors").show();
-$('div.content_editor').removeClass('validation_failed');
-$('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
-Alchemy.ElementEditors.scrollToElement('#element_<%= @element.id %>');
-Alchemy.Buttons.enable($el);
-
-<% end %>
+(function() {
+  var $el = $('#element_<%= @element.id %>');
+<%- if @element_validated -%>
+  $('div.element_handle span.icon', $el).removeClass('element_<%= @element.public? ? "draft" : "public" %>').addClass('element_<%= @element.public? ? "public" : "draft" %>');
+  $('.element_heading .preview_text_element_name', $el).html('<%= @element.display_name %>');
+  $('.element_heading .preview_text_quote', $el).html('<%= escape_javascript(@element.preview_text) %>');
+  $('div.content_editor').removeClass('validation_failed');
+  $("#element_<%= @element.id %>_errors").hide();
+  Alchemy.setElementSaved($el);
+  Alchemy.growl('<%= _t(:element_saved) %>');
+  Alchemy.PreviewWindow.refresh();
+  <%= update_essence_select_elements(@page, @element) -%>
+<%- else -%>
+  Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
+  $('#element_<%= @element.id %>_errors').html('<%= escape_javascript(@error_message) %><ul><li><%= escape_javascript(@element.essence_error_messages.join("</li><li>").html_safe) %></li></ul>');
+  $("#element_<%= @element.id %>_errors").show();
+  $('div.content_editor').removeClass('validation_failed');
+  $('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
+  Alchemy.ElementEditors.scrollToElement('#element_<%= @element.id %>');
+  Alchemy.Buttons.enable($el);
+<%- end -%>
+})();

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -1,10 +1,15 @@
 (function($) {
-
   var $el = $('#element_<%= @content.element.id %>');
-  $('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "alchemy/essences/essence_file_editor", :formats => [:html], :locals => {:content => @content, :options => @options})) %>');
+  $('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(
+    render partial: "alchemy/essences/essence_file_editor",
+      formats: [:html],
+      locals: {
+        content: @content,
+        options: @options
+      }
+  ) %>');
   Alchemy.closeCurrentWindow();
   Alchemy.reloadPreview();
   Alchemy.setElementDirty($el);
   Alchemy.overlayObserver($el);
-
 })(jQuery);

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -1,6 +1,6 @@
 <div id="jscropper">
 <% if @no_image_notice %>
-  <%= render_message do %>
+  <%= render_message :warn do %>
     <%= @no_image_notice %>
   <% end %>
 <% else %>
@@ -9,27 +9,28 @@
   <% end %>
   <div class="thumbnail_background">
     <%= image_tag(
-      show_alchemy_picture_path(@essence_picture.picture, :size => '800x600', :format => :png),
-      :id => 'imageToCrop'
+      show_alchemy_picture_path(@picture, size: '800x600', format: 'png'),
+      id: 'imageToCrop'
     ) %>
   </div>
   <%= form_for(
     @essence_picture,
-    :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options),
-    :id => 'image_cropper_form',
-    :remote => true
+    url: alchemy.admin_essence_picture_path(@essence_picture, options: @options.to_json),
+    id: 'image_cropper_form',
+    remote: true
   ) do |f| %>
     <%= f.hidden_field :crop_from %>
     <%= f.hidden_field :crop_size %>
     <%= hidden_field_tag :content_id, @content.id %>
     <%= link_to(render_icon('delete-small') + _t('Reset Imagemask'), '#', {
-      :onclick => 'Alchemy.ImageCropper.reset()',
-      :class => 'button with_icon'
+      onclick: 'Alchemy.ImageCropper.reset()',
+      class: 'button with_icon'
     }) %>
-    <%= f.button _t(:apply), :class => 'button' %>
+    <%= f.button _t(:apply), class: 'button' %>
   <% end %>
-<% end %>
 </div>
+<% end %>
+<% if @initial_box && @default_box %>
 <script type="text/javascript">
   Alchemy.ImageLoader('#jscropper .thumbnail_background');
   $('#imageToCrop').load(function() {
@@ -39,7 +40,8 @@
       <%= @size_y %>,
       [<%= @default_box[:x1] %>, <%= @default_box[:y1] %>, <%= @default_box[:x2] %>, <%= @default_box[:y2] %>],
       <%= @ratio %>,
-      [<%= @essence_picture.picture.image_file_width %>, <%= @essence_picture.picture.image_file_height %>]
+      [<%= @picture.image_file_width %>, <%= @picture.image_file_height %>]
     );
   });
-</script>
+</script>
+<% end %>

data/app/views/alchemy/admin/essence_pictures/edit.html.erb

@@ -1,84 +1,67 @@
 <%= form_for(
     @essence_picture,
-    :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options),
-    :remote => true
+    url: alchemy.admin_essence_picture_path(@essence_picture, options: @options.to_json),
+    remote: true
 ) do |f| %>
   <table>
     <tr>
       <td class="label"><%= f.label "caption" %></td>
       <td class="input">
         <%- if @options[:caption_as_textarea] == 'true' -%>
-        <%= f.text_area "caption", :class => 'thin_border' %>
+        <%= f.text_area "caption", class: 'thin_border' %>
         <%- else -%>
-        <%= f.text_field "caption", :class => 'thin_border' %>
+        <%= f.text_field "caption", class: 'thin_border' %>
         <%- end -%>
       </td>
     </tr>
     <tr>
       <td class="label"><%= f.label "title" %></td>
-      <td class="input"><%= f.text_field "title", :class => 'thin_border' %></td>
+      <td class="input"><%= f.text_field "title", class: 'thin_border' %></td>
     </tr>
     <tr>
       <td class="label"><%= f.label "alt_tag" %></td>
-      <td class="input"><%= f.text_field "alt_tag", :class => 'thin_border' %></td>
+      <td class="input"><%= f.text_field "alt_tag", class: 'thin_border' %></td>
     </tr>
-    <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
-    <%- if @options[:sizes].is_a?(HashWithIndifferentAccess) -%>
+    <%- if @options[:sizes].present? -%>
     <tr>
       <td class="label"><%= f.label "render_size" %></td>
       <td class="select">
-      <%= f.select(
-        "render_size",
-        options_for_select(
-          [[_t('Layout default'), @options[:image_size]]] + @options[:sizes].sort,
-          @essence_picture.render_size
-        ), :class => 'alchemy_selectbox'
+      <%= f.select(:render_size,
+        [[_t('Layout default'), @options[:image_size]]] + @options[:sizes].to_a,
+        {}, {class: 'alchemy_selectbox'}
       ) %>
       </td>
     </tr>
-    <%- elsif @options[:sizes] && !@options[:sizes].is_a?(HashWithIndifferentAccess) -%>
-    <tr>
-      <td colspan="2">
-        <%= warning("Did not passed a Hash as sizes option", "Sizes Selector Error. Please provide a Hash.") %>
-      </td>
-    </tr>
     <%- end -%>
-    <%- if @options[:image_float_selector] == 'true' -%>
+    <%- if @options[:image_float_selector] -%>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">
-        <%= f.select(
-          "css_class",
-          [[_t("Layout default"), ""], [_t(:above), "no_float"], [_t(:left), "left"], [_t(:right), "right"]],
-          {},
-          {:class => 'alchemy_selectbox'}
+        <%= f.select(:css_class, [
+            [_t("Layout default"), ""],
+            [_t(:above), "no_float"],
+            [_t(:left), "left"],
+            [_t(:right), "right"]
+          ], {}, {class: 'alchemy_selectbox'}
         ) %>
       </td>
     </tr>
-    <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
-    <%- elsif @options[:css_classes].is_a?(HashWithIndifferentAccess) -%>
+    <%- elsif @options[:css_classes].present? -%>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">
-        <%= f.select(
-          "css_class",
-          options_for_select([[_t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class),
+        <%= f.select(:css_class,
+          [[_t('None'), '']] + @options[:css_classes].to_a,
           {},
-          {:class => 'alchemy_selectbox'}
+          {class: 'alchemy_selectbox'}
         ) %>
       </td>
     </tr>
-    <%- elsif @options[:css_classes] && !@options[:css_classes].is_a?(HashWithIndifferentAccess) -%>
-    <tr>
-      <td colspan="2">
-        <%= warning("Did not passed a Hash as css_classes option", "CSS Class Selector Error. Please provide a Hash.") %>
-      </td>
-    </tr>
     <%- end -%>
     <tr>
       <td colspan="2" class="submit">
         <%= hidden_field_tag 'content_id', @content.id %>
-        <%= f.button _t(:apply), :class => 'button' %>
+        <%= f.button _t(:apply), class: 'button' %>
       </td>
     </tr>
   </table>

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

@@ -1,91 +1,85 @@
-<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>" data-slug="<%= page.slug %>" data-restricted="<%= page.restricted? %>" data-visible="<%= page.visible? %>" data-external="<%= page.redirects_to_external? %>">
+<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>">
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
     <div class="sitemap_left_images">
-      <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
-      <div class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %>">
-        <div class="tooltip">
-          <h3><%= _t(:page_type) %>:</h3>
-          <p><%= page.layout_display_name %></p>
-          <h3><%= _t(:page_status) %>:</h3>
-          <p><%= combined_page_status(page) %></p>
-          <h3><%= _t(:created_at) %>:</h3>
-          <p><%= l(page.created_at) %></p>
-          <h3><%= _t(:created_by) %>:</h3>
-          <p><%= page.creator %></p>
-          <h3><%= _t(:updated_at) %>:</h3>
-          <p><%= l(page.updated_at) %></p>
-          <h3><%= _t(:updated_by) %>:</h3>
-          <p><%= page.updater %></p>
-          <%- if page.locked? -%>
-          <h3><%= _t(:currently_edited_by) %>:</h3>
-          <p><%= page.current_editor %></p>
-          <%- end -%>
-        </div>
-      </div>
+      <%= sitemap_folder_link(page) unless page.level == 1 || page.children.blank? || @sorting %>
+      <div class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %>"></div>
     </div>
     <div class="sitemap_right_tools">
       <%- unless @sorting -%>
-      <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
-      <%= link_to_overlay_window(
-        render_icon('configure_page'),
-        alchemy.configure_admin_page_path(page),
-        {
-          :title => _t(:edit_page_properties),
-          :size => page.redirects_to_external? ? '410x270' : '410x655'
-        },
-        :class => '',
-        :title => _t(:edit_page_properties)
-      ) -%>
-      <%- end -%>
-      <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
-      <span class="sitemap_sitetools">
-        <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
-        <%= link_to(
-          render_icon("copy_page"),
-          alchemy.insert_admin_clipboard_path(
-            :remarkable_type => page.class.name.demodulize.underscore.pluralize,
-            :remarkable_id => page.id
-          ),
-          :remote => true,
-          :method => :post,
-          :class => "",
-          :title => _t(:copy_page)
-        ) %>
+        <%- permitted_to?(:info, :alchemy_admin_pages) do -%>
+          <%= link_to_overlay_window(
+            render_icon('info'),
+            alchemy.info_admin_page_path(page),
+            {
+              title: _t(:page_infos),
+              size: '460x320'
+            },
+            {
+              title: _t(:page_infos)
+            }
+          ) %>
         <%- end -%>
-        <%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
-        <%= link_to_confirmation_window(
-          render_icon('delete_page'),
-          _t(:confirm_to_delete_page),
-          url_for(
-            :controller => 'pages',
-            :action => 'destroy',
-            :id => page.id
-          ),
-          {
-            :class => "",
-            :title => _t(:delete_page)
-          }
-        ) -%>
+        <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
+          <%= link_to_overlay_window(
+            render_icon('configure_page'),
+            alchemy.configure_admin_page_path(page),
+            {
+              :title => _t(:edit_page_properties),
+              :size => page.redirects_to_external? ? '410x270' : '410x655'
+            },
+            :title => _t(:edit_page_properties)
+          ) -%>
         <%- end -%>
-        <%- permitted_to?(:new, :alchemy_admin_pages) do -%>
-        <%= link_to_overlay_window(
-          render_icon('add_page'),
-          alchemy.new_admin_page_path(:parent_id => page.id),
-          {
-            :title => _t(:create_page),
-            :size => '340x150',
-            :overflow => true
-          },
-          :class => '',
-          :title => _t(:create_page)
-        ) -%>
+        <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
+          <span class="sitemap_sitetools">
+            <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
+              <%= link_to(
+                render_icon("copy_page"),
+                alchemy.insert_admin_clipboard_path(
+                  :remarkable_type => page.class.name.demodulize.underscore.pluralize,
+                  :remarkable_id => page.id
+                ),
+                :remote => true,
+                :method => :post,
+                :title => _t(:copy_page)
+              ) %>
+            <%- end -%>
+            <%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
+              <%= link_to_confirmation_window(
+                render_icon('delete_page'),
+                _t(:confirm_to_delete_page),
+                url_for(
+                  :controller => 'pages',
+                  :action => 'destroy',
+                  :id => page.id
+                ),
+                {
+                  :title => _t(:delete_page)
+                }
+              ) -%>
+            <%- end -%>
+            <%- permitted_to?(:new, :alchemy_admin_pages) do -%>
+              <%= link_to_overlay_window(
+                render_icon('add_page'),
+                alchemy.new_admin_page_path(:parent_id => page.id),
+                {
+                  :title => _t(:create_page),
+                  :size => '340x150',
+                  :overflow => true
+                },
+                {
+                  :title => _t(:create_page)
+                }
+              ) -%>
+            <%- end -%>
+          </span>
         <%- end -%>
-      </span>
-      <%- end -%>
       <%- end -%>
     </div>
     <div class="page_infos" id="page_<%= page.id %>_infos">
-      <%= render :partial => 'page_infos', :locals => {:page => page} %>
+      <span class="page_status <%= page.public ? 'public' : 'not_public' %>" title="<%= page.status_title(:public) %>"></span>
+      <span class="page_status <%= page.visible ? 'visible' : 'not_visible' %>" title="<%= page.status_title(:visible) %>"></span>
+      <span class="page_status <%= page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page.status_title(:restricted) %>"></span>
     </div>
     <div class="sitemap_sitename">
     <%- if page.redirects_to_external? -%>
@@ -95,14 +89,13 @@
         <%= h page.urlname %>
       </span>
     <%- else -%>
-      <%- cycle_class = cycle('even', 'odd') -%>
       <%= link_to_unless(
         @sorting,
         page.name,
         alchemy.edit_admin_page_path(page),
         :title => _t(:edit_page),
-        :class => "sitemap_pagename_link #{cycle_class}"
-      ) { content_tag('span', page.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
+        :class => "sitemap_pagename_link"
+      ) { content_tag('span', page.name, :class => "sitemap_pagename_link") } -%>
     <%- end -%>
     </div>
   </div>

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

@@ -2,7 +2,7 @@ $('#locked_page_<%= @page_id -%>').remove();
 
 <% if @layoutpage %>
 
-window.location.replace('<%= alchemy.admin_layoutpages_path -%>');
+window.location.href = '<%= alchemy.admin_layoutpages_path -%>';
 
 <% elsif @page_root %>
 
@@ -12,7 +12,7 @@ Alchemy.overlayObserver('#sitemap');
 
 <% else %>
 
-window.location.replace('<%= alchemy.admin_pages_path -%>');
+window.location.href = '<%= alchemy.admin_pages_path -%>';
 
 <% end %>
 

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

@@ -42,6 +42,22 @@
     <% end %>
   </div>
   <% end %>
+  <div class="button_with_label">
+    <%= link_to_overlay_window(
+      render_icon('info'),
+      alchemy.info_admin_page_path(@page),
+      {
+        title: _t(:page_infos),
+        size: '460x320'
+      },
+      {
+        class: 'icon_button',
+        title: _t(:page_infos),
+        'data-alchemy-hotkey' => 'alt-i'
+      }
+    ) %>
+    <label><%= _t(:page_infos) %></label>
+  </div>
   <div class="button_with_label">
     <%= link_to_overlay_window(
       render_icon('settings'),
@@ -92,7 +108,6 @@
 <% end %>
 
 <% content_for :javascripts do %>
-<%= tinymce_javascript_tags %>
 <script type="text/javascript" charset="utf-8">
 
   Alchemy.openPreviewWindow = function() {
@@ -150,16 +165,10 @@
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element_editor');
-      Alchemy.Tinymce.init(function() {
-        Alchemy.ElementDirtyObserver('#element_area');
-      });
-      if (Alchemy.Tinymce.customInits) {
-        for (var i = Alchemy.Tinymce.customInits.length - 1; i >= 0; i--) {
-          Alchemy.Tinymce.customInits[i].call();
-        }
-      }
+      Alchemy.Tinymce.init();
+      Alchemy.Tinymce.initCustomEditors(<%= raw @page.custom_tinymce_contents_selectors.to_json %>);
       jQuery('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
-
+      Alchemy.ElementDirtyObserver('#element_area');
       if (window.location.hash) {
         $(window.location.hash).trigger('Alchemy.SelectElementEditor');
       }
@@ -167,18 +176,12 @@
   }
 
   jQuery(function($) {
-    var texts = {
-      title: '<%= _t("Warning!") %>',
-      message: '<%= _t(:element_dirty_page_leave_warning) %>',
-      okLabel: '<%= _t("Yes") %>',
-      cancelLabel: '<%= _t("No") %>'
-    };
     $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
-      var not_dirty = Alchemy.checkPageDirtyness(this, texts);
+      var not_dirty = Alchemy.checkPageDirtyness(this);
       if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
       return not_dirty;
     });
-    Alchemy.PageLeaveObserver(texts);
+    Alchemy.PageLeaveObserver();
     Alchemy.openElementsWindow();
     Alchemy.openPreviewWindow();