alchemy_cms 2.0.rc2 → 2.0.rc3

data/app/controllers/admin/attachments_controller.rb

@@ -2,22 +2,33 @@ class Admin::AttachmentsController < AlchemyController
 
   protect_from_forgery :except => [:create]
   
+  before_filter :set_translation
   filter_access_to :all
 
   def index
-    cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
-    if params[:per_page] == 'all'
-      @attachments = Attachment.where(cond).order(:name)
+    if in_overlay?
+      archive_overlay
     else
-      @attachments = Attachment.where(cond).paginate(
-        :page => (params[:page] || 1),
-        :per_page => (params[:per_page] || 20)
-      ).order(:name)
+      cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
+      if params[:per_page] == 'all'
+        @attachments = Attachment.where(cond).order(:name)
+      else
+        @attachments = Attachment.where(cond).paginate(
+          :page => (params[:page] || 1),
+          :per_page => (params[:per_page] || 20)
+        ).order(:name)
+      end
     end
   end
 
   def new
     @attachment = Attachment.new
+    if in_overlay?
+      @while_assigning = true
+      @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+      @swap = params[:swap]
+			@options = hashified_options
+    end
     render :layout => false
   end
 
@@ -34,7 +45,14 @@ class Admin::AttachmentsController < AlchemyController
         :per_page => (params[:per_page] || 20)
       ).order(:name)
     end
+    if in_overlay?
+      @while_assigning = true
+      @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+      @swap = params[:swap]
+			@options = hashified_options
+    end
     @message = _('File %{name} uploaded succesfully') % {:name => @attachment.name}
+    # Are we using the Flash uploader? Or the plain html file uploader?
     if params[Rails.application.config.session_options[:key]].blank?
       flash[:notice] = @message
       redirect_to :action => :index
@@ -76,20 +94,6 @@ class Admin::AttachmentsController < AlchemyController
     end
   end
 
-  def archive_overlay
-    @content = Content.find(params[:content_id])
-    @options = params[:options]
-    if !params[:only].blank?
-      condition = "filename LIKE '%.#{params[:only].join("' OR filename LIKE '%.")}'"
-    elsif !params[:except].blank?
-      condition = "filename NOT LIKE '%.#{params[:except].join("' OR filename NOT LIKE '%.")}'"
-    else
-      condition = ""
-    end
-    @attachments = Attachment.where(condition).order(:name)
-    render :layout => false
-  end
-
   def show
     @attachment = Attachment.find(params[:id])
     send_file(
@@ -113,4 +117,26 @@ class Admin::AttachmentsController < AlchemyController
     )
   end
 
+private
+
+  def in_overlay?
+    !params[:content_id].blank?
+  end
+
+  def archive_overlay
+    @content = Content.find(params[:content_id])
+    @options = params[:options]
+    if !params[:only].blank?
+      condition = "filename LIKE '%.#{params[:only].join("' OR filename LIKE '%.")}'"
+    elsif !params[:except].blank?
+      condition = "filename NOT LIKE '%.#{params[:except].join("' OR filename NOT LIKE '%.")}'"
+    else
+      condition = ""
+    end
+    @attachments = Attachment.where(condition).order(:name)
+    respond_to do |format|
+      format.html { render :partial => 'archive_overlay' }
+    end
+  end
+
 end

data/app/controllers/admin/clipboard_controller.rb

@@ -2,6 +2,8 @@ class Admin::ClipboardController < AlchemyController
 
   filter_access_to :all
 
+  before_filter :set_translation
+
   def index
     clipboard = get_clipboard(params[:remarkable_type].tableize)
     @clipboard_items = params[:remarkable_type].classify.constantize.all_from_clipboard(clipboard)

data/app/controllers/admin/elements_controller.rb

@@ -1,5 +1,7 @@
 class Admin::ElementsController < AlchemyController
   
+  before_filter :set_translation
+  
   filter_access_to [:new, :create, :order, :index], :attribute_check => false
   
   cache_sweeper :content_sweeper, :only => [:update]

