alchemy_cms 2.2.rc11 → 2.2.rc13

data/app/helpers/alchemy/base_helper.rb

@@ -39,15 +39,6 @@ module Alchemy
       end
     end
 
-    # Taken from tinymce_hammer plugin
-    def append_class_name options, class_name #:nodoc:
-      key = options.has_key?('class') ? 'class' : :class
-      unless options[key].to_s =~ /(^|\s+)#{class_name}(\s+|$)/
-        options[key] = "#{options[key]} #{class_name}".strip
-      end
-      options
-    end
-
     # Returns an icon
     def render_icon(icon_class)
       content_tag('span', '', :class => "icon #{icon_class}")

data/app/models/alchemy/clipboard.rb

@@ -0,0 +1,74 @@
+module Alchemy
+
+  # The Clipboard holds element ids and page ids
+  #
+  # It is stored inside the session.
+  #
+  # Each entry can has an action keyword that describes what to do after pasting the item.
+  #
+  # The keyword can be one of 'copy' or 'cut'
+  class Clipboard
+
+    attr_accessor :items
+
+    def initialize
+      @items = self.class.empty_clipboard
+    end
+
+    # Returns all items of the collection from category (+:elements+ or +:pages+)
+    def all(item_type)
+      @items.fetch(item_type.to_sym)
+    end
+    alias_method :[], :all
+
+    # Returns the item from collection of category (+:elements+ or +:pages+)
+    def get(item_type, item_id)
+      all(item_type).detect { |item| item[:id].to_i == item_id.to_i }
+    end
+
+    # Returns true if the id is already in the collection of category (+:elements+ or +:pages+)
+    def contains?(item_type, item_id)
+      all(item_type).collect { |item| item[:id].to_i }.include?(item_id.to_i)
+    end
+
+    # Insert an item into the collection of category (+:elements+ or +:pages+)
+    def push(item_type, item)
+      all(item_type).push(normalized(item))
+    end
+
+    def replace(item_type, item)
+      all(item_type).replace(item.is_a?(Array) ? item : [item])
+    end
+    alias_method :[]=, :replace
+
+    def remove(item_type, item_id)
+      all(item_type).delete_if { |item| item[:id].to_i == item_id.to_i }
+    end
+
+    def clear(item_type = nil)
+      if item_type
+        all(item_type).clear
+      else
+        @items = self.class.empty_clipboard
+      end
+    end
+
+    def empty?
+      @items == self.class.empty_clipboard
+    end
+
+  private
+
+    def normalized(item)
+      item[:id] = item[:id].to_i
+      item
+    end
+
+  protected
+
+    def self.empty_clipboard
+      {:elements => [], :pages => []}
+    end
+
+  end
+end

data/app/models/alchemy/content.rb

@@ -113,6 +113,11 @@ module Alchemy
       end
     end
 
+    # Returns all content descriptions from elements.yml
+    def self.descriptions
+      @descriptions ||= Element.descriptions.collect { |e| e['contents'] }.flatten.compact
+    end
+
     # Gets the ingredient from essence
     def ingredient
       return nil if self.essence.nil?
@@ -207,5 +212,19 @@ module Alchemy
       end
     end
 
+    def has_custom_tinymce_config?
+      !settings[:tinymce].nil?
+    end
+
+    def tinymce_class_name
+      if has_custom_tinymce_config?
+        if settings[:tinymce]
+          "custom_tinymce #{name}"
+        end
+      else
+        "default_tinymce"
+      end
+    end
+
   end
 end

data/app/views/alchemy/admin/contents/create.js.erb

@@ -21,7 +21,7 @@
 
   <% case @content.essence_type -%>
   <% when "Alchemy::EssencePicture" -%>
-
+  $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
   <% if @contents_of_this_type.length > 1 -%>
   $('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
   <% end -%>

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -5,7 +5,6 @@
       [:admin, element],
       :remote => true,
       :html => {
-        :onsubmit => "Alchemy.saveElement(this)",
         :id => "element_#{element.id}_form"
       }
     ) do %>

