alchemy_cms 2.3.2 → 2.4.beta2

data/app/helpers/alchemy/elements_helper.rb

@@ -15,7 +15,7 @@ module Alchemy
     #   :fallback => {                       # You can use the fallback option as an override. So you can take elements from a glo´bal laout page and only if the user adds an element on current page the local one gets rendered.
     #     :for => 'ELEMENT_NAME',            # The name of the element the fallback is for
     #     :with => 'ELEMENT_NAME',           # (OPTIONAL) the name of element to fallback with
-    #     :from => 'PAGE_LAYOUT'             # The page_layout name from the global page the fallback elements lie on. I.E 'left_column'
+    #     :from => String || Page            # Pass a page_layout name from a page the fallback elements lie on or pass the page object.
     #   }                                    #
     #   :sort_by => Content#name             # A Content name to sort the elements by
     #   :reverse => boolean                  # Reverse the rendering order
@@ -55,13 +55,18 @@ module Alchemy
         else
           all_elements = page.find_elements(options)
         end
-        unless options[:sort_by].blank?
+        if options[:sort_by].present?
           all_elements = all_elements.sort_by { |e| e.contents.detect { |c| c.name == options[:sort_by] }.ingredient }
         end
         element_string = ""
         if options[:fallback]
-          unless all_elements.detect { |e| e.name == options[:fallback][:for] }
-            if from = Page.where(:page_layout => options[:fallback][:from]).with_language(session[:language_id]).first
+          if all_elements.detect { |e| e.name == options[:fallback][:for] }.blank?
+            if options[:fallback][:from].class.name == 'Alchemy::Page'
+              from = options[:fallback][:from]
+            else
+              from = Page.not_restricted.where(:page_layout => options[:fallback][:from]).with_language(session[:language_id]).first
+            end
+            if from
               all_elements += from.elements.named(options[:fallback][:with].blank? ? options[:fallback][:for] : options[:fallback][:with])
             end
           end
@@ -163,7 +168,7 @@ module Alchemy
 
     # Returns the full url containing host, page and anchor for the given element
     def full_url_for_element(element)
-      "http://" + request.env["HTTP_HOST"] + "/" + element.page.urlname + "##{element.name}_#{element.id}"
+      "#{current_server}/#{element.page.urlname}##{element_dom_id(element)}"
     end
 
   end

data/app/helpers/alchemy/pages_helper.rb

@@ -3,7 +3,6 @@ module Alchemy
 
     include Alchemy::BaseHelper
     include Alchemy::ElementsHelper
-    include Alchemy::PicturesHelper
     include Alchemy::UrlHelper
 
     def render_classes(classes=[])