data/app/controllers/admin/essence_files_controller.rb

@@ -12,8 +12,8 @@ class Admin::EssenceFilesController < AlchemyController
     @essence_file = EssenceFile.find(params[:id])
     @essence_file.update_attributes(params[:essence_file])
     render :update do |page|
-      page << "Alchemy.closeCurrentWindow()"
-      page << "Alchemy.reloadPreview()"
+      page.call "Alchemy.closeCurrentWindow"
+      page.call "Alchemy.reloadPreview"
     end
   end
 
@@ -23,11 +23,12 @@ class Admin::EssenceFilesController < AlchemyController
     @content.essence.attachment = @attachment
     @content.essence.save
     @content.save
+    @options = params[:options]
     render :update do |page|
-      page.replace "#{@content.essence_type.underscore}_#{@content.id}", :partial => "essences/essence_file_editor", :locals => {:content => @content, :options => params[:options]}
-      page << "Alchemy.closeCurrentWindow()"
-      page << "Alchemy.reloadPreview()"
-      page << "Alchemy.setElementDirty('#element_#{@content.element.id}')"
+      page << "jQuery('##{@content.essence_type.underscore}_#{@content.id}').replaceWith('#{escape_javascript(render(:partial => "essences/essence_file_editor.html.erb", :locals => {:content => @content, :options => @options}))}')"
+      page.call "Alchemy.closeCurrentWindow"
+      page.call "Alchemy.reloadPreview"
+      page.call "Alchemy.setElementDirty", "#element_#{@content.element.id}"
     end
   end
 

data/app/controllers/admin/languages_controller.rb

@@ -1,6 +1,7 @@
 class Admin::LanguagesController < AlchemyController
   
   filter_resource_access
+  before_filter :set_translation
   
   def index
     if !params[:query].blank?

data/app/controllers/admin/pictures_controller.rb

@@ -1,29 +1,38 @@
 class Admin::PicturesController < AlchemyController
   protect_from_forgery :except => [:create]
   
+  before_filter :set_translation
+
   filter_access_to :all
 
   cache_sweeper :pictures_sweeper, :only => [:update, :destroy]
 
   def index
+    @size = params[:size] || 'medium'
     if params[:per_page] == 'all'
       @pictures = Picture.where("name LIKE '%#{params[:query]}%'").order(:name)
     else
       @pictures = Picture.where("name LIKE '%#{params[:query]}%'").paginate(
         :page => params[:page] || 1,
-        :per_page => params[:per_page] || 32
+        :per_page => pictures_per_page_for_size(@size)
       ).order(:name)
     end
+    if in_overlay?
+      archive_overlay
+    else
+      # render index.html.erb
+    end
   end
 
   def new
     @picture = Picture.new
     @while_assigning = params[:while_assigning] == 'true'
-    if @while_assigning
+    @size = params[:size] || 'medium'
+    if in_overlay?
+      @while_assigning = true
       @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
       @element = Element.find(params[:element_id], :select => 'id')
-      @size = params[:size]
-      @options = params[:options]
+      @options = hashified_options
       @page = params[:page]
       @per_page = params[:per_page]
     end
@@ -34,12 +43,12 @@ class Admin::PicturesController < AlchemyController
     @picture = Picture.new(:image_file => params[:Filedata])
     @picture.name = @picture.image_filename
     @picture.save
-    @while_assigning = params[:while_assigning] == 'true'
-    if @while_assigning
+    @size = params[:size] || 'medium'
+    if in_overlay?
+      @while_assigning = true
       @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
       @element = Element.find(params[:element_id], :select => 'id')
-      @size = params[:size] || 'medium'
-      @options = params[:options]
+      @options = hashified_options
       @page = params[:page] || 1
       @per_page = pictures_per_page_for_size(@size)
     end
