skylinecms 3.1.0 → 3.2.0

data/app/controllers/skyline/content_controller.rb

@@ -7,18 +7,12 @@ class Skyline::ContentController < Skyline::Skyline2Controller
   self.default_menu = :content_library   
     
   def index
-    if request.xhr?
-      render :update do |p|
-        p.replace_html "leftContentContentPanel", :partial => "types"
+    if first_element = (Skyline::Configuration.articles + Skyline::Configuration.content_classes).first
+	    if first_element.ancestors.include?(Skyline::Article)
+	      redirect_to skyline_articles_path(:type => first_element)
+	    else
+	      redirect_to object_url(first_element, :controller => "skyline/content", :action => "list") 
       end
-    else
-      if first_element = (Skyline::Configuration.articles + Skyline::Configuration.content_classes).first
-		    if first_element.ancestors.include?(Skyline::Article)
-		      redirect_to skyline_articles_path(:type => first_element)
-		    else
-		      redirect_to object_url(first_element, :controller => "skyline/content", :action => "list") 
-	      end
-	    end
     end
   end
     
@@ -89,18 +83,15 @@ class Skyline::ContentController < Skyline::Skyline2Controller
     if request.xhr? && stack.klass.orderable? && params[:order]
       ids = params[:order].split(",").collect{|s| s.to_i}
       if ids.size > 1 && stack.klass.reorder(ids)
-        render(:update){|p| p.call "Application.addOddEven", "#{stack.klass.name}Listing", "tbody tr"}
       elsif ids.size <= 1
-        render :nothing => true        
+        render :nothing => true
       else
         list_elements!
-        render :update do |p|
-          p.replace_html "contentEditPanel", presenter_for(@elements,stack.klass)
-          p << "$('contentEditPanel').retrieve('skyline.layout').setup()";
-        end
       end
     end  
-    redirect_to :action => "list", :types => stack.url_types(:up => 1, :collection => true) if !request.xhr?
+    if !request.xhr?
+      redirect_to :action => "list", :types => stack.url_types(:up => 1, :collection => true) 
+    end
   end
   
   def create
@@ -132,16 +123,12 @@ class Skyline::ContentController < Skyline::Skyline2Controller
   def import
     if request.xhr?
       if stack.size > 1
-        klass = stack.parent_collection.to_s
+        @klass = stack.parent_collection.to_s
       else
-        klass = stack.klass.to_s
+        @klass = stack.klass.to_s
       end
       
-      url = object_url(stack.current, {:action => "import"})
-          
-      render :update do |p|
-        p << dialog(t(:dialog_title, :scope => [:content, :import]), :partial => "import", :locals => {:url => url, :klass => klass},  :width => 400)
-      end
+      @url = object_url(stack.current, {:action => "import"})          
     end  
     
     if request.post?
@@ -161,13 +148,10 @@ class Skyline::ContentController < Skyline::Skyline2Controller
   end
   
   # Editor can only be called on editors and when params[:field] is set
-  verify :xhr => true, :only => [:field]
   def field
+    return unless request.xhr?
     @element = stack.last
     @element.attributes = params[:element]
-    render :update do |p|
-      p.replace input_id("field","element",params[:field]), content_field(@element.class, 'element', @element.class.fields[params[:field].to_sym] || Field.new(:name => params[:field]), @element)
-    end
   end
   
   def error
@@ -195,7 +179,7 @@ class Skyline::ContentController < Skyline::Skyline2Controller
       @elements = stack.parent && stack.parent_collection.find_for_cms(:all, :filter => params[:filter])
     else
       @count = stack.last.class.count_for_cms(:all,:self_referential => false, :filter => params[:filter])
-      @elements = stack.last.class.paginate_for_cms :all, :page => params[:page], :per_page => 30, :self_referential => false, :filter => params[:filter]
+      @elements = stack.last.class.paginate_for_cms(:page => params[:page], :per_page => 30, :self_referential => false, :filter => params[:filter]).all
     end    
   end  
 

data/app/controllers/skyline/content_items_controller.rb

