alchemy_cms 2.2.rc13 → 2.2.rc14

data/app/assets/stylesheets/alchemy/elements.css.scss

@@ -627,6 +627,10 @@ a.new_content_link {
   margin-top: 4px;
 }
 
+div.content_rtf_editor {
+  min-height: 246px;
+}
+
 div.essence_richtext_loader {
   position: absolute;
   top: 0;

data/app/controllers/alchemy/admin/base_controller.rb

@@ -61,6 +61,10 @@ module Alchemy
 
       def get_clipboard
         session[:clipboard] ||= Clipboard.new
+      rescue NoMethodError => e
+        exception_logger(e)
+        @notice = "You have an old style clipboard in your session. Please remove your cookies and try again."
+        render :action => "error_notice", :layout => false
       end
 
       def clipboard_empty?(category = nil)
@@ -77,7 +81,7 @@ module Alchemy
       end
 
       def set_stamper
-        User.stamper = self.current_user
+        User.stamper = current_user
       end
 
       def reset_stamper

data/app/helpers/alchemy/admin/base_helper.rb

@@ -23,6 +23,7 @@ module Alchemy
       #   :overflow         [Boolean]             # Should the dialog have overlapping content. If not, it shows scrollbars. Good for select boxes. Default false.
       #   :resizable        [Boolean]             # Is the dialog window resizable? Default false.
       #   :modal            [Boolean]             # Show as modal window. Default true.
+      #   :overflow         [Boolean]             # Should the window show overflowing content? Default false.
       #
       def link_to_overlay_window(content, url, options={}, html_options={})
         default_options = {
@@ -32,12 +33,17 @@ module Alchemy
         }
         options = default_options.merge(options)
         size = options[:size].to_s.split('x')
-        size_x = options[:size] ? size[0] : 'auto'
-        size_y = options[:size] ? size[1] : 'auto'
-        link_to(
-          content,
-          '#',
-          html_options.merge(:onclick => "Alchemy.openWindow('#{url}', '#{options[:title]}', '#{size}', '#{size_y}', #{options[:resizable]}, #{options[:modal]}, #{options[:overflow]})")
+        link_to(content, url,
+          html_options.merge(
+            'data-alchemy-overlay' => {
+              :size_x => size && size[0] ? size[0] : 'auto',
+              :size_y => size && size[1] ? size[1] : 'auto',
+              :resizable => options[:resizable],
+              :modal => options[:modal],
+              :overflow => options[:overflow],
+              :title => options[:title]
+            }.to_json
+          )
         )
       end
 
@@ -113,13 +119,15 @@ module Alchemy
       #   <%= link_to_confirmation_window('delete', 'Do you really want to delete this comment?', '/admin/comments/1') %>
       #
       def link_to_confirmation_window(link_string = "", message = "", url = "", html_options = {})
-        title = t("please_confirm")
-        ok_lable = t("Yes")
-        cancel_lable = t("No")
-        link_to(
-          link_string,
-          '#',
-          html_options.merge(:onclick => "Alchemy.confirmToDeleteWindow('#{url}', '#{title}', '#{message}', '#{ok_lable}', '#{cancel_lable}');")
+        link_to(link_string, url,
+          html_options.merge(
+            'data-alchemy-confirm' => {
+              :title => t("please_confirm"),
+              :message => message,
+              :ok_label => t("Yes"),
+              :cancel_label => t("No")
+            }.to_json
+          )
         )
       end
 

data/app/helpers/alchemy/admin/contents_helper.rb

@@ -32,10 +32,13 @@ module Alchemy
         content.has_validations? ? "#{content_name}<span class='validation_indicator'>*</span>".html_safe : content_name
       end
 
-      # Renders a link to show the new content overlay
+      # Renders a link to show the new content overlay that lets you add additional contents.
+      #
+      # See +render_create_content_link+ helper for exmaples on how to define additional contents.
+      #
       def render_new_content_link(element)
         link_to_overlay_window(
-          render_icon('create') + t('add new content'),
+          render_icon(:create) + t('add new content'),
           alchemy.new_admin_element_content_path(element),
           {
             :size => '335x70',
@@ -44,32 +47,70 @@ module Alchemy
           },
           {
             :id => "add_content_for_element_#{element.id}",
-            :class => 'small button with_icon new_content_link'
+            :class => 'button with_icon new_content_link'
           }
         )
       end
 
-      # Renders a link to create a new content in element editor
-      def render_create_content_link(element, options = {})
+      # Renders a link that dynamically adds an additional content into your element editor view.
+      #
+      # NOTE: You have to define additional contents in your elements.yml file first.
+      #
+      # ==== Example:
+      #
+      #   # config/alchemy/elements.yml
+      #   - name: downloads:
+      #     contents:
+      #     - name: file
+      #       type: EssenceFile
+      #     additional_contents:
+      #     - name: file
+      #       type: EssenceFile
+      #
+      # Then add this helper into the elements editor view partial:
+      #
+      #   <%= render_create_content_link(element, 'file') %>
+      #
+      # Optionally you can pass a label:
+      #
+      #   <%= render_create_content_link(element, 'file', :label => 'Add a file') %>
+      #
+      def render_create_content_link(element, content_name, options = {})
         defaults = {
-          :label => t('add new content')
+          :label => t('Add %{name}', :name => t(content_name, :scope => :content_names))
         }
         options = defaults.merge(options)
-        link_to(
-          options[:label],
-          alchemy.admin_contents_path(
+        link_to(render_icon(:create) + options[:label], alchemy.admin_contents_path(
             :content => {
-              :name => options[:content_name],
+              :name => content_name,
               :element_id => element.id
             }
           ),
-          :method => 'post',
+          :method => :post,
           :remote => true,
           :id => "add_content_for_element_#{element.id}",
           :class => 'button new_content_link'
         )
       end
 
+      # Renders a link for removing that content
+      def delete_content_link(content)
+        link_to_confirmation_window(
+          render_icon('delete-small'),
+          t('Do you really want to delete this content?'),
+          alchemy.admin_content_path(content),
+          :class => 'icon_button small',
+          :title => t('Remove this content')
+        ) if content.settings[:deletable]
+      end
+
+      # Renders the label and a remove link for a content.
+      def label_and_remove_link(content)
+        content_tag :label do
+          [render_content_name(content).to_s, delete_content_link(content).to_s].join('&nbsp;').html_safe
+        end
+      end
+
     end
   end
 end

data/app/helpers/alchemy/admin/elements_helper.rb

@@ -62,7 +62,6 @@ module Alchemy
           }
         )
       end
-
       alias_method :render_picture_editor, :render_picture_gallery_editor
 
       # Returns all elements that could be placed on that page because of the pages layout.

data/app/helpers/alchemy/admin/essences_helper.rb

@@ -94,14 +94,14 @@ module Alchemy
         }
         options = default_options.merge(options)
         pages = Page.where({
-                   :language_id => session[:language_id],
-                   :layoutpage => options[:global] == true,
-                   :public => options[:global] == false
-                 })
+          :language_id => session[:language_id],
+          :layoutpage => options[:global] == true,
+          :public => options[:global] == false
+        })
         pages = pages.where({:page_layout => options[:only]}) if options[:only].present?
         content = element.content_by_name(content_name)
         options.update(
-          :select_values => pages_for_select(pages, content ? content.essence.body : nil, options[:prompt], options[:page_attribute])
+          :select_values => pages_for_select(pages, content ? content.ingredient : nil, options[:prompt], options[:page_attribute])
         )
         if content.nil?
           render_missing_content(element, content_name, options)