@@ -48,10 +57,11 @@ class Admin::PicturesController < AlchemyController
     else
       @pictures = Picture.where("name LIKE '%#{params[:query]}%'").paginate(
         :page => (params[:page] || 1),
-        :per_page => (params[:per_page] || @per_page || 32)
+        :per_page => pictures_per_page_for_size(@size)
       ).order(:name)
     end
     @message = _('Picture %{name} uploaded succesfully') % {:name => @picture.name}
+    # Are we using the Flash uploader? Or the plain html file uploader?
     if params[Rails.application.config.session_options[:key]].blank?
       flash[:notice] = @message
       redirect_to :back
@@ -60,33 +70,16 @@ class Admin::PicturesController < AlchemyController
     exception_handler(e)
   end
 
-  def archive_overlay
-    @content = Content.find_by_id(params[:content_id], :select => 'id')
-    @element = Element.find_by_id(params[:element_id], :select => 'id')
-    @size = params[:size] || 'medium'
-    @pictures = Picture.where("name LIKE '%#{params[:query]}%'").paginate(
-      :page => params[:page] || 1,
-      :per_page => pictures_per_page_for_size(@size)
-    ).order(:name)
-    @options = params[:options].is_a?(String) ? Rack::Utils.parse_query(params[:options]) : params[:options]
-    respond_to do |format|
-      format.html {
-        render :layout => false
-      }
-      format.js {
-        render :update do |page|
-          page << "jQuery('#alchemy_window_body').html('#{escape_javascript(render(:partial => 'archive_overlay_images'))}')"
-        end
-      }
-    end
-  end
-
   def update
+    @size = params[:size] || 'medium'
     @picture = Picture.find(params[:id])
     oldname = @picture.name
     @picture.name = params[:name]
     @picture.save
     @message = _("Image renamed successfully from: '%{from}' to '%{to}'") % {:from => oldname, :to => @picture.name}
+    render :update do |page|
+      page.call 'Alchemy.growl', @message
+    end
   rescue Exception => e
     exception_handler(e)
   end
@@ -121,12 +114,34 @@ private
   
   def pictures_per_page_for_size(size)
     case size
-      when 'small' then per_page = 35
-      when 'large' then per_page = 4
+      when 'small'
+        per_page = in_overlay? ? 35 : 55
+      when 'large'
+        per_page = in_overlay? ? 4 : 8
     else
-      per_page = 12
+      per_page = in_overlay? ? 12 : 18
     end
     return per_page
   end
-  
+
+  def in_overlay?
+    !params[:element_id].blank?
+  end
+
+  def archive_overlay
+    @content = Content.find_by_id(params[:content_id], :select => 'id')
+    @element = Element.find_by_id(params[:element_id], :select => 'id')
+    @options = hashified_options
+    respond_to do |format|
+      format.html {
+        render :partial => 'archive_overlay'
+      }
+      format.js {
+        render :update do |page|
+          page << "jQuery('#alchemy_window_body').replaceWith('#{escape_javascript(render(:partial => 'archive_overlay'))}')"
+        end
+      }
+    end
+  end
+
 end

data/app/controllers/admin/users_controller.rb

@@ -3,6 +3,8 @@ class Admin::UsersController < AlchemyController
   filter_access_to [:edit, :update, :destroy], :attribute_check => true
   filter_access_to [:index, :new, :create], :attribute_check => false
 