@@ -1,14 +1,8 @@
 class Skyline::ContentItemsController < Skyline::ApplicationController
   def new
     return unless request.xhr?
-    render :update do |page|
-      if params[:content_item_type].present?
-        @content_item_class = params[:content_item_type].constantize
-        page.replace_html("section-#{params[:guid]}-content-item-id", :partial => "content_item", :locals => {:guid => params[:guid], :sectionable => Skyline::Sections::ContentItemSection.new})
-      else
-        page.replace_html("section-#{params[:guid]}-content-item-id", :text => "")
-        page << "var myFx = new Fx.Scroll(\"contentEditPanel\").toBottom();"        
-      end
-    end
+    if params[:content_item_type].present?
+      @content_item_class = params[:content_item_type].constantize
+    end    
   end
 end

data/app/controllers/skyline/content_sections_controller.rb

@@ -1,15 +1,8 @@
 class Skyline::ContentSectionsController < Skyline::ApplicationController
   def new
-    return unless request.xhr?
-    render :update do |page|
-      if params[:taggable_type].present?
-        taggable = params[:taggable_type].constantize
-        @tags = taggable.available_tags
-        page.replace("section-#{params[:guid]}-tags", :partial => "tags", :locals => {:guid => params[:guid], :sectionable => taggable.new})
-      else
-        page.replace("section-#{params[:guid]}-tags", :text => "")
-        page << "var myFx = new Fx.Scroll(\"contentEditPanel\").toBottom();"        
-      end
+    if params[:taggable_type].present?
+      @taggable = params[:taggable_type].constantize
+      @tags = @taggable.available_tags
     end
   end
 end

data/app/controllers/skyline/link_section_links_controller.rb

@@ -1,14 +1,6 @@
 class Skyline::LinkSectionLinksController < Skyline::ApplicationController
   def new
-    return unless request.xhr?
-    render :update do |page|
-      link = Skyline::LinkSectionLink.new
-      link_guid = Guid.new
-      
-      fields_for params[:object_name], link do |sectionable_form|
-        page.insert_html(:bottom, "section-#{params[:guid]}-links", :partial => "form", :locals => {:sectionable_form => sectionable_form, :link => link, :guid => params[:guid], :link_guid => link_guid})
-        page << "linkSectionLinksSortable#{params[:guid].to_s.gsub("-","")}.addItem('link_section_#{link_guid}');"
-      end
-    end
+    @link = Skyline::LinkSectionLink.new
+    @link_guid = Guid.new    
   end
 end

data/app/controllers/skyline/media/data_controller.rb

@@ -1,5 +1,4 @@
 class Skyline::Media::DataController < Skyline::ApplicationController
-  
   after_filter :perform_cache, :only => :show
   
   self.page_cache_directory = Skyline::MediaCache.cache_path
@@ -14,12 +13,11 @@ class Skyline::Media::DataController < Skyline::ApplicationController
   def show
     @skip_caching = false
 
-    filename = "#{params[:name]}.#{params[:format]}"
-    
-    @file = Skyline::MediaFile.first(:conditions => {:parent_id => params[:dir_id], :name => filename})
-    
-    cached_file = File.join(self.page_cache_directory,request.path)    
+    @file = Skyline::MediaFile.first(:conditions => {:parent_id => params[:dir_id], :name => params[:name]})
+    return self.handle_404 unless @file
     
+    cached_file = File.join(self.page_cache_directory.to_s,CGI::unescape(request.path))    
+        
     if File.exist?(cached_file)                      
       response.etag = File.mtime(cached_file)
           
@@ -38,7 +36,13 @@ class Skyline::Media::DataController < Skyline::ApplicationController
       end
       
       if size.nil?
-        send_file @file.file_path, :filename => @file.name, :type => @file.content_type, :disposition => 'inline', :cache => true
+        response.etag = File.mtime(@file.file_path)
+            
+        if request.etag_matches?(response.etag)
+          head :not_modified
+        else
+          send_file @file.file_path, :filename => @file.name, :type => @file.content_type, :disposition => 'inline', :cache => true
+        end
         @skip_caching = true
       else
         if size.all?{|s| s > 0 }
