alchemy_cms 2.4.rc2 → 2.4.rc4

data/app/assets/stylesheets/alchemy/mixins.scss

@@ -50,6 +50,13 @@
   }
 }
 
+@mixin field_with_error {
+  border-color: $error_border_color;
+  color: $error_text_color;
+  background-color: lighten($error_background_color, 8%);
+  @include box-shadow(inset 1px 1px 4px rgba($error_border_color, 0.5));
+}
+
 @mixin default-input-style {
   @include box-sizing(border-box);
   $border-inset-color: lighten($default-border-color, 20%);
@@ -72,6 +79,8 @@
   &:focus {
     @include default-focus-style;
   }
+
+  &.with_error { @include field_with_error }
 }
 
 @mixin text-overflow($prop: ellipsis) {

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

@@ -6,7 +6,7 @@
 body, td, pre {
   color: $text-color;
   font: $default-font-style;
-  margin: $default-margin;
+  margin: 2*$default-margin;
 }
 
 body {

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

@@ -278,6 +278,10 @@ td.charmap, #charmap a {
   overflow: visible;
 }
 
+div#general_panel { height: 245px }
+
+div#advanced_panel { height: 300px }
+
 .panel_wrapper {
   border: 1px solid #919B9C;
   border-top: 0px;

data/app/assets/stylesheets/alchemy/variables.scss

@@ -30,4 +30,8 @@ $sb-border-radius:   $default-border-radius;
 $sb-font-size:       $default-font-size;
 $sb-text-color:      $text-color;
 $sb-ie-support:      true;
-$default-form-field-margin: 0.3em 0;
+$default-form-field-margin: $default-padding 0;
+
+$error_border_color: #c49c9c;
+$error_text_color: #592e2e;
+$error_background_color: #efd3d3;

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

@@ -85,17 +85,28 @@ module Alchemy
 
       # Displays errors in a #errors div if any errors are present on the object.
       # Or redirects to the given redirect url.
+      #
+      # @param object [ActiveRecord::Base]
+      # @param redirect_url [String]
+      # @param flash_notice [String]
+      #
       def render_errors_or_redirect(object, redirect_url, flash_notice)
         if object.errors.empty?
           @redirect_url = redirect_url
           flash[:notice] = t(flash_notice)
-          render :action => :redirect
+          respond_to do |format|
+            format.js   { render :action => :redirect }
+            format.html { redirect_to @redirect_url }
+          end
         else
-          render_remote_errors(object)
+          respond_to do |format|
+            format.js   { render_remote_errors(object) }
+            format.html { render :action => (params[:action] == "update" ? :edit : :new) }
+          end
         end
       end
 
-      # Displays an unordered list of objects errors in an errors div.
+      # Renders an unordered list of objects errors in an errors div via javascript.
       #
       # Note: You have to have a hidden div with the id +#errors+ in your form, to make this work.
       #
@@ -103,8 +114,12 @@ module Alchemy
       #
       # Hint: If you use an alternative div, please use the +errors+ css class to get the correct styling.
       #
+      # @param object [ActiveRecord::Base]
+      # @param error_div_id [String]
+      #
       def render_remote_errors(object, error_div_id = nil)
         @error_div_id = error_div_id || '#errors'
+        @error_fields = object.errors.messages.keys.map { |f| "#{object.class.model_name.demodulize.underscore}_#{f}" }
         @errors = ("<ul>" + object.errors.full_messages.map { |e| "<li>#{e}</li>" }.join + "</ul>").html_safe
         render :action => :remote_errors
       end

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

@@ -40,13 +40,14 @@ module Alchemy
         Element.transaction do
           if @paste_from_clipboard = params[:paste_from_clipboard].present?
             @element = paste_element_from_clipboard
+            @cell = @element.cell
           else
             @element = Element.new_from_scratch(params[:element])
             if @page.can_have_cells?
               @cell = find_or_create_cell
               @element.cell = @cell
             end
-            @element.save!
+            @element.save
           end
           if @insert_at_top = @page.definition['insert_elements_at'] == 'top'
             @element.move_to_top
@@ -110,12 +111,8 @@ module Alchemy
         else
           element_with_cell_name = params[:element][:name]
         end
-        if element_with_cell_name.blank?
-          raise "No element with cell name given. Please provide the cell name after the element name (or id) seperated by #."
-        end
-        unless element_with_cell_name.include?('#')
-          return nil
-        end
+        return nil if element_with_cell_name.blank?
+        return nil unless element_with_cell_name.include?('#')
         cell_name = element_with_cell_name.split('#').last
         cell_definition = Cell.definition_for(cell_name)
         if cell_definition.blank?

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

@@ -53,13 +53,12 @@ module Alchemy
         if !params[:paste_from_clipboard].blank?
           source_page = Page.find(params[:paste_from_clipboard])
           @page = Page.copy(source_page, {
-            :name => params[:page][:name].blank? ? source_page.name + ' (' + t('Copy') + ')' : params[:page][:name],
-            :urlname => '',
-            :title => '',
             :parent_id => params[:page][:parent_id],
             :language => parent.language
           })
-          source_page.copy_children_to(@page) unless source_page.children.blank?
+          if source_page.children.any?
+            source_page.copy_children_to(@page)
+          end
         else
           @page = Page.create(params[:page])
         end

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

@@ -6,8 +6,6 @@ module Alchemy
       helper Alchemy::ResourcesHelper
       helper_method :resource_handler
 
-      rescue_from Exception, :with => :exception_handler
-
       before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
 
       def index
@@ -65,25 +63,10 @@ module Alchemy
 
     protected
 
-      def render_errors_or_redirect(object, redirect_url, flash_notice)
-        if object.errors.empty?
-          @redirect_url = redirect_url
-          flash[:notice] = t(flash_notice)
-          respond_to do |format|
-            format.js { render :action => :redirect }
-            format.html { redirect_to @redirect_url }
-          end
-        else
-          respond_to do |format|
-            format.js { render_remote_errors(object) }
-            format.html { render :action => :new }
-          end
-        end
-      end
-
       # Returns a translated +flash[:notice]+.
       # The key should look like "Modelname successfully created|updated|destroyed."
       def flash_notice_for_resource_action(action = params[:action])
+        return if resource_instance_variable.errors.any?
         case action.to_sym
         when :create
           verb = "created"

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

@@ -5,6 +5,8 @@ module Alchemy
       filter_access_to [:edit, :update, :destroy], :attribute_check => true, :load_method => :load_user, :model => Alchemy::User
       filter_access_to [:index, :new, :create], :attribute_check => false
 
+      before_filter :set_roles_and_genders, :except => [:index, :destroy]
+
       def index
         if !params[:query].blank?
           users = User.where([
@@ -22,8 +24,6 @@ module Alchemy
 
       def new
         @user = User.new
-        @user_roles = User::ROLES.map { |role| [User.human_rolename(role), role] }
-        @user_genders = User.genders_for_select
         render :layout => false
       end
 
@@ -44,8 +44,6 @@ module Alchemy
       end
 
       def edit
-        @user_roles = User::ROLES.map { |role| [User.human_rolename(role), role] }
-        @user_genders = User.genders_for_select
         render :layout => false
       end
 
@@ -71,12 +69,17 @@ module Alchemy
         render :action => :redirect
       end
 
-      protected
+    private
 
       def load_user
         @user = User.find(params[:id])
       end
 
+      def set_roles_and_genders
+        @user_roles = User::ROLES.map { |role| [User.human_rolename(role), role] }
+        @user_genders = User.genders_for_select
+      end
+
     end
   end
 end

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

@@ -49,7 +49,12 @@ module Alchemy
           <script type='text/javascript'>
             jQuery(function($) {
               Alchemy.Tinymce.customInits = [];"
-        Alchemy::Tinymce.custom_config_contents.each do |content|
+        custom_config_contents = Alchemy::Tinymce.custom_config_contents
+        content_names = custom_config_contents.collect{ |c| c['name'] }
+        if content_names.uniq.length != content_names.length
+          raise "Duplicated content names with tinymce setting in elements.yml found. Please rename these contents."
+        end
+        custom_config_contents.each do |content|
           next unless content['settings']['tinymce']
           config = Alchemy::Tinymce.init.merge(content['settings']['tinymce'].symbolize_keys)
           config = config.collect { |key, value| "#{key} : #{value.to_json}" }.join(', ')

data/app/models/alchemy/content.rb

@@ -6,6 +6,7 @@ module Alchemy
       :element_id,
       :essence_id,
       :essence_type,
+      :ingredient,
       :name,
       :position
     )
@@ -35,6 +36,8 @@ module Alchemy
 
       # Creates a new Content as descriped in the elements.yml file
       def create_from_scratch(element, essences_hash)
+        # If no name given, we can create the content from essence type.
+        # Used in picture gallery
         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])
@@ -43,6 +46,7 @@ module Alchemy
             'type' => essences_hash[:essence_type],
             'name' => "#{essences_hash[:essence_type].classify.demodulize.underscore}_#{essences_of_same_type.count + 1}"
           }
+        # Normal way to create
         else
           description = element.content_description_for(essences_hash[:name])
           description = element.available_content_description_for(essences_hash[:name]) if description.blank?
@@ -151,8 +155,14 @@ module Alchemy
 
     # Gets the ingredient from essence
     def ingredient
-      return nil if self.essence.nil?
-      self.essence.ingredient
+      return nil if essence.nil?
+      essence.ingredient
+    end
+
+    # Sets the ingredient from essence
+    def ingredient=(value)
+      raise "No essence found" if essence.nil?
+      essence.ingredient = value
     end
 
     # Calls essence.update_attributes. Called from +Alchemy::Element#save_contents+
@@ -232,11 +242,13 @@ module Alchemy
     # Creates self.essence from description.
     def create_essence!(description)
       essence_class = self.class.normalize_essence_type(description['type']).constantize
+      attributes = {
+        :ingredient => default_or_lorem_ipsum(description['default'])
+      }
       if description['type'] == "EssenceRichtext" || description['type'] == "EssenceText"
-        essence = essence_class.create(:do_not_index => !description['do_not_index'].nil?)
-      else
-        essence = essence_class.create
+        attributes.merge!(:do_not_index => !description['do_not_index'].nil?)
       end
+      essence = essence_class.create(attributes)
       if essence
         self.essence = essence
         save!
@@ -245,5 +257,14 @@ module Alchemy
       end
     end
 
+    def default_or_lorem_ipsum(default)
+      return if default.nil?
+      if default.is_a? Symbol
+        I18n.t(default, :scope => :default_content_texts)
+      else
+        default
+      end
+    end
+
   end
 end

data/app/models/alchemy/element.rb

@@ -157,6 +157,7 @@ module Alchemy
         differences.stringify_keys!
         attributes = source.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY).merge(differences)
         element = self.create!(attributes.merge(:create_contents_after_create => false))
+        element.tag_list = source.tag_list
         source.contents.each do |content|
           new_content = Content.copy(content, :element_id => element.id)
           new_content.move_to_bottom

data/app/models/alchemy/essence_richtext.rb

@@ -22,7 +22,7 @@ module Alchemy
 
     before_save :strip_content
 
-    private
+  private
 
     def strip_content
       self.stripped_body = strip_tags(self.body)

data/app/models/alchemy/page.rb

@@ -11,7 +11,7 @@ module Alchemy
       :locked => false,
       :locked_by => nil
     }