data/app/views/alchemy/admin/elements/_element_head.html.erb

@@ -18,12 +18,11 @@
       :id => "element_#{element.id}_folder_spinner",
       :class => "element_folder_spinner"
     ) %>
-    <%= link_to_function(
-      "",
-      "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{ t('Warning!') }', message: '#{ t(:element_dirty_notice) }', okLabel: '#{ t('Yes') }', cancelLabel: '#{ t('No') }'})",
+    <%= link_to('', '#', {
+      :onclick => "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{t('Warning!')}', message: '#{t(:element_dirty_notice)}', okLabel: '#{t('Yes')}', cancelLabel: '#{t('No')}'})",
       :class => element.folded? ? 'expand_element' : 'fold_element',
-      :title => element.folded? ? t('show_element_content') : t('hide_element_content'),
+      :title => element.folded? ? t(:show_element_content) : t(:hide_element_content),
       :id => "element_#{element.id}_folder"
-    ) %>
+    }) %>
   </span>
 </div>

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

@@ -1,5 +1,6 @@
 (function($) {
-  
+
+  $('#picture_to_assign_<%= @picture.id %> a').attr('href', '#').off('click');
   $('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
     render(
       :partial => "alchemy/essences/essence_picture_editor",
@@ -11,5 +12,5 @@
 <%- end -%>
   Alchemy.closeCurrentWindow();
   Alchemy.setElementDirty('#element_<%= @content.element.id -%>');
-  
+
 })(jQuery);

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

@@ -15,12 +15,11 @@
   <% end %>
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
-    <%= link_to_function(
-      render_icon('delete-small'),
-      'Alchemy.ImageCropper.reset()',
+    <%= link_to(render_icon('delete-small'), '#', {
+      :onclick => 'Alchemy.ImageCropper.reset()',
       :class => 'icon_button',
       :title => t('Reset Imagemask')
-    ) %>
+    }) %>
     <label><%= t("Reset Imagemask") %></label>
   </div>
 </div>

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

@@ -68,7 +68,7 @@
     <tr>
       <td colspan="2" class="submit">
         <%= hidden_field_tag 'content_id', @content.id %>
-        <%= f.button t("save"), :class => 'button' %>
+        <%= f.button t("apply"), :class => 'button' %>
       </td>
     </tr>
   </table>

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

@@ -1,17 +1,8 @@
 (function($) {
-
-  $('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_picture_editor",
-      :locals => {:content => @content, :options => params[:options] || {}}
-    )
-  ) -%>');
-  Alchemy.growl('<%= t("Image updated successfully") -%>');
   Alchemy.ImageCropper.destroy();
   Alchemy.closeCurrentWindow();
-  Alchemy.reloadPreview();
+  Alchemy.setElementDirty('#element_<%= @content.element.id -%>');
 <%- if @content.element.all_contents_by_type("Alchemy::EssencePicture").count > 1 -%>
   Alchemy.SortableContents('<%= form_authenticity_token -%>');
 <%- end -%>
-
 })(jQuery);

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

@@ -52,15 +52,9 @@
     </tr>
   </table>
   <p>
-    <%= link_to_function(
-      t("apply"),
-      "Alchemy.LinkOverlay.createLink(
-        'contact',
-        jQuery('#contactform_url').val() + '?subject=' + encodeURIComponent(jQuery('#contactform_subject').val()) + '&mail_to=' + encodeURIComponent(jQuery('#contactform_mailto').val()) + '&body=' + encodeURIComponent(jQuery('#contactform_body').val()),
-        jQuery('#contactform_link_title').val(),
-        null
-      ); Alchemy.LinkOverlay.close()",
+    <%= link_to(t(:apply), '#', {
+      :onclick => "Alchemy.LinkOverlay.createLink('contact', jQuery('#contactform_url').val() + '?subject=' + encodeURIComponent(jQuery('#contactform_subject').val()) + '&mail_to=' + encodeURIComponent(jQuery('#contactform_mailto').val()) + '&body=' + encodeURIComponent(jQuery('#contactform_body').val()), jQuery('#contactform_link_title').val(), null); Alchemy.LinkOverlay.close()",
       :class => 'button'
-    ) %>
+    }) %>
   </p>
 </div>

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