@@ -51,12 +55,18 @@ class Skyline::Media::DataController < Skyline::ApplicationController
   end
   
   protected
-    def perform_cache
-      return if @skip_caching
-      ActiveRecord::Base.transaction do
-        Skyline::MediaCache.create(:url => request.path, :object_type => "MediaFile", :object_id => @file.id)
-        self.class.cache_page(response.body, request.path)
-      end
-    end
+
+  def handle_404
+    render :nothing => true, :status => :not_found    
+  end  
   
+  def perform_cache
+    return if @skip_caching
+    return unless @file    
+    ActiveRecord::Base.transaction do
+      Skyline::MediaCache.create(:url => request.path, :object_type => "MediaFile", :object_id => @file.id)
+      self.class.cache_page(response.body, request.path.to_s.sub(/^\//, ""))
+    end
+  end
+
 end

data/app/controllers/skyline/media/dirs_controller.rb

@@ -16,11 +16,6 @@ class Skyline::Media::DirsController < Skyline::ApplicationController
     @dir = Skyline::MediaDir.find(params[:id])
     
     # selected_file = params[:selected_file_id].nil? || params[:selected_file_id] == "0" ? nil : Skyline::MediaFile.find(params[:selected_file_id])
-    
-    render :update do |p|
-      p.replace_html("contentPanel", :partial => "show")
-      p.replace_html("metaPanel", :partial => "edit")      
-    end    
   end
   
   def create
@@ -35,11 +30,7 @@ class Skyline::Media::DirsController < Skyline::ApplicationController
     @dir.save
     
     @dirs = Skyline::MediaDir.group_by_parent_id    
-    render :update do |p|
-      p.replace "dirtree", :partial => "index"
-      p.replace_html("contentPanel", :partial => "show")
-      p.replace_html("metaPanel", :partial => "edit")      
-    end
+    render :action => "index"    
   end
   
   def update    
@@ -53,16 +44,14 @@ class Skyline::Media::DirsController < Skyline::ApplicationController
     end
     
     @dirs = Skyline::MediaDir.group_by_parent_id 
-    render :update do |p|
-      if @saved
-        p.notification :success, t(:success, :scope => [:media, :dirs,:update,:flashes])
-      else
-        p.notification :failed, t(:success, :scope => [:media, :dirs,:update,:flashes])
-      end
-      p.replace "dirtree", :partial => "index"
-      p.replace_html("contentPanel", :partial => "show")
-      p.replace_html("metaPanel", :partial => "edit")      
-    end
+    
+    if @saved
+      notifications.now[:success] = t(:success, :scope => [:media, :dirs,:update,:flashes])
+    else
+      notifications.now[:failed] = t(:success, :scope => [:media, :dirs,:update,:flashes])
+    end    
+    
+    render :action => "index"
   end  
   
   def destroy
@@ -72,12 +61,9 @@ class Skyline::Media::DirsController < Skyline::ApplicationController
     destroy_dir.destroy
 
     @dirs = Skyline::MediaDir.group_by_parent_id        
-    render :update do |p|
-      p.notification :success, t(:success, :scope => [:media, :dirs,:destroy,:flashes])
-      p.replace "dirtree", :partial => "index"
-      p.replace_html("contentPanel", :partial => "show")
-      p.replace_html("metaPanel", :partial => "edit")      
-    end
+    notifications.now[:success] = t(:success, :scope => [:media, :dirs,:destroy,:flashes])
+    
+    render :action => "index"
   end
   
 end

data/app/controllers/skyline/media/files_controller.rb

@@ -9,17 +9,10 @@ class Skyline::Media::FilesController < Skyline::ApplicationController
   authorize :destroy, :by => "media_file_delete"
   
   def index
-    render :update do |p|
-      p.replace_html "contentEditPanel", :partial => "index"
-    end
   end
   
   def edit
-    @file = @dir.files.find(params[:id])
-    
-    render :update do |p|
-      p.replace_html "metaPanel", :partial => "edit"
-    end
+    @file = @dir.files.find(params[:id])    
   end
   
   # We've got two different kinds of updates:
@@ -32,26 +25,19 @@ class Skyline::Media::FilesController < Skyline::ApplicationController
     
     # We use an instance variable because we want to use it in the render(:update) block.
     @saved = @file.save
-    
-    render :update do |p|
-      # file was moved to another directory
-      @dir = @file.directory if @dir.id != @file.parent_id      
-      
-      if @saved
-        p.notification :success, t(:success, :scope => [:media, :files ,:update,:flashes])
-      	p.replace_html "contentPanel", :partial => "skyline/media/dirs/show"
-      else
-        p.message :error, t(:failed, :scope => [:media_file,:update,:flashes])
-      end      
-      
-      p.replace_html "metaPanel", :partial => "edit"
-      
+
+    # file was moved to another directory
+    @dir = @file.directory if @dir.id != @file.parent_id      
+
+    if @saved
+      notifications.now[:success] = t(:success, :scope => [:media, :files, :update, :flashes])
+    else
+      messages.now[:error] = t(:failed, :scope => [:media, :files, :update, :flashes])
     end    
   end
   
   def create
     @file = @dir.files.build(:name => params[:Filename], :data => params[:Filedata])
-    sleep 5
 
     if @file.save
       render :json => {:result => "success"}
@@ -64,11 +50,9 @@ class Skyline::Media::FilesController < Skyline::ApplicationController
   def destroy
     @file = @dir.files.find(params[:id])
     @file.destroy
-    render :update do |p|
-      p.notification :success, t(:success, :scope => [:media, :files,:destroy,:flashes])
-      p.replace_html("contentPanel", :partial => "skyline/media/dirs/show")
-      p.replace_html("metaPanel", :partial => "skyline/media/dirs/edit")      
-    end
+    notifications.now[:success] =  t(:success, :scope => [:media, :files,:destroy,:flashes])
+    
+    render :template => "/skyline/media/dirs/show"
   end
 
   protected

data/app/controllers/skyline/publications_controller.rb

@@ -6,18 +6,6 @@ class Skyline::PublicationsController < Skyline::ApplicationController
   authorize :rollback, :by => "article_variant_create"
   
   def index
-    if request.xhr?
-      render :update do |p|
-        p << "var s = function(){"
-        p << "var sd = new Skyline.Dialog({width: 700, height: 500});"
-        p << "sd.setTitle('#{escape_javascript(t(:dialog_title, :scope => [:publication,:index]))}');"
-        p << "sd.setContent('" + escape_javascript(render(:partial => "index")) + "');"
-        p << "sd.setup(); sd.show();"
-        p << "sd.layout = new Application.Layouts.History(sd.contentEl.getElement('form'));"
-        p << "sd.layout.rollbackUrl = '"+escape_javascript(rollback_skyline_article_publication_path(@article, "000"))+"'"
-        p << "}()"
-      end
-    end
   end
   
   def rollback

data/app/controllers/skyline/published_publications_controller.rb

@@ -2,8 +2,6 @@ class Skyline::PublishedPublicationsController < Skyline::ApplicationController
   before_filter :find_article
 
   def create
-    return handle_unauthorized_user unless @article.editable_by?(current_user)
-
     variant = @article.variants.find_by_id(params[:variant_id])
     if !variant || !variant.editable_by?(current_user)
       return redirect_to(skyline_page_path(@article)) 
@@ -19,8 +17,6 @@ class Skyline::PublishedPublicationsController < Skyline::ApplicationController
   end
   
   def destroy
-    return handle_unauthorized_user unless @article.editable_by?(current_user)
-
     if @article.depublishable?
       @article.depublish
       messages[:success] = t(:success, :scope => [:published_publication, @article.class, :destroy, :flashes])

data/app/controllers/skyline/sections_controller.rb

@@ -3,24 +3,10 @@ class Skyline::SectionsController < Skyline::ApplicationController
     
   def new
     return unless request.xhr?
-    render :update do |page|
-      section = Skyline::Section.new
-      section.sectionable = params[:sectionable_type].constantize.new
-      section_guid = Guid.new
-      
-      if params[:after_section]
-        pos, id = :after, params[:after_section]          
-      else
-        pos, id = :bottom, "contentlist"
-      end
-            
-      fields_for params[:object_name] do |variant_form|
-        page.insert_html(pos, id, :partial => "form", :locals => {:variant_form => variant_form, :section => section, :guid => section_guid})
-      end
-      
-      page << "$('contentlist').retrieve('application.sections').addSection('section_#{section_guid}');"
-      page << "$('contentEditPanel').scrollTo(0, $('contentEditPanel').getScroll().y + $('section_#{section_guid}').getPosition(\"contentEditPanel\").y)"
-    end
+    
+    @section = Skyline::Section.new
+    @section.sectionable = params[:sectionable_type].constantize.new
+    @section_guid = Guid.new    
   end
   
   protected

data/app/controllers/skyline/site/media_files_data_controller.rb

@@ -12,13 +12,11 @@ class Skyline::Site::MediaFilesDataController < ApplicationController
   
   def show
     @skip_caching = false
-
-    filename = "#{params[:name]}.#{params[:format]}"
     
-    @media_file = Skyline::MediaFile.find(:first, :conditions => {:parent_id => params[:media_dir_id], :name => filename})
-    return self.handle_404 unless @media_file
+    @file = Skyline::MediaFile.first(:conditions => {:parent_id => params[:dir_id], :name => params[:name]})
+    return self.handle_404 unless @file
     
-    cached_file = File.join(self.page_cache_directory,request.path)    
+    cached_file = File.join(self.page_cache_directory.to_s,CGI::unescape(request.path))
     
     if File.exist?(cached_file)                      
       response.etag = File.mtime(cached_file)
@@ -26,29 +24,29 @@ class Skyline::Site::MediaFilesDataController < ApplicationController
       if request.etag_matches?(response.etag)
         head :not_modified
       else
-        send_file cached_file, :filename => @media_file.name ,:type => @media_file.content_type, :disposition => 'inline', :stream => false, :cache => true
+        send_file cached_file, :filename => @file.name ,:type => @file.content_type, :disposition => 'inline', :stream => false, :cache => true
       end
       @skip_caching = true
     else
       if params[:size].present?
         size = params[:size].to_s.split("x").map{|v| v.to_i }
-        size = nil if size[0] == @media_file.width && size[1] >= @media_file.height || size[1] == @media_file.height && size[0] >= @media_file.width
+        size = nil if size[0] == @file.width && size[1] >= @file.height || size[1] == @file.height && size[0] >= @file.width
       else
         size = nil
       end
       
       if size.nil?
-        response.etag = File.mtime(@media_file.file_path)
+        response.etag = File.mtime(@file.file_path)
             
         if request.etag_matches?(response.etag)
           head :not_modified
         else
-          send_file @media_file.file_path, :filename => @media_file.name, :type => @media_file.content_type, :disposition => 'inline', :cache => true
+          send_file @file.file_path, :filename => @file.name, :type => @file.content_type, :disposition => 'inline', :cache => true
         end
         @skip_caching = true
       else
         if size.all?{|s| s > 0 }
-          send_data @media_file.thumbnail(size[0],size[1]), :filename => @media_file.name, :type => @media_file.content_type, :disposition => 'inline', :cache => true
+          send_data @file.thumbnail(size[0],size[1]), :filename => @file.name, :type => @file.content_type, :disposition => 'inline', :cache => true
         else
           render :nothing => true, :status => :unprocessable_entity
         end
@@ -64,10 +62,10 @@ class Skyline::Site::MediaFilesDataController < ApplicationController
     
   def perform_cache
     return if @skip_caching
-    return unless @media_file
+    return unless @file
     ActiveRecord::Base.transaction do
-      Skyline::MediaCache.create(:url => request.path, :object_type => "MediaFile", :object_id => @media_file.id)
-      self.class.cache_page(response.body, request.path)
+      Skyline::MediaCache.create(:url => request.path, :object_type => "MediaFile", :object_id => @file.id)
+      self.class.cache_page(response.body, request.path.to_s.sub(/^\//, ""))
     end
   end
 end