data/app/helpers/alchemy/essences_helper.rb

@@ -108,6 +108,7 @@ module Alchemy
     #   :for_editor => {}
     #
     def render_essence(content, part = :view, options = {}, html_options = {})
+      options = {:for_view => {}, :for_editor => {}}.update(options)
       if content.nil?
         return part == :view ? "" : warning('Content is nil', t("content_not_found"))
       elsif content.essence.nil?

data/app/models/alchemy/content.rb

@@ -20,36 +20,95 @@ module Alchemy
     scope :essence_pictures, where(:essence_type => "Alchemy::EssencePicture")
     scope :essence_texts, where(:essence_type => "Alchemy::EssenceText")
     scope :essence_richtexts, where(:essence_type => "Alchemy::EssenceRichtext")
+    scope :essence_selects, where(:essence_type => "Alchemy::EssenceSelect")
+    scope :essence_booleans, where(:essence_type => "Alchemy::EssenceBoolean")
+
+    class << self
+
+      # Creates a new Content as descriped in the elements.yml file
+      def create_from_scratch(element, essences_hash)
+        if essences_hash[:name].blank? && !essences_hash[:essence_type].blank?
+          essences_of_same_type = element.contents.where(
+            :essence_type => Content.normalize_essence_type(essences_hash[:essence_type])
+          )
+          description = {
+            'type' => essences_hash[:essence_type],
+            'name' => "#{essences_hash[:essence_type].classify.demodulize.underscore}_#{essences_of_same_type.count + 1}"
+          }
+        else
+          description = element.content_description_for(essences_hash[:name])
+          description = element.available_content_description_for(essences_hash[:name]) if description.blank?
+        end
+        raise "No description found in elements.yml for #{essences_hash.inspect} and #{element.inspect}" if description.blank?
+        content = new(:name => description['name'], :element_id => element.id)
+        content.create_essence!(description)
+      end
 