@@ -479,7 +478,7 @@ module Alchemy
               Alchemy.loadAlchemyMenuBar({
                 page_id: #{@page.id},
                 route: '#{Alchemy.mount_point}',
-                locale: '#{current_user.language || ::I18n.default_locale}'
+                locale: '#{current_user.language}'
               });
             } catch(e) {
               if(console){console.log(e)}

data/app/helpers/alchemy/url_helper.rb

@@ -5,14 +5,6 @@
 module Alchemy
   module UrlHelper
 
-    # Returns the correct params-hash for passing to show_page_path
-    def show_page_path_params(page, optional_params={})
-      url_params = {:level1 => nil, :level2 => nil, :level3 => nil, :urlname => page.urlname}
-      url_params.update(optional_params)
-      url_params.update(params_for_nested_url(page)) if configuration(:url_nesting)
-      multi_language? ? url_params.update(:lang => page.language_code) : url_params
-    end
-
     # Returns the path for rendering an alchemy page
     def show_alchemy_page_path(page, optional_params={})
       alchemy.show_page_path(show_page_path_params(page, optional_params))
@@ -23,22 +15,6 @@ module Alchemy
       alchemy.show_page_url(show_page_path_params(page, optional_params))
     end
 
-    # Returns the correct params-hash for passing to show_picture_path
-    def show_picture_path_params(picture, optional_params={})
-      url_params = {:id => picture.id, :name => picture.urlname, :format => configuration(:image_output_format)}
-      url_params.update(optional_params.update({:crop => optional_params[:crop] ? 'crop' : nil}))
-    end
-
-    # Returns the path for rendering an alchemy picture
-    def show_alchemy_picture_path(picture, optional_params={})
-      alchemy.show_picture_path(show_picture_path_params(picture, optional_params))
-    end
-
-    # Returns the url for rendering an alchemy picture
-    def show_alchemy_picture_url(picture, optional_params={})
-      alchemy.show_picture_url(show_picture_path_params(picture, optional_params))
-    end
-
     # This helper returns a path for use inside a link_to helper.
     #
     # You may pass a page_layout or an urlname.
@@ -63,5 +39,48 @@ module Alchemy
       alchemy.show_page_path({:urlname => urlname, :lang => multi_language? ? session[:language_code] : nil}.merge(options.except(:page_layout, :urlname, :lang)))
     end
 
+    # This helper returns a path to picture for use inside a image_tag helper.
+    #
+    # Any additional options are passed to the url_helper, so you can add arguments to your url.
+    #
+    # Example:
+    #
+    #   <%= image_tag show_alchemy_picture_path(picture, :size => '320x200', :format => :png) %>
+    #
+    def show_alchemy_picture_path(picture, optional_params={})
+      alchemy.show_picture_path(show_picture_path_params(picture, optional_params))
+    end
+
+    # This helper returns an url to picture for use inside a image_tag helper.
+    #
+    # Any additional options are passed to the url_helper, so you can add arguments to your url.
+    #
+    # Example:
+    #
+    #   <%= image_tag show_alchemy_picture_url(picture, :size => '320x200', :format => :png) %>
+    #
+    def show_alchemy_picture_url(picture, optional_params={})
+      alchemy.show_picture_url(show_picture_path_params(picture, optional_params))
+    end
+
+    # Returns the correct params hash for passing to show_picture_path
+    def show_picture_path_params(picture, optional_params={})
+      url_params = {
+        :id => picture.id,
+        :name => picture.urlname,
+        :format => configuration(:image_output_format),
+        :sh => picture.security_token(optional_params)
+      }
+      url_params.update(optional_params.update({:crop => optional_params[:crop] ? 'crop' : nil}))
+    end
+
+    # Returns the correct params-hash for passing to show_page_path
+    def show_page_path_params(page, optional_params={})
+      url_params = {:level1 => nil, :level2 => nil, :level3 => nil, :urlname => page.urlname}
+      url_params.update(optional_params)
+      url_params.update(params_for_nested_url(page)) if configuration(:url_nesting)
+      multi_language? ? url_params.update(:lang => page.language_code) : url_params
+    end
+
   end
 end

data/app/models/alchemy/element.rb

@@ -28,7 +28,7 @@ module Alchemy
 
     attr_accessor :create_contents_after_create
 
-    after_create :create_contents, :unless => Proc.new { |m| m.create_contents_after_create == false }
+    after_create :create_contents, :unless => proc { |e| e.create_contents_after_create == false }
 
     scope :trashed, where(:position => nil).order('updated_at DESC')
     scope :not_trashed, where(Element.arel_table[:position].not_eq(nil))
@@ -44,16 +44,16 @@ module Alchemy
 
       # Builds a new element as described in +/config/alchemy/elements.yml+
       def new_from_scratch(attributes)
-        attributes.stringify_keys!
-        return new if attributes['name'].blank?
+        attributes = attributes.dup.symbolize_keys
+        return new if attributes[:name].blank?
         return nil if descriptions.blank?
         # clean the name from cell name
-        attributes['name'] = attributes['name'].split('#').first
-        element_scratch = descriptions.detect { |m| m["name"] == attributes['name'] }
+        attributes[:name] = attributes[:name].split('#').first
+        element_scratch = descriptions.detect { |el| el['name'] == attributes[:name] }
         if element_scratch
-          new(element_scratch.except(*FORBIDDEN_DEFINITION_ATTRIBUTES).merge(attributes))
+          new(element_scratch.merge(attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
         else
-          raise "Element description for #{attributes['name']} not found. Please check your elements.yml"
+          raise "Element description for #{attributes[:name]} not found. Please check your elements.yml"
         end
       end
 
@@ -81,6 +81,9 @@ module Alchemy
           raise LoadError, "Could not find elements.yml file! Please run: rails generate alchemy:scaffold"
         end
         element_definitions
+      rescue TypeError => e
+        Rails.logger.warn "\n++++ WARNING: Your elements.yml is empty.\n"
+        []
       end
       alias_method :definitions, :descriptions
 
@@ -153,8 +156,7 @@ module Alchemy
           "created_at",
           "updated_at",
           "creator_id",
-          "updater_id",
-          "cell_id"
+          "updater_id"
         ).merge(differences.stringify_keys)
         element = self.create!(attributes.merge(:create_contents_after_create => false))
         source.contents.each do |content|
@@ -309,7 +311,12 @@ module Alchemy
 
     # returns the description of the element with my name in element.yml
     def description
-      self.class.descriptions.detect { |d| d['name'] == self.name }
+      description = self.class.descriptions.detect { |d| d['name'] == self.name }
+      if description.blank?
+        raise "Could not find element definition for #{self.name}. Please check your elements.yml"
+      else
+        return description
+      end
     end
     alias_method :definition, :description
 
@@ -459,12 +466,12 @@ module Alchemy
       essence_errors.each do |content_name, errors|
         errors.each do |error|
           messages << I18n.t(error,
-                             :scope => [:content_validations, self.name, content_name],
-                             :default => [
-                               "alchemy.content_validations.fields.#{content_name}.#{error}".to_sym,
-                               "alchemy.content_validations.errors.#{error}".to_sym
-                             ],
-                             :field => Content.translated_label_for(content_name)
+            :scope => [:content_validations, self.name, content_name],
+            :default => [
+              "alchemy.content_validations.fields.#{content_name}.#{error}".to_sym,
+              "alchemy.content_validations.errors.#{error}".to_sym
+            ],
+            :field => Content.translated_label_for(content_name)
           )
         end
       end

data/app/models/alchemy/page.rb

@@ -58,6 +58,8 @@ module Alchemy
     before_save :inherit_restricted_status, :if => proc { |page| !page.systempage? && page.parent && page.parent.restricted? }
     after_create :create_cells, :unless => :systempage?
     after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
+    after_update :trash_not_allowed_elements, :if => :page_layout_changed?
+    after_update :autogenerate_elements, :if => :page_layout_changed?
 
     scope :language_roots, where(:language_root => true)
     scope :layoutpages, where(:layoutpage => true)
@@ -66,9 +68,8 @@ module Alchemy
     scope :not_locked, where(:locked => false)
     scope :visible, where(:visible => true)
     scope :published, where(:public => true)
-    scope :accessible, where(:restricted => false)
-    scope :restricted, where(:restricted => true)
     scope :not_restricted, where(:restricted => false)
+    scope :restricted, where(:restricted => true)
     scope :public_language_roots, lambda {
       where(:language_root => true, :language_code => Language.all_codes_for_published, :public => true)
     }
@@ -339,7 +340,6 @@ module Alchemy
         description
       end
     end
-
     alias_method :definition, :layout_description
 
     def cell_definitions
@@ -562,21 +562,27 @@ module Alchemy
     # If the page has cells, it looks if there are elements to generate.
     #
     def autogenerate_elements
+      elements_already_on_page = self.elements.available.collect(&:name)
       elements = self.layout_description["autogenerate"]
       if elements.present?
         elements.each do |element|
-          if self.has_cells? && (cell_definition = cell_definitions.detect { |c| c['elements'].include?(element) })
-            cell = self.cells.find_by_name(cell_definition['name'])
-            if cell
-              attributes = {'page_id' => self.id, 'cell_id' => cell.id, 'name' => element}
-            else
-              raise "Cell not found for page #{self.inspect}"
-            end
-          else
-            attributes = {'page_id' => self.id, 'name' => element}
-          end
-          Element.create_from_scratch(attributes)
+          next if elements_already_on_page.include?(element)
+          Element.create_from_scratch(attributes_for_element_name(element))
+        end
+      end
+    end
+
+    # Returns a hash of attributes for given element name
+    def attributes_for_element_name(element)
+      if self.has_cells? && (cell_definition = cell_definitions.detect { |c| c['elements'].include?(element) })
+        cell = self.cells.find_by_name(cell_definition['name'])
+        if cell
+          return {:page_id => self.id, :cell_id => cell.id, :name => element}
+        else
+          raise "Cell not found for page #{self.inspect}"
         end
+      else
+        return {:page_id => self.id, :name => element}
       end
     end
 
@@ -592,5 +598,10 @@ module Alchemy
       end
     end
 
+    # Trashes all elements that are not allowed for this page_layout.
+    def trash_not_allowed_elements
+      elements.select { |e| !definition['elements'].include?(e.name) }.map(&:trash)
+    end
+
   end
 end

data/app/models/alchemy/picture.rb

@@ -141,5 +141,29 @@ module Alchemy
       pages.any? && pages.not_restricted.blank?
     end
 
+    # Returns a security token for signed picture rendering requests.
+    #
+    # Pass a params hash containing:
+    #
+    #   size       [String]  (Optional)
+    #   crop       [Boolean] (Optional)
+    #   crop_from  [String]  (Optional)
+    #   crop_size  [String]  (Optional)
+    #
+    # to sign them.
+    #
+    def security_token(params = {})
+      @params = params.stringify_keys
+      @params.update({'crop' => @params['crop'] ? 'crop' : nil})
+      Digest::SHA1.hexdigest(secured_params)[0..15]
+    end
+
+  private
+
+    def secured_params
+      secret = Rails.configuration.secret_token
+      [id, @params['size'], @params['crop'], @params['crop_from'], @params['crop_size'], secret].join('-')
+    end
+
   end
 end

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

@@ -17,7 +17,7 @@
       :locals => @locals
     )
   ) %>');