-    SKIPPED_ATTRIBUTES_ON_COPY = %w(id updated_at created_at creator_id updater_id lft rgt depth cached_tag_list)
+    SKIPPED_ATTRIBUTES_ON_COPY = %w(id updated_at created_at creator_id updater_id lft rgt depth urlname cached_tag_list)
 
     attr_accessible(
       :do_not_autogenerate,
@@ -94,6 +94,135 @@ module Alchemy
     scope :flushables, not_locked.published.contentpages
     scope :searchables, not_restricted.published.contentpages
 
+    # Class methods
+    #
+    class << self
+
+      alias_method :rootpage, :root
+
+      # @return the language root page for given language id.
+      # @param language_id [Fixnum]
+      #
+      def language_root_for(language_id)
+        self.language_roots.find_by_language_id(language_id)
+      end
+
+      # Creates a copy of source
+      #
+      # Also copies all elements included in source.
+      #
+      # === Note:
+      # It prevents the element auto generator from running.
+      #
+      # @param source [Alchemy::Page]
+      # @param differences [Hash]
+      #
+      # @return [Alchemy::Page]
+      #
+      def copy(source, differences = {})
+        source.attributes.stringify_keys!
+        differences.stringify_keys!
+        attributes = source.attributes.merge(differences)
+        attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY)
+        attributes.merge!('name' => "#{source.name} (#{I18n.t('Copy')})")
+        page = self.new(attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY))
+        page.tag_list = source.tag_list
+        if page.save!
+          copy_cells(source, page)
+          copy_elements(source, page)
+          page
+        end
+      end
+
+      # Copy page cells
+      #
+      # @param source [Alchemy::Page]
+      # @param target [Alchemy::Page]
+      # @return [Array]
+      #
+      def copy_cells(source, target)
+        new_cells = []
+        source.cells.each do |cell|
+          new_cells << Cell.create(:name => cell.name, :page_id => target.id)
+        end
+        new_cells
+      end
+
+      # Copy page elements
+      #
+      # @param source [Alchemy::Page]
+      # @param target [Alchemy::Page]
+      # @return [Array]
+      #
+      def copy_elements(source, target)
+        new_elements = []
+        source.elements.each do |element|
+          # detect cell for element
+          if element.cell
+            cell = target.cells.detect { |c| c.name == element.cell.name }
+          else
+            cell = nil
+          end
+          # if cell is nil also pass nil to element.cell_id
+          new_element = Element.copy(element, :page_id => target.id, :cell_id => (cell.blank? ? nil : cell.id))
+          # move element to bottom of the list
+          new_element.move_to_bottom
+          new_elements << new_element
+        end
+        new_elements
+      end
+
+      def layout_root_for(language_id)
+        where({:parent_id => Page.root.id, :layoutpage => true, :language_id => language_id}).limit(1).first
+      end
+
+      def find_or_create_layout_root_for(language_id)
+        layoutroot = layout_root_for(language_id)
+        return layoutroot if layoutroot
+        language = Language.find(language_id)
+        layoutroot = Page.new({
+          :name => "Layoutroot for #{language.name}",
+          :layoutpage => true,
+          :language => language,
+          :do_not_autogenerate => true
+        })
+        if layoutroot.save(:validate => false)
+          layoutroot.move_to_child_of(Page.root)
+          return layoutroot
+        else
+          raise "Layout root for #{language.name} could not be created"
+        end
+      end
+
+      def all_from_clipboard(clipboard)
+        return [] if clipboard.blank?
+        self.find_all_by_id(clipboard.collect { |i| i[:id] })
+      end
+
+      def all_from_clipboard_for_select(clipboard, language_id, layoutpage = false)
+        return [] if clipboard.blank?
+        clipboard_pages = self.all_from_clipboard(clipboard)
+        allowed_page_layouts = Alchemy::PageLayout.selectable_layouts(language_id, layoutpage)
+        allowed_page_layout_names = allowed_page_layouts.collect { |p| p['name'] }
+        clipboard_pages.select { |cp| allowed_page_layout_names.include?(cp.page_layout) }
+      end
+
+      def link_target_options
+        options = [
+          [I18n.t('default', :scope => :link_target_options), '']
+        ]
+        link_target_options = Config.get(:link_target_options)
+        link_target_options.each do |option|
+          options << [I18n.t(option, :scope => :link_target_options), option]
+        end
+        options
+      end
+
+    end
+
+    # Instance methods
+    #
+
     # Finds selected elements from page.
     #
     # Options are:
