alchemy_cms 2.2.4 → 2.3.rc5

data/app/models/alchemy/language/code.rb

@@ -10,10 +10,13 @@ module Alchemy::Language::Code
   end
 
   module ClassMethods
+
     def find_by_code(code)
       codes = code.split('-')
-      codes << nil if codes.length == 1
+      codes << '' if codes.length == 1
       find_by_language_code_and_country_code *codes
     end
+
   end
+
 end

data/app/models/alchemy/message.rb

@@ -12,13 +12,27 @@
 module Alchemy
   class Message
 
-    @@config = Config.get(:mailer)
-
     extend ::ActiveModel::Naming
     include ::ActiveModel::Validations
     include ::ActiveModel::Conversion
     include ::ActiveModel::MassAssignmentSecurity
 
+    def self.attr_accessor(*vars)
+      @attributes ||= {}
+      vars.map { |v| @attributes[v] = nil}
+      super(*vars)
+    end
+
+    def self.attributes
+      @attributes
+    end
+
+    def attributes
+      self.class.attributes
+    end
+
+    @@config = Config.get(:mailer)
+
     attr_accessor :contact_form_id, :ip
     attr_accessible :contact_form_id
 
@@ -39,8 +53,10 @@ module Alchemy
     end
 
     def initialize(attributes = {})
+      @attributes ||= {}
       attributes.keys.each do |a|
         send("#{a}=", attributes[a])
+        @attributes[a] = attributes[a]
       end
     end
 
@@ -48,7 +64,7 @@ module Alchemy
       false
     end
 
-    private
+  private
 
     def email_is_filled #:nodoc:
       !email.blank?

data/app/models/alchemy/page.rb

@@ -56,8 +56,8 @@ module Alchemy
     before_save :set_language_code, :unless => :systempage?
     before_save :set_restrictions_to_child_pages, :if => proc { |page| !page.systempage? && page.restricted_changed? }
     before_save :inherit_restricted_status, :if => proc { |page| !page.systempage? && page.parent && page.parent.restricted? }
-    after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
     after_create :create_cells, :unless => :systempage?
+    after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
 
     scope :language_roots, where(:language_root => true)
     scope :layoutpages, where(:layoutpage => true)
@@ -141,12 +141,7 @@ module Alchemy
     end
 
     def elements_grouped_by_cells
-      group = ::ActiveSupport::OrderedHash.new
-      self.cells.each { |cell| group[cell] = cell.elements.not_trashed }
-      if element_names_not_in_cell.any?
-        group[Cell.new({:name => 'for_other_elements'})] = elements.not_trashed.not_in_cell
-      end
-      return group
+      elements.not_trashed.in_cell.group_by(&:cell)
     end
 
     def element_names_from_cells
@@ -161,27 +156,25 @@ module Alchemy
     # Options:
     # => :restricted => boolean (standard: nil) - next restricted page (true), skip restricted pages (false), ignore restriction (nil)
     # => :public => boolean (standard: true) - next public page (true), skip public pages (false)
-    def previous_page(options = {})
-      default_options = {
+    def previous(options = {})
+      next_or_previous(:previous, {
         :restricted => nil,
         :public => true
-      }
-      options = default_options.merge(options)
-      find_next_or_previous_page("previous", options)
+      }.merge(options))
     end
+    alias_method :previous_page, :previous
 
     # Finds the next page on the same structure level. Otherwise it returns nil.
     # Options:
     # => :restricted => boolean (standard: nil) - next restricted page (true), skip restricted pages (false), ignore restriction (nil)
     # => :public => boolean (standard: true) - next public page (true), skip public pages (false)
-    def next_page(options = {})
-      default_options = {
+    def next(options = {})
+      next_or_previous(:next, {
         :restricted => nil,
         :public => true
-      }
-      options = default_options.merge(options)
-      find_next_or_previous_page("next", options)
+      }.merge(options))
     end
+    alias_method :next_page, :next
 
     def find_first_public(page)
       if (page.public == true)
@@ -372,7 +365,7 @@ module Alchemy
 
     def set_restrictions_to_child_pages
       descendants.each do |child|
-        child.update_attribute(:restricted, self.restricted?)
+        child.update_attributes(:restricted => self.restricted?)
       end
     end
 
@@ -427,7 +420,7 @@ module Alchemy
         end
         return page
       else
-        raise page.errors.full_messages
+        raise "`#{page.name}`: #{page.errors.full_messages}"
       end
     end
 
@@ -451,11 +444,11 @@ module Alchemy
       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
-                            })
+        :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
@@ -536,23 +529,22 @@ module Alchemy
 
   private
 
