skylinecms 3.0.8 → 3.1.0

data/CHANGELOG

@@ -1,4 +1,125 @@
-*3.0.8 (December 18, 2009)*
+# Changelog for Skyline #
+
+## 3.1.0 (Juli 14, 2011) ##
+
+### Core ###
+* [Core] Update gemfile to work with bundler 1.0.7
+* [Core] Update gemfile to use Rails 2.3.10 and rack 1.1.0
+* [Core] Change migrations so there are no more references to tables without the skyline_* prefix.
+* [Core] Removed routes that are overwritten in the implementation
+* [Core] Remove mysql as a dependency
+* [Core] Update gemfile to use willpaginate ~>2.3.15
+* [Core] Fix Rails deprecation errors regarding returning
+* [Core] Change load_paths to autoload_path
+* [Core] Moved tasks to lib/tasks because of deprecation
+* [Core] Multiple language file and translation fixes in english translations
+* [Core] Change {{}} to %{} in locale files
+
+
+### Deprecations ###
+**Important** : Some functionality has been deprecated in Skyline 3.1 you can still use the deprecation-layer if you are updating from an older version.
+
+* [Deprecations] Deprecations for 3.0.8 aren't loaded automatically anymore: require skyline/lib/deprecated/version3_0_8 manually to enable them.
+* [Deprecations] Removed all of Solr search, it will be put in a plugin.
+* [Deprecations] Refactor Renderer and RenderableScope* to the Rendering module.
+* [Deprecations] Deprecate Skyline::Renderer in favour of Skyline::Rendering::Renderer 
+* [Deprecations] Deprecate Skyline::UrlValidation in favour of vendored UrlValidation
+* [Deprecations] Deprecate Skyline::Renderer::SettingsHelper#get and Skyline::Renderer::SettingsHelper#get_page
+* [Deprecations] Deprecate Skyline::FormBuilderWithErrors in favour of Skyline::FormBuilder
+* [Deprecations] Deprecate SectionItem in favour of Sections::Interface.
+* [Deprecations] Deprecate Referable in favour of HasManyReferablesIn.
+* [Deprecations] Deprecate ContentItem in favour of BelongsToReferable.
+
+### Configuration (core) ###
+* [Config] Make the url_prefix for the CMS screens (default = "/skyline") configurable. This does not change the url of the assets!
+* [Config] Add an option to disable pages in the CMS. This only removes them from the template/browsers. You have to change the skyline.root route yourself!
+
+### User interface (core) ###
+* [UI] Update tinyMCE to 3.3.9
+* [UI] Upgrade mootools to 1.2.5 for IE9 compatibility
+* [UI] Fix generator methods to use notifications.
+* [UI] Add support for disappearing flashes.
+* [UI] Refactored Skyline.Layout javascript classes
+* [UI] Refactored Skyline.Tree javascript classes
+* [UI] Added Skyline.Table for scrollable and draggable tables
+* [UI] Add event delay/delegation for Skyline JS components.
+* [UI] Add support for multiple wysiwygs in sections collections.
+* [UI] Use HTML5 data-* attributes to store data on element nodes
+* [UI] Add support for disappearing flashes
+* [UI] Don't show buttons in inactive panel headers (it's confusing)
+* [UI] Add onFocus event to skyline.editor
+* [UI] Add support for section focus
+* [UI] New sections are now added after the currentActive section
+* [UI] Add config.locale configuration, it set's the default skyline interface locale. Skyline sets this on every request.
+* [UI] Add UserPrefernces for all kinds of user specific data
+* [UI] Minimize initial click target of flash upload shim to 1x1 px
+* [UI] Remove targetRelay for Swiff.Uploader.js to fix double-click bug in FireFox 4+
+* [UI] Refactored javascript layout classes
+* [UI] Show fieldset_errors after image and link browsers
+
+### Plugin management (core) ###
+* [Plugins] Refactor plugin manager to do more stuff for each plugin. (see also: b20f527)
+* [Plugins] Seed plugin seeds too. Refactor pluginsmanager a bit.
+* [Plugins] Load plugin helpers inside of Skyline::ApplicationController, makes it easier to override methods.
+* [Plugins] Put plugin hooking and other plugin specific stuff in plugin_helper
+
+### Referables (core) ###
+* [Referables] Use present? method instead of checking the existence of ref object in the helper
+* [Referables] Correctly mark referable_field as changed
+* [Referables] Bugfix: don't set refering type and id when object_ref is being destroyed
+* [Referables] Fix copying from one field with referables to another within the same object.
+* [Referables] Fix after_create callbacks when you are using HasManyReferablesIn and try to resave on after_create.
+* [Referables] Changed uri to text in skyline_referable_uri to allow for longer links
+* [Referables] Fix bug where a ID conflict could result in broken ref_id's.
+* [Referables] Don't break if you try to add a non-image file as an image into a inline ref
+
+### Media Library ###
+* [MediaLibrary] Refactored interface and controllers
+* [MediaLibrary] The URL for all files have been changed, this should not be a problem as long as there are no hardcoded references.
+* [MediaLibrary] Fix display of "add" button in media library
+* [MediaLibrary] Implement user preferences for media tree
+* [MediaLibrary] Fixed popup for link browser
+* [MediaLibrary] Fix updating of number of files in uploader.
+* [MediaLibrary] Added proportional dimension calculation to MediaFile and use it in MediaSection.
+
+### Articles, pages & rendering ###
+* [Articles] Add option to ArticleVersion to save it without increasing version numer
+* [Articles] Don't validate simple update of internal variables of Article.
+* [Articles] Improve the default view of article lists
+* [Articles] Add sensible default heading to article list
+* [Articles] Beautify interface if the "head" partial of an article is empty
+* [Articles] Fix duplicate call of sectionlist initialization
+* [Articles] Remove an unused index from article table.
+* [Articles] Add support for custom lists for articles
+
+* [Pages] Added documentation for Page#find_by_url
+* [Pages] Implement user preferences for Page tree collapsing/expanding
+
+* [Renderer] Skip template directories without an index.html.erb file.
+* [Renderer] Expose the controller within the renderer
+* [Renderer] Remove RenderableScope, it should be in a plugin.
+
+### Sections (builtin) ###
+* [Sections] Redirect section - Don't prepend url with protocol, host and port if the url already has one.
+* [Sections] RSS section - Add link to rss section
+* [Sections] Media section - Add (optional) link to Skyline::Sections::MediaSection.
+
+* [Tagging] Added index to associated tags table
+* [Tagging] Optimized generated query in with_tags scope
+
+### Content elements ###
+* [ContentElements] Changed icons in presenter for content elements
+* [ContentElements] Fixed boolean helper for content elements
+* [ContentElements] Remove article-list presenter for content elements. First part of content element refactoring. You can still use it but it will just display the table variant.
+
+### Settings and users ###
+* [Settings] Don't fail if we have no settings
+
+* [Users] Updated usermanagement to adher to new style
+* [Users] Fix number of users display and don't break if created_at is not set.
+
+
+## 3.0.8 (December 18, 2009) ##
 
 * Added support for SQLite3
 * Always make the last saved variant the default variant