-  Alchemy.enableButton('.disabled.button');
+  Alchemy.Buttons.enable();
   Alchemy.growl('<%= t("Successfully added content") % {:content => @content.name_for_label} %>')
 
 <% end %>

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

@@ -6,7 +6,7 @@
   </div>
 <%- else -%>
   <%= form_for [:admin, @element], :remote => true, :class => "add_element_content" do |form| %>
-    <div id="errors" style="display: none"></div>
+    <div id="errors"></div>
     <table>
       <tr>
         <td class="label">

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

@@ -1,14 +1,22 @@
 var $el;
+var $element_area = $('#cell_<%= @cell_name -%>');
+var element_html = '<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>';
+
 <% if @cutted_element_id %>
 $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
 <% end %>
 
 <% if @page.can_have_cells? %>
-Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
+Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
+<% end %>
+
+<% if @insert_at_top %>
+$element_area.prepend(element_html);
+<% else %>
+$element_area.append(element_html);
 <% end %>
 
-$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
-$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
+$element_area.sortable('refresh');
 Alchemy.growl('<%= t("successfully_added_element") -%>');
 Alchemy.closeCurrentWindow();
 

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

@@ -36,7 +36,7 @@
 
       Alchemy.ElementDirtyObserver($el);
       Alchemy.Datepicker('input[type="date"]', $el);