-    def find_next_or_previous_page(direction = "next", options = {})
-      if direction == "previous"
-        step_direction = ["pages.lft < ?", self.lft]
+    def next_or_previous(direction = :next, options = {})
+      pages = self.class.scoped
+      if direction == :previous
+        step_direction = ["#{self.class.table_name}.lft < ?", self.lft]
         order_direction = "lft DESC"
       else
-        step_direction = ["pages.lft > ?", self.lft]
+        step_direction = ["#{self.class.table_name}.lft > ?", self.lft]
         order_direction = "lft"
       end
-      conditions = Page.merge_conditions(
-        {:parent_id => self.parent_id},
-        {:public => options[:public]},
-        step_direction
-      )
+      pages = pages.where(:public => options[:public])
+      pages = pages.where(:parent_id => self.parent_id)
+      pages = pages.where(step_direction)
       if !options[:restricted].nil?
-        conditions = Page.merge_conditions(conditions, {:restricted => options[:restricted]})
+        pages = pages.where(:restricted => options[:restricted])
       end
-      return Page.where(conditions).order(order_direction).limit(1)
+      pages.order(order_direction).limit(1).first
     end
 
     # Converts the given nbame into an url friendly string
@@ -563,14 +555,27 @@ module Alchemy
       return url_name
     end
 
-    # Looks in the layout_descripion, if there are elements to autogenerate.
-    # If so, it generates them.
+    # Looks in the page_layout descripion, if there are elements to autogenerate.
+    #
+    # And if so, it generates them.
+    #
+    # If the page has cells, it looks if there are elements to generate.
+    #
     def autogenerate_elements
       elements = self.layout_description["autogenerate"]
-      unless (elements.blank?)
+      if elements.present?
         elements.each do |element|
-          element = Element.create_from_scratch({'page_id' => self.id, 'name' => element})
-          element.move_to_bottom if 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)
         end
       end
     end

data/app/models/alchemy/picture.rb

@@ -1,6 +1,11 @@
 module Alchemy
   class Picture < ActiveRecord::Base
 
+    has_many :essence_pictures, :class_name => 'Alchemy::EssencePicture', :foreign_key => 'picture_id'
+    has_many :contents, :through => :essence_pictures
+    has_many :elements, :through => :contents
+    has_many :pages, :through => :elements
+
     acts_as_fleximage do
       image_directory 'uploads/pictures'
       image_storage_format Config.get(:image_store_format).to_sym
@@ -15,18 +20,30 @@ module Alchemy
       end
     end
 
+    acts_as_taggable
+
     attr_accessible(
       :image_file,
       :image_filename,
       :image_height,
       :image_width,
-      :name
+      :name,
+      :upload_hash,
+      :tag_list
     )
 
     stampable(:stamper_class_name => 'Alchemy::User')
 
+    scope :recent, where("#{self.table_name}.created_at > ?", Time.now-24.hours).order(:created_at)
+
     def self.find_paginated(params, per_page)
-      Picture.where("name LIKE '%#{params[:query]}%'").page(params[:page] || 1).per(per_page).order(:name)
+      Picture.where("name LIKE ?", "%#{params[:query]}%").page(params[:page] || 1).per(per_page).order(:name)
+    end
+
+    def self.last_upload
+      last_picture = Picture.last
+      return Picture.scoped unless last_picture
+      Picture.where(:upload_hash => last_picture.upload_hash)
     end
 
     # Returning the filepath relative to Rails.root public folder.
@@ -119,5 +136,10 @@ module Alchemy
       "#{new_x.round}x#{new_y.round}"
     end
 
+    # Checks if the picture is restricted, because it is attached on restricted pages only
+    def restricted?
+      pages.any? && pages.not_restricted.blank?
+    end
+
   end
 end

data/app/models/alchemy/user.rb

@@ -33,10 +33,9 @@ module Alchemy
     end
 
     def is_admin?
-      true if self.role == "admin"
+      self.role == "admin"
     end