@@ -10,7 +131,7 @@
 * Deprecate the settings helper in favour of Settings#get and Settings#get_page
 * Deprecate page_sections_per_column in favour of sections_per_column
 
-*3.0.7 (December 8, 2009)*
+## 3.0.7 (December 8, 2009) ##
 
 * Minor optimalisation to make (auto)loading work better
 * Added the skylincms binary to bootstrap new implementation
@@ -56,20 +177,20 @@
 * Ready for open source release
 * Define all offsetparents for tree elements
 
-*3.0.6 (October 2, 2009)*
+## 3.0.6 (October 2, 2009) ##
 
 * Fix drag of tree elements when there was scroll. (#67) Minor improvements on visual drag-cues.
 
-*3.0.5 (September 10, 2009)*
+## 3.0.5 (September 10, 2009) ##
 
 * Fix issue with IE6 and external links. (resolves #13)
 * Removed memoize from page.rb
 
-*3.0.4 (August 28, 2009)*
+## 3.0.4 (August 28, 2009) ##
 
 * Import functions of content model can now return error messages
 
-*3.0.3 (August 6, 2009)*
+## 3.0.3 (August 6, 2009) ##
 
 * Add better page locking, as long as someone is editing a variant it can't be edited by someone else.
 * Add support for edit "takeover" so you can take over editing even if someone else is editing a variant.
@@ -92,14 +213,14 @@
 * Cleanup functionality added to delete unuused tags
 * Moved selection of content items (for ContentItemSection) to model and ContentItem module
 
-*3.0.2.1 (July 23, 2009)*
+## 3.0.2.1 (July 23, 2009) ##
 Bugfix release, mainly for monitoring deletions of InlineRefs.
 
 * Add version number to login screen.
 * Add logger statement when InlineRef's are deleted, watch for [InlineRef].
 * Nullify RefObject#refering_id on all links when a page is deleted
 
-*3.0.2 (July 23, 2009)*
+## 3.0.2 (July 23, 2009) ##
 
 * Added localization for TinyMCE through skyline localization file
 * Automatically select target="_blank" if selecting a file or external link 
@@ -111,13 +232,13 @@ Bugfix release, mainly for monitoring deletions of InlineRefs.
 * Added TinyMCE Skyline Contextmenu plugin
 * Added TinyMCE Skyline Table plugin (edit simple tables)
 
-*3.0.1 (July 21, 2009)*
+## 3.0.1 (July 21, 2009) ##
 
 * Load helpers with Skyline.root as base
 * The browser controllers are now descendants of Skyline::ApplicationController  
 * Update TinyMCE to 3.2.5 
 * Bug: LinkSectionLink isn't in module Skyline::Sections
 
-*3.0.0 (July 20, 2009)*
+## 3.0.0 (July 20, 2009) ##
 
 * Initial Skyline 3.0.0 version released as a Rails plugin.

data/README.md

@@ -2,7 +2,6 @@ Skyline CMS
 ===========
 
 **Homepage**:  [http://www.skylinecms.nl](http://www.skylinecms.nl)   
-**IRC**:       Join us on IRC in #skylinecms on irc.freenode.net!  
 **Twitter**:   Follow [skylinecms](http://www.twitter.com/skylinecms) on twitter  
 **Git**:       [http://github.com/digitpaint/skyline](http://github.com/digitpaint/skyline)   
 **Author**:    DigitPaint  
@@ -42,5 +41,5 @@ If you're running into problems, don't hesitate to contact us!
 Copyright
 ---------
 
-Skyline CMS © 2009 by [DigitPaint](mailto:info@digitpaint.nl). Licensed under the LGPL
+Skyline CMS © 2011 by [DigitPaint](mailto:info@digitpaint.nl). Licensed under the LGPL
 license. Please see the {file:COPYING} and {file:COPYING.LESSER} for more information.

data/Rakefile

@@ -81,8 +81,8 @@ namespace :gem do
   
     gemspec.add_dependency "thor", "0.12.0"
   
-    gemspec.add_dependency "rails", "2.3.5"
-    gemspec.add_dependency "rack", "1.0.1"
+    gemspec.add_dependency "rails", "2.3.10"
+    gemspec.add_dependency "rack", "1.1.0"
       
     gemspec.add_dependency "polyglot", "0.2.6"
     gemspec.add_dependency "sprockets", "1.0.2"
@@ -90,7 +90,7 @@ namespace :gem do
     gemspec.add_dependency "rmagick", "2.9.1"
     gemspec.add_dependency "hpricot", "0.8.2"
     gemspec.add_dependency "guid", "0.1.1"
-    gemspec.add_dependency "will_paginate", "~>2.3.11"
+    gemspec.add_dependency "will_paginate", "~>2.3.15"
     gemspec.add_dependency "seed-fu", "~>1.2.0"
   
   end

data/app/controllers/skyline/application_controller.rb

@@ -1,18 +1,28 @@
 class Skyline::ApplicationController < ApplicationController
   include Skyline::TranslationHelper
   
+  before_filter :set_locale
   before_filter :authenticate_user, :identifier => :authentication
+  before_filter :handle_user_preferences, :identifier => :preferences
   before_filter :authorize_user_for_action, :identifier => :authorization
   
   around_filter Skyline::ArticleVersionObserver.instance
   
-  class_inheritable_accessor :default_menu_item
-  protected :default_menu_item, :default_menu_item=
+  class_inheritable_accessor :default_menu
+  attr_accessor :current_menu
+  hide_action :default_menu, :default_menu=, :current_menu, :current_menu=, :menu
+  
 
   # Load all helpers
   Dir[Skyline.root + "app/helpers/**/*_helper.rb"].each do |helper|
     helper helper.sub(Skyline.root + "app/helpers/","").sub(/_helper\.rb$/,"")
-  end  
+  end
+  
+  # Load all plugin helpers so they can override stuff.
+  Dir[Skyline::PluginsManager.plugin_path + "*/app/helpers/**/*_helper.rb"].each do |helper|
+    helper helper.sub(/^#{Regexp.escape(Skyline::PluginsManager.plugin_path.to_s)}\/?.+?\/app\/helpers\//,"").sub(/_helper\.rb$/,"")
+  end
+  
   
   class << self
         
@@ -57,9 +67,15 @@ class Skyline::ApplicationController < ApplicationController
       end
       self.filter_chain.send(:update_filter_chain,filters, :before,pos+1, &block)
     end
+    
   end
 
   protected
+
+  # Sets locale according to the configuration on every request
+  def set_locale
+    I18n.locale = Skyline::Configuration.locale.present? ? Skyline::Configuration.locale : "en-US"
+  end
   
   def default_url_options(options=nil)
     return if options.nil?
@@ -92,6 +108,26 @@ class Skyline::ApplicationController < ApplicationController
     end
   end
   
+  # Handle the user preferences
+  # --
+  def handle_user_preferences
+    if cookies["skyline_up"].present?
+      up = ActiveSupport::JSON.decode(cookies["skyline_up"])
+      
+      up.each do |k,v|
+        if k == "_delete"
+          v.each do |delete_id|
+            current_user.user_preferences.remove(delete_id)
+          end
+        else
+          current_user.user_preferences.set(k,v)
+        end
+      end
+      
+      cookies.delete("skyline_up")
+    end 
+  end
+  
   # The authorization callback
   # --
   def authorize_user_for_action    
@@ -149,7 +185,7 @@ class Skyline::ApplicationController < ApplicationController
     @_menuitem = menuitem    
   end
   def current_menu_item
-    @_menuitem || self.class.default_menu_item
+    @_menuitem || self.class.default_menu
   end
   helper_method :current_menu_item
   

data/app/controllers/skyline/articles_controller.rb

@@ -10,7 +10,7 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     
   layout :determine_layout
   
-  self.default_menu_item = :content_library
+  self.default_menu = :content_library
 
   def index
     case params[:type] 
@@ -216,9 +216,9 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     
   def class_from_type(type=params[:type])
     raise "Cannot infer class from #{type.inspect}" if type.blank?
-    klass = type.camelcase.constantize
-    if klass.ancestors.include?(Skyline::Article)
-      return klass 
+    @klass = type.camelcase.constantize
+    if @klass.ancestors.include?(Skyline::Article)
+      return @klass 
     else
       raise "Class #{klass.to_s} is not a subclass of Skyline::Article"
     end

data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb

@@ -8,7 +8,7 @@ class Skyline::Browser::Tabs::MediaLibrary::MediaFilesController < Skyline::Appl
       #   p.replace_html("browserUploadPanel", :partial => "new", :locals => {:media_dir => @media_dir})
       # end
     	    	
-    	p.replace("browserFilelist", :partial => "index")
+    	p.replace_html("browserContentPanel", :partial => "index")
     end    
   end
   

data/app/controllers/skyline/content_controller.rb

@@ -4,7 +4,7 @@ class Skyline::ContentController < Skyline::Skyline2Controller
   
   layout "skyline/layouts/content"
     
-  self.default_menu_item = :content_library   
+  self.default_menu = :content_library   
     
   def index
     if request.xhr?
@@ -89,13 +89,14 @@ 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", "list"}
+        render(:update){|p| p.call "Application.addOddEven", "#{stack.klass.name}Listing", "tbody tr"}
       elsif ids.size <= 1
         render :nothing => true        
       else
         list_elements!
         render :update do |p|
-          p.replace "list-wrapper", presenter_for(@elements,stack.klass)
+          p.replace_html "contentEditPanel", presenter_for(@elements,stack.klass)
+          p << "$('contentEditPanel').retrieve('skyline.layout').setup()";
         end
       end
     end  

data/app/controllers/skyline/{media_files_data_controller.rb → media/data_controller.rb}

@@ -1,60 +1,62 @@
-class Skyline::MediaFilesDataController < Skyline::ApplicationController  
-  after_filter :perform_cache, :only => :show
-  
-  self.page_cache_directory = Skyline::MediaCache.cache_path
-  
-  # show
-  # Renders the requested image with specified size parameters and stores the image in the cache. 
-  # If the image is already in the cache then 304 Not Modified is rendered.
-  #
-  # ==== Parameters
-  # size <String> WidthxHeight
-  
-  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})
-    
-    cached_file = File.join(self.page_cache_directory,request.path)    
-    
-    if File.exist?(cached_file)                      
-      response.etag = File.mtime(cached_file)
-          
-      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
-      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
-      else
-        size = nil
-      end
-      
-      if size.nil?
-        send_file @media_file.file_path, :filename => @media_file.name, :type => @media_file.content_type, :disposition => 'inline', :cache => true
-        @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
-        else
-          render :nothing => true, :status => :unprocessable_entity
-        end
-      end
-    end        
-  end
-  
-  protected
-    def perform_cache
-      return if @skip_caching
-      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)
-      end
-    end
+class Skyline::Media::DataController < Skyline::ApplicationController
+  
+  after_filter :perform_cache, :only => :show
+  
+  self.page_cache_directory = Skyline::MediaCache.cache_path
+  
+  # show
+  # Renders the requested image with specified size parameters and stores the image in the cache. 
+  # If the image is already in the cache then 304 Not Modified is rendered.
+  #
+  # ==== Parameters
+  # size <String> WidthxHeight
+  
+  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)    
+    
+    if File.exist?(cached_file)                      
+      response.etag = File.mtime(cached_file)
+          
+      if request.etag_matches?(response.etag)
+        head :not_modified
+      else
+        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] == @file.width && size[1] >= @file.height || size[1] == @file.height && size[0] >= @file.width
+      else
+        size = nil
+      end
+      
+      if size.nil?
+        send_file @file.file_path, :filename => @file.name, :type => @file.content_type, :disposition => 'inline', :cache => true
+        @skip_caching = true
+      else
+        if size.all?{|s| s > 0 }
+          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
+      end
+    end        
+  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
+  
 end

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

@@ -0,0 +1,83 @@
+class Skyline::Media::DirsController < Skyline::ApplicationController
+  
+  layout "skyline/layouts/media"
+  self.default_menu = :media_library
+  
+  authorize :create, :by => "media_dir_create"
+  authorize :edit, :update, :by => "media_dir_update"
+  authorize :destroy, :by => "media_dir_delete"
+  
+  def index
+    @dirs = Skyline::MediaDir.group_by_parent_id
+    @dir = Skyline::MediaDir.root
+  end
+  
+  def show
+    @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
+    parent_id = params[:parent_id] || 0        
+    
+    @parent = Skyline::MediaDir.find_by_id(parent_id)
+    if @parent
+      @dir = @parent.subdirectories.build
+    else
+      @dir = Skyline::MediaDir.new
+    end
+    @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
+  end
+  
+  def update    
+    @dir = Skyline::MediaDir.find(params[:id])
+    
+    if params[:skyline_media_dir]
+      @dir.name = params[:skyline_media_dir][:name] if !params[:skyline_media_dir][:name].blank?
+      @dir.parent_id = (params[:skyline_media_dir][:parent_id] == "0") ? nil : params[:skyline_media_dir][:parent_id]
+    
+      @saved = @dir.save
+    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
+  end  
+  
+  def destroy
+    destroy_dir = Skyline::MediaDir.find(params[:id])
+    
+    @dir = destroy_dir.directory
+    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
+  end
+  
+end

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

@@ -0,0 +1,80 @@
+class Skyline::Media::FilesController < Skyline::ApplicationController
+  
+  before_filter :find_dir
+
+  self.default_menu = :media_library
+  
+  authorize :create, :by => "media_file_create"
+  authorize :edit, :update, :by => "media_file_update"
+  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
+  end
+  
+  # We've got two different kinds of updates:
+  # 1. The regular "update" through a form
+  # 2. A drag action to a different directory.
+  # 
+  def update
+    @file = @dir.files.find(params[:id])
+    @file.attributes = params[:skyline_media_file]
+    
+    # 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"
+      
+    end    
+  end
+  
+  def create
+    @file = @dir.files.build(:name => params[:Filename], :data => params[:Filedata])
+    sleep 5
+
+    if @file.save
+      render :json => {:result => "success"}
+    else
+      render :json => {:result => "failed"}
+    end
+    
+  end  
+  
+  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
+  end
+
+  protected
+  
+  def find_dir
+    @dir = Skyline::MediaDir.find(params[:dir_id])
+  end
+  
+end