-    # Creates a new Content as descriped in the elements.yml file
-    def self.create_from_scratch(element, essences_hash)
-      if essences_hash[:name].blank? && !essences_hash[:essence_type].blank?
-        essences_of_same_type = element.contents.where(
-          :essence_type => Content.normalize_essence_type(essences_hash[:essence_type])
-        )
-        description = {
-          'type' => essences_hash[:essence_type],
-          'name' => "#{essences_hash[:essence_type].classify.demodulize.underscore}_#{essences_of_same_type.count + 1}"
-        }
-      else
-        description = element.content_description_for(essences_hash[:name])
-        description = element.available_content_description_for(essences_hash[:name]) if description.blank?
+      # Makes a copy of source and also copies the associated essence.
+      #
+      # You can pass a differences hash to update the attributes of the copy.
+      #
+      # === Example
+      #
+      #   @copy = Alchemy::Content.copy(@content, {:element_id => 3})
+      #   @copy.element_id # => 3
+      #
+      def copy(source, differences = {})
+        attributes = source.attributes.except(
+          "position",
+          "created_at",
+          "updated_at",
+          "creator_id",
+          "updater_id",
+          "id"
+        ).merge(differences.stringify_keys)
+        content = self.create!(attributes)
+        new_essence = content.essence.class.new(content.essence.attributes.except(
+          "id",
+          "creator_id",
+          "updater_id",
+          "created_at",
+          "updated_at"
+        ))
+        new_essence.save!
+        raise "Essence not cloned" if new_essence.id == content.essence_id
+        content.update_attribute(:essence_id, new_essence.id)
+        content
       end
-      raise "No description found in elements.yml for #{essences_hash.inspect} and #{element.inspect}" if description.blank?
-      essence_class = Content.normalize_essence_type(description['type']).constantize
-      content = self.new(:name => description['name'], :element_id => element.id)
-      if description['type'] == "EssenceRichtext" || description['type'] == "EssenceText"
-        essence = essence_class.create(:do_not_index => !description['do_not_index'].nil?)
-      else
-        essence = essence_class.create
+
+      # Returns the translated label for a content name.
+      #
+      # Translate it in your locale yml file:
+      #
+      #   alchemy:
+      #     content_names:
+      #      foo: Bar
+      #
+      # Optionally you can scope your content name to an element:
+      #
+      #   alchemy:
+      #     content_names:
+      #      article:
+      #       foo: Baz
+      #
+      def translated_label_for(content_name, element_name = nil)
+        Alchemy::I18n.t("content_names.#{element_name}.#{content_name}", :default => ["content_names.#{content_name}".to_sym, content_name.capitalize])
       end