@@ -27,18 +27,9 @@
     </tr>
   </table>
   <p>
-    <%= link_to_function(
-      t('apply'),
-      %(
-        Alchemy.LinkOverlay.createLink(
-          'external',
-          jQuery('#external_url').val(),
-          jQuery('#extern_link_title').val(),
-          jQuery('#link_target').val()
-        );
-        Alchemy.LinkOverlay.close()
-      ),
+    <%= link_to(t(:apply), '#', {
+      :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#link_target').val()); Alchemy.LinkOverlay.close()",
       :class => 'button'
-    ) %>
+    }) %>
   </p>
 </div>

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

@@ -35,18 +35,9 @@
     </tr>
   </table>
   <p>
-    <%= link_to_function(
-      t("apply"),
-      %(
-        Alchemy.LinkOverlay.createLink(
-          'file',
-          jQuery('#public_filename').val(),
-          jQuery('#file_link_title').val(),
-          jQuery('#file_link_target').val()
-        );
-        Alchemy.LinkOverlay.close()
-      ),
+    <%= link_to(t(:apply), '#', {
+      :onclick => "Alchemy.LinkOverlay.createLink('file', jQuery('#public_filename').val(), jQuery('#file_link_title').val(), jQuery('#file_link_target').val()); Alchemy.LinkOverlay.close()",
       :class => 'button'
-    ) %>
+    }) %>
   </p>
 </div>

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

@@ -28,20 +28,11 @@
     </tr>
   </table>
   <p>
-    <%= hidden_field_tag( "internal_urlname" ) %>
-    <%= hidden_field_tag( "page_anchor" ) %>
-    <%= link_to_function(
-      t("apply"),
-      %(
-        Alchemy.LinkOverlay.createLink(
-          'internal',
-          jQuery('#internal_urlname').val() + jQuery('#page_anchor').val(),
-          jQuery('#internal_link_title').val(),
-          jQuery('#internal_link_target').val()
-        );
-        Alchemy.LinkOverlay.close()
-      ),
+    <%= hidden_field_tag(:internal_urlname) %>
+    <%= hidden_field_tag(:page_anchor) %>
+    <%= link_to(t(:apply), '#', {
+      :onclick => "Alchemy.LinkOverlay.createLink('internal', jQuery('#internal_urlname').val() + jQuery('#page_anchor').val(), jQuery('#internal_link_title').val(), jQuery('#internal_link_target').val()); Alchemy.LinkOverlay.close()",
       :class => 'button'
-    ) %>
+    }) %>
   </p>
 </div>

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

@@ -22,17 +22,11 @@
       <span class="page_status <%= page_for_links.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page_for_links.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
     </div>
     <div class="sitemap_sitename" id="sitemap_sitename_<%= page_for_links.id %>" name="<%= parse_sitemap_name(page_for_links) %>">
-      <%= link_to_function(
-        page_for_links.name,
-        %(
-          Alchemy.LinkOverlay.selectPage(
-            '#{page_for_links.id}',
-            '#{@url_prefix + page_for_links.urlname}'
-          );
-        ),
+      <%= link_to(page_for_links.name, '#', {
+        :onclick => "Alchemy.LinkOverlay.selectPage('#{page_for_links.id}', '#{@url_prefix + page_for_links.urlname}')",
         :title => t('page_for_links.choose_page', :name => page_for_links.name),
         :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
-      ) %>
+      }) %>
     </div>
   </div>
   <%- if !page_for_links.children.empty? -%>

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

@@ -50,7 +50,7 @@
         :title => t('edit_page_properties'),
         :size => @page.layoutpage? ? '340x150' : '410x620'
       },