@@ -385,39 +514,6 @@ module Alchemy
       self.children.where(:public => true).limit(1).first
     end
 
-    def self.language_root_for(language_id)
-      self.language_roots.find_by_language_id(language_id)
-    end
-
-    # Creates a copy of source (a Page object) and does a copy of all elements depending to source.
-    # You can pass any kind of Page#attributes as a difference to source.
-    # Notice: It prevents the element auto_generator from running.
-    def self.copy(source, differences = {})
-      source.attributes.stringify_keys!
-      differences.stringify_keys!
-      attributes = source.attributes.merge(differences)
-      attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY)
-      page = self.new(attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY))
-      if page.save
-        # copy the page´s cells
-        source.cells.each do |cell|
-          new_cell = Cell.create(:name => cell.name, :page_id => page.id)
-        end
-        # copy the page´s elements
-        source.elements.each do |element|
-          # detect cell for element
-          # if cell is nil also pass nil to element.cell_id
-          cell = nil
-          cell = page.cells.detect { |c| c.name == element.cell.name } if element.cell
-          new_element = Element.copy(element, :page_id => page.id, :cell_id => (cell.blank? ? nil : cell.id))
-          new_element.move_to_bottom
-        end
-        return page
-      else
-        raise "`#{page.name}`: #{page.errors.full_messages}"
-      end
-    end
-
     # Gets the language_root page for page
     def get_language_root
       return self if self.language_root