-      Alchemy.ButtonObserver('button.button', $el);
+      Alchemy.Buttons.observe($el);
       Alchemy.overlayObserver("#element_<%= @element.id -%>");
 
     <% end %>

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

@@ -11,7 +11,7 @@
   </div>
   <div id="paste_element_tab">
     <%= form_for([:admin, @element], :remote => true, :id => 'paste_element_form') do |f| %>
-      <div id="errors" style="display: none"></div>
+      <div id="paste_element_errors" class="errors"></div>
       <table>
         <tr>
           <td class="label">

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

@@ -19,6 +19,6 @@ $('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @
 $("#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.enableButton('button.button', $el);
+Alchemy.Buttons.enable($el);
 
 <% end %>

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

@@ -30,7 +30,7 @@
 
 <div id="jscropper">
   <%= image_tag(
-    alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname, :format => @options[:format] ),
+    alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname, :format => @options[:format], :sh => @essence_picture.picture.security_token),
     :id => 'imageToCrop',
     :onload => "Alchemy.ImageCropper.init(
       [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],

data/app/views/alchemy/admin/languages/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form_for [alchemy, :admin, @language], :remote => true, :html => {:style => 'width: 403px'} do |f| %>
-  <div id="errors" style="display: none"></div>
+  <div id="errors"></div>
   <table>
     <tr>
       <td class="label"><%= f.label :name %></td>

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

@@ -1,7 +1,7 @@
 <%= form_for([:admin, @page], :remote => true, :html => {:id => 'new_page_form'}) do |f| %>
   <%= f.hidden_field(:parent_id) %>
   <%= f.hidden_field(:layoutpage) %>
-  <div id="errors" style="display:none"></div>
+  <div id="errors"></div>
   <table id="new_page_form">
     <tr>
       <td class="label">

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

@@ -31,7 +31,7 @@
         alchemy.configure_admin_page_path(page),
         {
           :title => t('edit_page_properties'),
-          :size => page.redirects_to_external? ? '410x270' : '410x660'
+          :size => page.redirects_to_external? ? '410x270' : '410x655'
         },
         :class => '',
         :title => t('edit_page_properties')

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

@@ -1,9 +1,11 @@
 <%= form_for([:admin, @page], :remote => true) do |f| %>
-  <div id="errors" style="display: none"></div>
+  <div id="errors"></div>
   <table id="page_names">
     <tr>
       <td class="label"><%= t("page_type") %>: </td>
-      <td class="value long"><p><%= @page.layout_display_name %></p></td>
+      <td class="select">
+        <%= f.select('page_layout', @page_layouts, {}, {:class => 'alchemy_selectbox long'}) %>
+      </td>
     </tr>
     <%- unless @page.layoutpage -%>
     <tr>
@@ -64,10 +66,12 @@
     </tr>
     <%- end -%>
     <tr>
-      <td colspan="2" class="right"><%= f.button t("save"), :class => 'button' %></td>
+      <td colspan="2" class="submit">
+        <p class="foot_note">
+          *<%= t('pages.update.comma_seperated') %>
+        </p>
+        <%= f.button t("save"), :class => 'button' %>
+      </td>
     </tr>
   </table>
-  <p class="foot_note">
-    *<%= t('pages.update.comma_seperated') %>
-  </p>
 <% end %>