-      :class => 'icon_button',
+      :class => :icon_button,
       :title => t('edit_page_properties')
     ) -%>
     <label><%= t('page_properties') %></label>
@@ -68,25 +68,19 @@
 </div>
 <div id="toolbar_buttons_right">
   <div class="button_with_label" id="show_preview_window">
-    <%= link_to_function(
-      render_icon('preview_window'),
-      "Alchemy.openPreviewWindow()",
-      {
-        :title => t('Show Preview Window'),
-        :class => 'icon_button'
-      }
-    ) %>
+    <%= link_to(render_icon(:preview_window), '#', {
+      :onclick => "Alchemy.openPreviewWindow()",
+      :title => t('Show Preview Window'),
+      :class => :icon_button
+    }) %>
     <label><%= t('Show Preview Window') %></label>
   </div>
   <div class="button_with_label" id="show_element_window">
-    <%= link_to_function(
-      render_icon('element_window'),
-      "Alchemy.openElementsWindow()",
-      {
-        :title => t('Show Elements Window'),
-        :class => 'icon_button'
-      }
-    ) %>
+    <%= link_to(render_icon(:element_window), '#', {
+      :onclick => "Alchemy.openElementsWindow()",
+      :title => t('Show Elements Window'),
+      :class => :icon_button
+    }) %>
     <label><%= t('Show Elements Window') %></label>
   </div>
 </div>
@@ -160,6 +154,11 @@
       Alchemy.Tinymce.init(function() {
         Alchemy.ElementDirtyObserver('#element_area');
       });
+      if (Alchemy.Tinymce.customInits.length > 0) {
+        for (var i = Alchemy.Tinymce.customInits.length - 1; i >= 0; i--) {
+          Alchemy.Tinymce.customInits[i].call();
+        }
+      }
       jQuery('#cells').tabs();
       jQuery('#cells').tabs('paging', { follow: true, followOnSelect: true } );
     });

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

@@ -19,7 +19,7 @@
   <div class="image_spinner spinner">
     <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
   </div>
-  <%= link_to_function(
+  <%= link_to(
     image_tag(
       alchemy.thumbnail_path(:id => picture, :size => @size),
       :alt => picture.name,
@@ -27,7 +27,8 @@
       :onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
       :style => "display: none;"
     ),
-    "Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
+    '#',
+    :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
     :class => 'thumbnail_background'
   ) %>
   <span class="picture_name<%= ' rename' if permitted_to?(:edit, :alchemy_admin_pictures) -%>" title="<%= permitted_to?(:edit, :alchemy_admin_pictures) ? picture.name + ' (' + t('Click to rename') + ')' : picture.name %>" id="image_picture_<%= picture.id %>_name"><%= picture.name %></span>

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

@@ -21,6 +21,7 @@
     ),
     action_url,
     :remote => true,
+    :onclick => '$(self).attr("href", "#").off("click")',
     :method => action_method,
     :title => t("assign_image"),
     :class => 'thumbnail_background'

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

@@ -30,21 +30,19 @@
   :title => (content.ingredient ? t('swap_image') : t('insert_image'))
 ) %>
 
-<%= link_to_function(
-  render_icon('link'),
-  "Alchemy.LinkOverlay.open(this, 420)",
+<%= link_to(render_icon(:link), '#', {
+  :onclick => "Alchemy.LinkOverlay.open(this, 420)",
   :class => content.linked? ? 'linked' : nil,
   :title => t('link_image'),
   :name => "essence_picture_#{content.id}",
   :id => "edit_link_#{content.id}"
-) %>
+}) %>
 
-<%= link_to_function(
-  render_icon('unlink'),
-  "Alchemy.LinkOverlay.removeLink(this, #{content.id})",
+<%= link_to(render_icon('unlink'), '#', {
+  :onclick => "Alchemy.LinkOverlay.removeLink(this, #{content.id})",
   :class => content.linked? ? 'linked' : 'disabled',
   :title => t('unlink')
-) %>
+}) %>
 
 <%= link_to_overlay_window(
   render_icon('edit'),