-
-    alias :admin? :is_admin?
+    alias_method :admin?, :is_admin?
 
     def unlock_pages
       for page in pages_locked_by_me

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -2,19 +2,19 @@
   <div id="overlay_toolbar">
     <div class="button_with_label">
       <%= link_to_overlay_window(
-            content_tag('span', '', :class => 'icon upload'),
-            alchemy.new_admin_attachment_path(
-              :content_id => @content.blank? ? nil : @content.id,
-              :swap => @swap,
-              :options => @options
-            ),
-            {
-              :title => t('upload_file'),
-              :size => '540x550'
-            },
+          render_icon('upload'),
+          alchemy.new_admin_attachment_path(
+            :content_id => @content.blank? ? nil : @content.id,
+            :swap => @swap,
+            :options => @options
+          ),
+          {
             :title => t('upload_file'),
-            :class => 'icon_button'
-          ) %>
+            :size => '540x550'
+          },
+          :title => t('upload_file'),
+          :class => 'icon_button'
+        ) %>
       <label><%= t('upload_file') %></label>
     </div>
     <%= js_filter_field(:onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -48,7 +48,7 @@
       alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
       {
         :title => t('rename_file'),
-        :size => '380x100'
+        :size => '410x180'
       },
       :class => 'icon file_edit',
       :title => t('rename_file')

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

@@ -4,5 +4,6 @@
 <%- else -%>
   $('#archive_all').html('<%= escape_javascript(render(:partial => "files_list")) %>');
   Alchemy.growl('<%= @message %>');
+  Alchemy.overlayObserver('#archive_all');
 <%- end -%>
 })(jQuery);

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

@@ -2,11 +2,17 @@
   <table>
     <tr>
       <td class="label"><%= f.label 'name', :class => "short" %></td>
-      <td class="input"><%= f.text_field 'name', :class => 'thin_border very_long' %></td>
+      <td class="input"><%= f.text_field 'name', :class => 'thin_border very_long', :autofocus => true %></td>
     </tr>
     <tr>
-      <td></td>
-      <td class="submit"><%= f.button t('save'), :class => 'button' %></td>
+      <td class="label"><%= f.label 'filename', :class => "short" %>*</td>
+      <td class="input"><%= f.text_field 'filename', :class => 'thin_border very_long' %></td>
+    </tr>
+    <tr>
+      <td colspan="2" class="submit">
+        <%= f.button t('save'), :class => 'button' %>
+      </td>
     </tr>
   </table>
+  <p class="foot_note"><%= t(:attachment_filename_notice) %></p>
 <% end %>

data/app/views/alchemy/admin/attachments/index.html.erb

@@ -14,5 +14,6 @@
     }
   ]
 ) %>
-
-<%= render :partial => 'files_list' %>
+<div id="archive_all">
+  <%= render :partial => 'files_list' %>
+</div>

data/app/views/alchemy/admin/contents/_missing.html.erb

@@ -15,7 +15,7 @@
       ),
       :method => 'post',
       :remote => true,
-      :class => 'button'
+      :class => 'small button'
     ) %>
   </p>
 </div>

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

@@ -0,0 +1,54 @@
+(function() {
+
+<% if params[:was_missing] %>
+
+  $("#element_<%= @element.id %>_content_missing").replaceWith('<%= escape_javascript(
+    render(
+      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+      :locals => @locals
+    )
+  ) %>');
+
+<% else %>
+
+  $("<%= @content_dom_id %>").before('<%= escape_javascript(
+    render(
+      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+      :locals => @locals
+    )
+  ) %>');
+  Alchemy.enableButton('.disabled.button');
+  Alchemy.overlayObserver('#<%= content_dom_id(@content) %>');
+  Alchemy.growl('<%= t("Successfully added content") % {:content => @content.name_for_label} %>')
+
+<% end %>
+
+<% if @content.essence_type == "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 %>
+
+  <% if !max_image_count.blank? && @contents_of_this_type.length >= max_image_count %>
+  $("#add_picture_<%= @element.id %>").remove();
+  <% end %>
+
+  Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>');
+
+<% elsif @content.essence_type == "Alchemy::EssenceDate" %>
+
+  Alchemy.Datepicker('#element_<%= @element.id %> input.date');
+
+<% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
+
+  Alchemy.Tinymce.addEditor('contents_content_<%= @content.id %>_body');
+
+<% end %>
+
+  Alchemy.reloadPreview();
+  Alchemy.closeCurrentWindow();
+  Alchemy.SelectBox("#element_<%= @element.id %>");
+
+})()

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

@@ -3,11 +3,16 @@
   <%= f.hidden_field :element_id %>
   <table>
     <tr>
-      <td>
-        <%= f.select 'name', @contents.map { |a| [t("content_names.#{a['name']}"), a['name']] }, {}, {:class => 'alchemy_selectbox'} %>
-        <%= hidden_field_tag('options', @options) %>
+      <td class="label"><%= f.label :name, t('name') %></td>
+      <td class="select">
+        <%= f.select('name', @contents.map { |a|
+          [t("content_names.#{a['name']}"), a['name']]
+        }, {}, {:class => 'alchemy_selectbox'}) %>
       </td>
-      <td class="submit">
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= hidden_field_tag('options', @options) %>
         <%= f.button t(:create), :class => 'button' %>
       </td>
     </tr>