-      if essence
-        content.essence = essence
-        content.save!
-      else
-        content = nil
+
+      # Returns all content descriptions from elements.yml
+      def descriptions
+        @descriptions ||= Element.descriptions.collect { |e| e['contents'] }.flatten.compact
       end
-      return content
+
+      def normalize_essence_type(essence_type)
+        essence_type = essence_type.classify
+        if not essence_type.match(/^Alchemy::/)
+          essence_type.gsub!(/^Essence/, 'Alchemy::Essence')
+        else
+          essence_type
+        end
+      end
+
     end
 
     # Settings from the elements.yml definition
@@ -65,38 +124,6 @@ module Alchemy
       self.element.contents
     end
 
-    # Makes a copy of source and also copies the associated essence.
-    #
-    # You can pass a differences hash to update the attributes of the copy.
-    #
-    # === Example
-    #
-    #   @copy = Alchemy::Content.copy(@content, {:element_id => 3})
-    #   @copy.element_id # => 3
-    #
-    def self.copy(source, differences = {})
-      attributes = source.attributes.except(
-        "position",
-        "created_at",
-        "updated_at",
-        "creator_id",
-        "updater_id",
-        "id"
-      ).merge(differences.stringify_keys)
-      content = self.create!(attributes)
-      new_essence = content.essence.class.new(content.essence.attributes.except(
-        "id",
-        "creator_id",
-        "updater_id",
-        "created_at",
-        "updated_at"
-      ))
-      new_essence.save!
-      raise "Essence not cloned" if new_essence.id == content.essence_id
-      content.update_attribute(:essence_id, new_essence.id)
-      content
-    end
-
     # Returns my description hash from elements.yml
     # Returns the description from available_contents if my own description is blank
     def description
@@ -113,11 +140,6 @@ 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?
@@ -172,25 +194,6 @@ module Alchemy
       self.class.translated_label_for(self.name, self.element.name)
     end
 
-    # Returns the translated label for a content name.
-    #
-    # Translate it in your locale yml file:
-    #
-    #   alchemy:
-    #     content_names:
-    #      foo: Bar
-    #
-    # Optionally you can scope your content name to an element:
-    #
-    #   alchemy:
-    #     content_names:
-    #      article:
-    #       foo: Baz
-    #
-    def self.translated_label_for(content_name, element_name = nil)
-      Alchemy::I18n.t("content_names.#{element_name}.#{content_name}", :default => ["content_names.#{content_name}".to_sym, content_name.capitalize])
-    end
-
     def linked?
       essence && !essence.link.blank?
     end
@@ -203,15 +206,6 @@ module Alchemy
       self.class.normalize_essence_type(self.essence_type)
     end
 
-    def self.normalize_essence_type(essence_type)
-      essence_type = essence_type.classify
-      if not essence_type.match(/^Alchemy::/)
-        essence_type.gsub!(/^Essence/, 'Alchemy::Essence')
-      else
-        essence_type
-      end
-    end
-
     def has_custom_tinymce_config?
       !settings[:tinymce].nil?
     end
@@ -226,5 +220,22 @@ module Alchemy
       end
     end
 
+    # Creates self.essence from description.
+    def create_essence!(description)
+      essence_class = self.class.normalize_essence_type(description['type']).constantize
+      if description['type'] == "EssenceRichtext" || description['type'] == "EssenceText"
+        essence = essence_class.create(:do_not_index => !description['do_not_index'].nil?)
+      else
+        essence = essence_class.create
+      end
+      if essence
+        self.essence = essence
+        save!
+        self
+      else
+        nil
+      end
+    end
+
   end
 end