@@ -429,50 +525,12 @@ module Alchemy
       return page
     end
 
-    def self.layout_root_for(language_id)
-      where({:parent_id => Page.root.id, :layoutpage => true, :language_id => language_id}).limit(1).first
-    end
-
-    def self.find_or_create_layout_root_for(language_id)
-      layoutroot = layout_root_for(language_id)
-      return layoutroot if layoutroot
-      language = Language.find(language_id)
-      layoutroot = Page.new({
-        :name => "Layoutroot for #{language.name}",
-        :layoutpage => true,
-        :language => language,
-        :do_not_autogenerate => true
-      })
-      if layoutroot.save(:validate => false)
-        layoutroot.move_to_child_of(Page.root)
-        return layoutroot
-      else
-        raise "Layout root for #{language.name} could not be created"
-      end
-    end
-
-    def self.all_from_clipboard(clipboard)
-      return [] if clipboard.blank?
-      self.find_all_by_id(clipboard.collect { |i| i[:id] })
-    end
-
-    def self.all_from_clipboard_for_select(clipboard, language_id, layoutpage = false)
-      return [] if clipboard.blank?
-      clipboard_pages = self.all_from_clipboard(clipboard)
-      allowed_page_layouts = Alchemy::PageLayout.selectable_layouts(language_id, layoutpage)
-      allowed_page_layout_names = allowed_page_layouts.collect { |p| p['name'] }
-      clipboard_pages.select { |cp| allowed_page_layout_names.include?(cp.page_layout) }
-    end
-
     def copy_children_to(new_parent)
       self.children.each do |child|
         next if child == new_parent
         new_child = Page.copy(child, {
           :language_id => new_parent.language_id,
-          :language_code => new_parent.language_code,
-          :name => child.name + ' (' + I18n.t('Copy') + ')',
-          :urlname => child.redirects_to_external? ? child.urlname : '',
-          :title => ''
+          :language_code => new_parent.language_code
         })
         new_child.move_to_child_of(new_parent)
         child.copy_children_to(new_child) unless child.children.blank?
@@ -488,17 +546,6 @@ module Alchemy
       cells.any?
     end
 
-    def self.link_target_options
-      options = [
-        [I18n.t('default', :scope => :link_target_options), '']
-      ]
-      link_target_options = Config.get(:link_target_options)
-      link_target_options.each do |option|
-        options << [I18n.t(option, :scope => :link_target_options), option]
-      end
-      options
-    end
-
     def locker_name
       return I18n.t('unknown') if self.locker.nil?
       self.locker.name
@@ -513,10 +560,6 @@ module Alchemy
       rootpage? || (self.parent_id == Page.root.id && !self.language_root?)
     end
 
-    def self.rootpage
-      self.root
-    end
-
     def cache_key(request = nil)
       "alchemy/#{language_code}/#{urlname}"
     end