+  before_filter :set_translation
+
   def index
     if !params[:query].blank?
       @users = User.where([

data/app/controllers/admin_controller.rb

@@ -1,6 +1,7 @@
 class AdminController < AlchemyController
   
   filter_access_to :index
+  before_filter :set_translation
   before_filter :check_user_count, :only => :login
 
   layout 'alchemy'

data/app/controllers/alchemy_controller.rb

@@ -142,6 +142,15 @@ private
     ActionMailer::Base.default_url_options[:host] = request.host_with_port
   end
 
+  def hashified_options
+    return nil if params[:options].blank?
+    if params[:options].is_a?(String)
+      Rack::Utils.parse_query(params[:options])
+    else
+      params[:options]
+    end
+  end
+
 protected
 
   def init_gettext#:nodoc:

data/app/helpers/alchemy_helper.rb

@@ -726,7 +726,7 @@ module AlchemyHelper
     )
     filter_field << "<label for=\"search_field\">" + _("search") + "</label>"
     filter_field << "</div>"
-    filter_field
+    filter_field.html_safe
   end
 
   def clipboard_select_tag(items, html_options = {})
@@ -1180,5 +1180,11 @@ module AlchemyHelper
     end
     "Alchemy CMS - #{title}"
   end
-  
+
+  def max_image_count
+    return nil if !@options
+    image_count = @options[:maximum_amount_of_images] || @options[:max_images]
+    image_count.to_i unless image_count.blank?
+  end
+
 end

data/app/models/attachment.rb

@@ -9,9 +9,14 @@ class Attachment < ActiveRecord::Base
   )
   validates_as_attachment
 
+  def name
+    read_attribute(:name).split('.').first
+  end
+
   def extension
     filename.split(".").last
   end
+  alias_method :suffix, :extension
 
   def icon_css_class
     case content_type

data/app/models/element.rb

@@ -263,6 +263,10 @@ class Element < ActiveRecord::Base
     content.ingredient
   end
   
+  def has_ingredient?(name)
+    !self.ingredient(name).blank?
+  end
+  
   def save_contents(params)
     contents.each do |content|
       unless content.save_essence(params[:contents]["content_#{content.id}"], :public => !params["public"].nil?)

data/app/sweepers/pictures_sweeper.rb

@@ -12,9 +12,10 @@ class PicturesSweeper < ActionController::Caching::Sweeper
 private
 
   def expire_cache_for(picture)
+    # Removing all variants of the picture with FileUtils.
     FileUtils.rm_rf("#{Rails.root}/public/pictures/show/#{picture.id}")
     FileUtils.rm_rf("#{Rails.root}/public/pictures/thumbnails/#{picture.id}")
-    expire_page(:controller => '/pictures', :action => 'zoom', :id => picture.id)
+    expire_page(zoom_picture_path(picture, :format => 'png'))
   end
 
 end

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

@@ -0,0 +1,25 @@
+<div id="alchemy_window_body">
+	<div id="overlay_toolbar">
+		<div class="button_with_label">
+			<%= link_to_overlay_window(
+				content_tag('span', '', :class => 'icon upload'),
+				new_admin_attachment_path(
+					:content_id => @content.blank? ? nil : @content.id,
+					:swap => @swap,
+					:options => @options
+				),
+				{
+					:title => _('upload_file'),
+					:size => '540x480'
+				},
+				:title => _('upload_file'),
+				:class => 'icon_button'
+			) %><br />
+			<label><%= _('upload_file') %></label>
+		</div>
+		<%= js_filter_field(:onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>
+	</div>
+	<div id="assign_file_list" class="with_padding">
+		<%= render :partial => 'file_to_assign', :collection => @attachments %>
+	</div>
+</div>

data/app/views/admin/attachments/_file_to_assign.html.erb

@@ -2,7 +2,7 @@
 	prefix = "<div class=\"assign_file_file_icon\">"
 	suffix = "</div><div class=\"assign_file_file_name\">#{file_to_assign.filename}</div>"
 -%>
-<%- img_tag = "#{prefix}#{render_icon(file_to_assign.icon_css_class)}#{suffix}" -%>
+<%- img_tag = "#{prefix}#{render_icon(file_to_assign.icon_css_class)}#{suffix}".html_safe -%>
 <div class="assign_file_file" name="<%= file_to_assign.filename %>">
 	<%= link_to(
 		img_tag,
@@ -14,7 +14,7 @@
 			:options => @options
 		},
 		:remote => true,
-		:method => 'post',
+		:method => 'put',
 		:title => file_to_assign.filename
 	) %>
 </div>