papermill 1.1.2 → 1.1.3

data/README.rdoc

@@ -14,62 +14,50 @@
   
   rails -m http://github.com/bbenezech/papermill/raw/master/demo.txt papermill-example
 
-=== Out-of-the-box OPTIONAL compatibility with : 
+=== Out-of-the-box compatibility with : 
 
 * Formtastic          # use :as => :[image|asset](s)_upload
-* JGrowl              # instead of alert for notifications
-* FaceBox/Shadowbox   # instead of a pop_up for edit form
+* JGrowl              # for notifications (included)
+* FaceBox/Shadowbox   # for popups (included)
 * Stringex            # (or any String#to_url) for asset filename/url generation
 
 === Navigator minimal requirements: 
 
 * IE6+
 * Flash 9+
-* Javascript ON. 
+* Javascript ON
 
 Check your audience.
 
 === Server requirements:
 
 * Makes internal use of JQuery (but loaded in compatibility mode by default, compatible with Prototype/whatever... JRails not needed.)
-* Rails 2.3.4 (rail's I18n, engine. older 2.3.x have issues with CRSF or try to check for CRSF stamp against AJAX request, useless with AJAX same origin policy, fixed with 2.3.4)
-* Paperclip 2.3 branch (installed by default as a gem dependency, will be loaded internally if needed => You can require your own version of Paperclip)
+* Rails 2.3.4 min (rail's I18n, engine. older 2.3.x have issues with CRSF or try to check for CRSF stamp against AJAX request, useless with AJAX same origin policy, fixed with 2.3.4)
+* Paperclip 2.3 branch (installed by default as a gem dependency, will be loaded internally if needed => You can require your own version of Paperclip if you want to)
 * Front web server serving static assets if present, and forwarding demand to rails if not. (Usually a no-brainer on any classic installation. Works with Webrick)
-
-
-=== Windows environnement :
-
-  # Mime/Types library. Ex:
-  config.gem "mime-types", :lib => "mime/types"
  
 == Features
 
-Loads of them
-
 === Ajax uploading form helpers through SWFUpload => [image|asset](s)_upload
 
+See the demo to get an idea: 
+
 * image_upload => one image, with thumbnail preview
 * images_upload => sortable image thumbnail gallery
 * asset_upload => one asset
 * assets_upload => sortable asset list
 
-=== Choose thumbnail size for images previews : 
-
-* {:thumbnail => {:width => 100, :height => 100}}
-* {:thumbnail => {:style => "100x100>"}}
-* {:thumbnail => {:width => 100, :aspect_ratio => 4.0/3.0 }}
-
 === Asset edit form: 
 
-* double-click on any asset in any helper to access&edit his properties
-* with pop-up/shadowbox/facebox, out of the box (or use your own pop-up system, dead-easy)
+* double-click on any asset in any helper to access & edit his properties
 
 === Lazy created thumbnails
 
 * thumbnails are generated the first time they are asked-for, and only in the requested size. 
 * no need to register thumbnail size anywhere: my_asset.url("100x100>")
+* .. but you can use application-wide aliases, see below : 
 
-=== Alias handling, declaration application-wide (in config/initializers/papermill.rb, after you do a ./script/generate papermill_initializer)
+=== Alias handling, declaration application-wide (in config/initializers/papermill.rb, do a ./script/generate papermill_initializer)
 
 * :big_alias => {:geometry => "1000x>"}
 * :other_alias => "100x>"
@@ -93,7 +81,7 @@ entry.rb
     papermill :diaporama, :class_name => ColorAsset, other_options..
   end
 
-color_asset.rb  # You should add columns to papermill_assets and use STI on PapermillAsset to extend defaults capabilities (or re-open PapermillAsset and monkey-patch it..)
+color_asset.rb  # You should add columns to papermill_assets and use STI on PapermillAsset to extend defaults capabilities (or re-open PapermillAsset and monkey-patch it, or use a polymorphic association)
 
   class ColorAsset < PapermillAsset
     named_scope :red, :conditions => {:color => 'red'}
@@ -107,7 +95,7 @@ FormHelpers
     f.image_upload  :cover_image, options_hash
     f.images_upload :illustrations, options_hash
     f.asset_upload  :pdf, options_hash
-    f.image_upload  :other_ressources, options_hash
+    f.image_upload  :other_resources, options_hash
   end
   
 Or with formtastic :
@@ -116,7 +104,7 @@ Or with formtastic :
     f.input @article, :cover_image, options_hash, :as => :image_upload
     f.input @article, :illustrations, options_hash, :as => :images_upload
     f.input @article, :pdf, options_hash, :as => :asset_upload
-    f.input @article, :other_ressources, options_hash, :as => :image_upload
+    f.input @article, :other_resources, options_hash, :as => :image_upload
   end
 
 FormTagHelpers
@@ -124,14 +112,14 @@ FormTagHelpers
   image_upload_tag  @article, :cover_image, options_hash
   images_upload_tag @article, :illustrations, options_hash
   asset_upload_tag  @article, :pdf, options_hash
-  image_upload_tag  @article, :other_ressources, options_hash
+  image_upload_tag  @article, :other_resources, options_hash
 
 For resources not linked to any assetable model :
-  image_upload_tag "#{current_organization.name}_logo"
+  image_upload_tag "#{current_organization.name}_logo", options_hash
 
 === Resource access
 
-With generic papermill association, Papermill generates an #assets(:key, *args) named_scope
+Papermill generates an #assets(:key, *args) named_scope
   @article.assets(:illustrations)
   @article.assets(:illustrations, :order => "created_at DESC")
   @article.assets(:illustrations).red.first
@@ -154,11 +142,11 @@ Or for non-assetable resources :
 
   @asset = @entry.mug_shot.first
   image_tag @asset.url              # original
-  image_tag @asset.url("100x>")
+  image_tag @asset.url("100x>")     # assuming asset is an image
   image_tag @asset.url(:big)        # assuming you have a :big alias
   @asset.name
   @asset.content_type
-  @asset.path                       # original
+  @asset.path
   @asset.path("100x>")
   # etc.
 
@@ -175,11 +163,9 @@ Edit its fields and migrate :
 Copy static assets to your public directory:
   ./script/generate papermill_assets
   
-Create the option hash in config/initializers/papermill.rb
+Create the option file config/initializers/papermill.rb
   ./script/generate papermill_initializer
 
-Then see config/initializers/papermill.rb for the option hash.
-
 === environment.rb:
 
   ...

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/app/controllers/papermill_controller.rb

@@ -1,51 +1,46 @@
 class PapermillController < ApplicationController
-  prepend_before_filter :load_asset, :only => [ "show", "destroy", "update", "edit" ]
+  prepend_before_filter :load_asset, :only => [ "show", "destroy", "update", "edit", "crop" ]
   prepend_before_filter :load_assets, :only => [ "sort", "mass_delete", "mass_edit" ]
   
   def show
     if @asset.create_thumb_file(params[:style])
       redirect_to @asset.url(params[:style])
     else
-      render :nothing => true, :status => 404
+      render :nothing => true, :status => 500
     end
   end
 
-  def destroy
-    render :update do |page|
-      if @asset.destroy
-        page << %{ jQuery("#papermill_asset_#{params[:id]}").remove(); }
-      else
-        page << %{ jQuery("#papermill_asset_#{params[:id]}").show(); }
-        page << %{ notify("#{ escape_javascript t('papermill.not-deleted', :ressource => @asset.name) }", "error"); }
-      end
+  def create
+    @asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
+    if @asset.save
+      PapermillAsset.find(:all, :conditions => { :assetable_id => @asset.assetable_id, :assetable_type => @asset.assetable_type, :assetable_key => @asset.assetable_key }).each do |asset|
+        asset.destroy unless asset == @asset
+      end if !params[:gallery]
+      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style] }
     end
   end
   
+  def edit
+    render :action => "edit"
+  end
+  
+  def crop
+  end
+  
   def update
     render :update do |page|
       if @asset.update_attributes(params[:papermill_asset])
-        page << %{ notify("#{ escape_javascript t("papermill.updated", :ressource => @asset.name)}", "notice"); close_popup(self);  }
+        page << %{ notify("#{@asset.name}", "#{ escape_javascript t("papermill.updated", :resource => @asset.name)}", "notice"); close_popup(self);  }
       else
         page << %{ jQuery("#error").html("#{ escape_javascript @asset.errors.full_messages.join('<br />') }"); jQuery("#error").show(); }
       end
     end
   end
-  
-  def edit
-    render :action => "edit"
-  end
-  
-  def create
-    @asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
-    if @asset.save
-      PapermillAsset.find(:all, :conditions => { :assetable_id => @asset.assetable_id, :assetable_type => @asset.assetable_type, :assetable_key => @asset.assetable_key }).each do |asset|
-        asset.destroy unless asset == @asset
-      end if !params[:gallery]
-      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style] }
-    else
-      render :update do |page|
-        page << %{ notify("#{ escape_javascript(@asset.errors.to_sentence) }", "warning"); }
-      end
+
+  def destroy
+    @asset.destroy
+    render :update do |page|
+      page << %{ jQuery("#papermill_asset_#{params[:id]}").remove(); }
     end
   end
   
@@ -67,7 +62,7 @@ class PapermillController < ApplicationController
   def mass_edit
     @assets.each { |asset| asset.update_attribute(params[:attribute], params[:value]) }
     render :update do |page|
-      page << %{ notify("#{ escape_javascript  t("papermill.updated", :ressource => @assets.map(&:name).to_sentence)  }", "notice"); } unless @assets.blank? 
+      page << %{ notify("", "#{ escape_javascript  t("papermill.updated", :resource => @assets.map(&:name).to_sentence)  }", "notice"); } unless @assets.blank? 
     end
   end
   

data/app/views/papermill/_asset.html.erb

@@ -1,7 +1,7 @@
 <%- dom_id = "papermill_asset_#{asset.id}" -%>
-<%- delete_link = %{<a onclick="if(confirm('#{escape_javascript t("papermill.delete-confirmation", :resource => asset.name)}')){ jQuery.ajax({async:true, beforeSend:function(request){jQuery('##{dom_id}').hide();}, dataType:'script', error:function(request){jQuery('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("papermill.delete", :ressource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
+<%- delete_link = %{<a onclick="if(confirm('#{escape_javascript t("papermill.delete-confirmation", :resource => asset.name)}')){ jQuery.ajax({async:true, beforeSend:function(request){jQuery('##{dom_id}').hide();}, dataType:'script', error:function(request){jQuery('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("papermill.delete", :resource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
 
-<div id="<%= dom_id %>" class="asset" title="<%= t("papermill.#{(thumbnail_style) ? "thumbnail-" : ""}edit-title", :ressource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>">
+<div id="<%= dom_id %>" class="asset" title="<%= t("papermill.#{(thumbnail_style) ? "thumbnail-" : ""}edit-title", :resource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>">
 	<%= delete_link %>
 	<%- if thumbnail_style -%>
 	  <%= render :partial => "papermill/thumbnail_asset", :object => asset, :locals => {:thumbnail_style => thumbnail_style} %>

data/app/views/papermill/crop.html.erb

@@ -0,0 +1,34 @@
+<%= image_tag(@asset.url, :id => "cropbox") %>
+
+<!--
+<form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); return false;" method="post">
+  <input type="hidden" value="put" name="_method"/>
+  <input type="hidden" value="<%= params[:target] %>" name="target"/>
+  <% fields_for :papermill_asset, @asset do |f| %>
+    <% for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] %>
+      <%= f.hidden_field attribute, :id => attribute %>
+    <% end %>
+    <%= submit_tag t('papermill.save') %>
+  <% end -%>
+</form>
+-->
+<div style="margin:6px"></div>
+<%= link_to_function I18n.t("papermill.back"), "popup('#{edit_papermill_path(@asset)}')" %>
+
+<script type="text/javascript" charset="utf-8">/*
+  jQuery(function() {
+    jQuery('#cropbox').Jcrop({
+      onChange: update_crop,
+      onSelect: update_crop
+      //setSelect: [0, 0, 100, 100]
+      //aspectRatio: 1
+    });
+  });
+
+  function update_crop(coords) {
+    jQuery("#crop_x").val(coords.x);
+    jQuery("#crop_y").val(coords.y);
+    jQuery("#crop_w").val(coords.w);
+    jQuery("#crop_h").val(coords.h);
+  }*/
+</script>

data/app/views/papermill/edit.html.erb

@@ -1,6 +1,12 @@
 <div id="papermill-box">
   <div id="left">
-    <%= link_to(@asset.image? ? image_tag(@asset.url("400x>")) : t("file_type", :type => @asset.content_type, :scope => 'papermill'), @asset.url, :popup => true) %>
+    <% if @asset.image? %>
+      <%= link_to image_tag(@asset.url("400x400>")), @asset.url, :popup => true %>
+      <%# image_tag(@asset.url("400x400>"), :onDblClick => "popup('#{crop_papermill_path(@asset, :target => "original")}'); return false;", :title => I18n.t("papermill.thumbnail-edit-title", :resource => @asset.name)) %>
+      <div style="clear:both;"></div>
+    <% else %>
+      <%= link_to t("file_type", :type => @asset.content_type, :scope => 'papermill'), @asset.url, :popup => true %>
+    <% end -%>
   </div>
   <div id="right">
     <div id="read-only">
@@ -20,6 +26,7 @@
       <%= render :partial => 'form' %>
     </div>
   </div>
+  
   <div style="clear:both;"></div>
   <p id="footer">
     <%= t("papermill.location") +  @asset.file.path %><br />

data/config/locales/papermill.yml

@@ -1,13 +1,12 @@
 en:
   papermill: 
     not-processed: "Error/resource not processed"
-    updated: "'{{ressource}}' updated"
-    not-deleted: "'{{ressource}}' could not be deleted"
-    not-found: "Asset #{{ressource}} not found"
-    edit-title: "Click to edit '{{ressource}}'"
-    thumbnail-edit-title: "Double-click to edit '{{ressource}}'"
+    updated: "'{{resource}}' updated"
+    not-found: "Asset #{{resource}} not found"
+    edit-title: "Click to edit '{{resource}}'"
+    thumbnail-edit-title: "Double-click to edit '{{resource}}'"
     upload-button-wording: "Upload..."
-    delete: "Remove {{ressource}}"
+    delete: "Remove {{resource}}"
     delete-confirmation: "Delete '{{resource}}'?"
     SWFUPLOAD_PENDING: "Pending..."
     SWFUPLOAD_LOADING: "Loading..."
@@ -24,7 +23,8 @@ en:
     description: "Description"
     width: "Width"
     height: "Height"
-    save: "Send to server"
+    save: "Save"
+    back: "Back"
     location: "File : "
     url: "URL : "
     modify-all: "Modify all: "
@@ -32,14 +32,13 @@ en:
     delete-all-confirmation: "Are you sure?"
 fr:
   papermill:
-    not-processed: "Erreur/ressource non trouvée"
-    updated: "{{ressource}} modifiés(s)"
-    not-deleted: "{{ressource}} n'a pas pu être supprimée"
-    not-found: "Asset #{{ressource}} non trouvé"
-    edit-title: "Cliquer pour éditer '{{ressource}}'"
-    thumbnail-edit-title: "Double-cliquer pour éditer '{{ressource}}'"
+    not-processed: "Erreur/resource non trouvée"
+    updated: "{{resource}} modifiés(s)"
+    not-found: "Asset #{{resource}} non trouvé"
+    edit-title: "Cliquer pour éditer '{{resource}}'"
+    thumbnail-edit-title: "Double-cliquer pour éditer '{{resource}}'"
     upload-button-wording: "Charger.."
-    delete: "Supprimer {{ressource}}"
+    delete: "Supprimer {{resource}}"
     delete-confirmation: "Êtes-vous sûr de vouloir supprimer '{{resource}}' ?"
     SWFUPLOAD_PENDING: "En attente..."
     SWFUPLOAD_LOADING: "Chargement..."
@@ -56,7 +55,8 @@ fr:
     description: "Description"
     width: "Largeur"
     height: "Hauteur"
-    save: "Envoyer"
+    save: "Modifier"
+    back: "Retour"
     location: "Fichier : "
     url: "Lien : "
     modify-all: "Modifier tout : "

data/config/routes.rb

@@ -1,4 +1,4 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :papermill, :collection => { :sort => :post, :mass_edit => :post, :mass_delete => :post }
+  map.resources :papermill, :collection => { :sort => :post, :mass_edit => :post, :mass_delete => :post }, :member => { :crop => :get }
   map.connect "#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING.gsub(":id_partition", ":id0/:id1/:id2")}", :controller => "papermill", :action => "show"
 end

data/generators/papermill_assets/papermill_assets_generator.rb

@@ -4,12 +4,11 @@ class PapermillAssetsGenerator < Rails::Generator::Base
   
   def manifest
     puts "Copying papermill assets to your public directory..."
-    FileUtils.rm_rf("#{File.join(RAILS_ROOT)}/public/papermill/")
     FileUtils.cp_r(
       Dir[File.join(File.dirname(__FILE__), '../../public')],
       File.join(RAILS_ROOT)
       )
-    puts "Done! Check public/papermill/ for result."
+    puts "Done! Check public/ for result."
     exit
   end 
 end

data/generators/papermill_initializer/papermill_initializer_generator.rb

@@ -6,7 +6,7 @@ class PapermillInitializerGenerator < Rails::Generator::Base
     puts "Copying papermill initializer to config/initializers/..."
     FileUtils.rm_rf("#{RAILS_ROOT}/config/initializers/papermill.rb")
     FileUtils.cp_r(
-      File.join(File.dirname(__FILE__), '../..', 'lib', 'papermill', 'papermill_options.rb'),
+      File.join(File.dirname(__FILE__), '../..', 'lib', 'papermill', 'papermill_initializer.rb'),
       "#{RAILS_ROOT}/config/initializers/papermill.rb"
       )
     puts "Done! Check config/initializer/papermill.rb for result."

data/lib/papermill.rb

@@ -8,12 +8,8 @@ File.send :include, PapermillFileExtensions
 String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
 Formtastic::SemanticFormBuilder.send(:include, PapermillFormtasticExtensions) rescue NameError
 
-begin
-  require File.join(RAILS_ROOT, "config/initializers/papermill.rb")
-rescue LoadError
-  require 'papermill/papermill_options.rb'
-end
-
+require 'papermill/papermill_options.rb'
+require File.join(RAILS_ROOT, "config/initializers/papermill.rb") rescue LoadError
 require 'paperclip' unless defined?(Paperclip)
 require 'papermill/papermill_paperclip_processor'
 require 'papermill/papermill'

data/lib/papermill/form_builder.rb

@@ -34,130 +34,124 @@ module ActionView::Helpers::FormTagHelper
   end
   
   private
+  
   def papermill_upload_tag(key, options)
-    if key.nil? && options[:assetable]
-      key = options[:assetable]
+    
+    if key.nil? && [String, Symbol].include?(options[:assetable].class)
+      key = options[:assetable].to_s
       options[:assetable] = nil
     end
- 
-    assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
-    options = PapermillAsset.assetable_papermill_options(assetable && assetable.class.name, key).deep_merge(options)
     
+    assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
     assetable_id = assetable && (assetable.id || assetable.timestamp) || nil
     assetable_type = assetable && assetable.class.base_class.name || nil
-    id = "papermill_#{assetable_type}_#{assetable_id}_#{key ? key.to_s : 'nil'}"
-    if options[:thumbnail]
-      w = options[:thumbnail][:width]  || options[:thumbnail][:height] && options[:thumbnail][:aspect_ratio] && (options[:thumbnail][:height] * options[:thumbnail][:aspect_ratio]).to_i || nil
-      h = options[:thumbnail][:height] || options[:thumbnail][:width]  && options[:thumbnail][:aspect_ratio] && (options[:thumbnail][:width]  / options[:thumbnail][:aspect_ratio]).to_i || nil
-      options[:thumbnail][:style] ||= (w || h) && "#{w}x#{h}>" || "original"
-      if options[:inline_css]
-        size = []
-        size << "width:#{w}px" if w
-        size << "height:#{h}px" if h
-        size = size.join("; ")
-        @template.content_for :papermill_inline_css do
-          inline_css = ["\n"]
-          if options[:gallery]
-            vp = options[:gallery][:vpadding].to_i
-            hp = options[:gallery][:hpadding].to_i
-            vm = options[:gallery][:vmargin].to_i
-            hm = options[:gallery][:hmargin].to_i
-            b  = options[:gallery][:border_thickness].to_i
-            gallery_width = (options[:gallery][:width] || w) && "width:#{options[:gallery][:width] || options[:gallery][:columns]*(w+(hp+hm+b)*2)}px;" || ""
-            gallery_height = (options[:gallery][:height] || h) && "min-height:#{options[:gallery][:height] || options[:gallery][:lines]*(h+(vp+vm+b)*2)}px;" || ""
-            inline_css << %{##{id} { #{gallery_width} #{gallery_height} }}
-            inline_css << %{##{id} .asset { margin:#{vm}px #{hm}px; border-width:#{b}px; padding:#{vp}px #{hp}px; #{size}; }}
-          else
-            inline_css << %{##{id}, ##{id} .asset { #{size} }}
-          end
-          inline_css << %{##{id} .name { width:#{w || "100"}px; }}
-          inline_css.join("\n")
-        end
-      end
-    end
-    
-    url_options = {
-      :escape => false,
-      :controller => "/papermill", 
-      :action => "create", 
-      :asset_class => (options[:class_name] || PapermillAsset).to_s,
-      :gallery => !!options[:gallery], 
-      :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style]
-    }
-    
-    url_options.merge!({
-      :assetable_id => assetable_id, 
-      :assetable_type => assetable_type
-    }) if assetable
-    
-    url_options.merge!({
-      :assetable_key => key
-    }) if key
-    
+    options = PapermillAsset.assetable_papermill_options(assetable && assetable.class.name, key).deep_merge(options)
+    dom_id = "papermill_#{assetable_type}_#{assetable_id}_#{key}"
     
+    if ot = options[:thumbnail]
+      w = ot[:width]  || ot[:height] && ot[:aspect_ratio] && (ot[:height] * ot[:aspect_ratio]).to_i || nil
+      h = ot[:height] || ot[:width]  && ot[:aspect_ratio] && (ot[:width]  / ot[:aspect_ratio]).to_i || nil
+      ot[:style] ||= (w || h) && "#{w}x#{h}>" || "original"
+      set_papermill_inline_css(dom_id, w, h, options)
+    end
+
+    set_papermill_inline_js(dom_id, compute_papermill_create_url(assetable_id, assetable_type, key, options), options)
+
     html = {}
-    create_url = @template.url_for(url_options)
-    if assetable && assetable.new_record? && !@timestamped
-      @timestamp_field = @template.hidden_field(assetable_type.underscore, :timestamp, :value => assetable.timestamp)
-      @timestamped = true
+    html[:upload_button] = %{<div id="#{dom_id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{dom_id}" class="swf_button"></span></div>}
+    html[:container] = @template.content_tag(:div, :id => dom_id, :class => "papermill-#{key.to_s} #{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") do
+      conditions = {:assetable_type => assetable_type, :assetable_id => assetable_id}
+      conditions.merge!({:assetable_key => key.to_s}) if key
+      @template.render :partial => "papermill/asset", :collection => PapermillAsset.all(:conditions => conditions), :locals => { :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style] }
     end
     
-    conditions = {:assetable_type => assetable_type, :assetable_id => assetable_id}
-    conditions.merge!({:assetable_key => key.to_s}) if key
-    collection = PapermillAsset.all(:conditions => conditions)
-    
-    html[:upload_button] = %{<div id="#{id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{id}" class="swf_button"></span></div>}
-    html[:container] = @template.content_tag(:div, :id => id, :class => "#{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {
-      @template.render :partial => "papermill/asset", :collection => collection, :locals => { :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style] }
-    }
-    
     if options[:gallery]
       html[:dashboard] = {}
-      html[:dashboard][:mass_edit] = %{<a onclick="modify_all('#{id}'); return false;" style="cursor:pointer">#{I18n.t("papermill.modify-all")}</a><select id="batch_#{id}">#{options[:mass_editable_fields].map do |field|
+      html[:dashboard][:mass_edit] = %{<a onclick="Papermill.modify_all('#{dom_id}'); return false;" style="cursor:pointer">#{I18n.t("papermill.modify-all")}</a><select id="batch_#{dom_id}">#{options[:mass_editable_fields].map do |field|
                 %{<option value="#{field.to_s}">#{I18n.t("papermill.#{field.to_s}", :default => field.to_s)}</option>}
               end.join("\n")}</select>}
-      html[:dashboard][:mass_delete] = %{<a onclick="mass_delete('#{id}', '#{@template.escape_javascript I18n.t("papermill.delete-all-confirmation")}'); return false;" style="cursor:pointer">#{I18n.t("papermill.delete-all")}</a>}
+      html[:dashboard][:mass_delete] = %{<a onclick="Papermill.mass_delete('#{dom_id}', '#{@template.escape_javascript I18n.t("papermill.delete-all-confirmation")}'); return false;" style="cursor:pointer">#{I18n.t("papermill.delete-all")}</a>}
       html[:dashboard] = @template.content_tag(:ul, options[:dashboard].map{|action| @template.content_tag(:li, html[:dashboard][action], :class => action.to_s) }.join("\n"), :class => "dashboard")
     end
     
-    @template.content_for :papermill_inline_js do %{
-      jQuery("##{id}").sortable({
-        update:function(){
-          jQuery.ajax({
-            async: true, 
-            data: jQuery(this).sortable('serialize'), 
-            dataType: 'script', 
-            type: 'post', 
-            url: '#{@template.controller.send("sort_papermill_path")}'
-          })
-        }
-      })
-    } end if options[:gallery]
+    if assetable && assetable.new_record? && !@timestamped
+      @timestamp_field = @template.hidden_field(assetable_type.underscore, :timestamp, :value => assetable.timestamp)
+      @timestamped = true
+    end
     
-    @template.content_for :papermill_inline_js do %{
+	  %{<div class="papermill">#{@timestamp_field.to_s + options[:form_helper_elements].map{|element| html[element] || ""}.join("\n")}</div>}
+  end
+  
+  
+  def compute_papermill_create_url(assetable_id, assetable_type, key, options)
+    create_url_options = { 
+      :escape => false, :controller => "/papermill", :action => "create", 
+      :asset_class => (options[:class_name] || PapermillAsset).to_s,
+      :gallery => !!options[:gallery], :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style]
+    }
+    create_url_options.merge!({ :assetable_id => assetable_id, :assetable_type => assetable_type }) if assetable_id
+    create_url_options.merge!({ :assetable_key => key }) if key
+    @template.url_for(create_url_options)
+  end
+  
+  def set_papermill_inline_js(dom_id, create_url, options)
+    return unless options[:inline_css]
+    @template.content_for :papermill_inline_js do
+      %{
+        jQuery("##{dom_id}").sortable({
+          update:function(){
+            jQuery.ajax({
+              async: true, 
+              data: jQuery(this).sortable('serialize'), 
+              dataType: 'script', 
+              type: 'post', 
+              url: '#{@template.controller.send("sort_papermill_path")}'
+            })
+          }
+        })
+      } if options[:gallery]
+    end
+    @template.content_for :papermill_inline_js do
+      %{
         new SWFUpload({
           post_params: {
-            "#{ActionController::Base.session_options[:key]}": "#{@template.cookies[ActionController::Base.session_options[:key]]}",
-            "authenticity_token": "#{@template.form_authenticity_token}"
+            "#{ ActionController::Base.session_options[:key] }": "#{ @template.cookies[ActionController::Base.session_options[:key]] }",
+            "authenticity_token": "#{ @template.form_authenticity_token }"
           },
-          upload_id: "#{id}",
-          upload_url: "#{@template.escape_javascript create_url}",
-          file_types: "#{options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : ''}",
-          file_queue_limit: "#{!options[:gallery] ? '1' : '0'}",
-          file_queued_handler: Upload.file_queued,
-          file_dialog_complete_handler: Upload.file_dialog_complete,
-          upload_start_handler: Upload.upload_start,
-          upload_progress_handler: Upload.upload_progress,
-          file_queue_error_handler: Upload.file_queue_error,
-          upload_error_handler: Upload.upload_error,
-          upload_success_handler: Upload.upload_success,
-          upload_complete_handler: Upload.upload_complete,
-          button_placeholder_id: "browse_for_#{id}",
-          #{options[:swfupload].map{ |key, value| "#{key}: #{(value.is_a?(String) ? "\"#{@template.escape_javascript(value)}\"" : @template.escape_javascript(value.to_s))}" if value }.compact.join(",\n")}
+          upload_id: "#{ dom_id }",
+          upload_url: "#{ @template.escape_javascript create_url }",
+          file_types: "#{ options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : '' }",
+          file_queue_limit: "#{ !options[:gallery] ? '1' : '0' }",
+          file_queued_handler: Papermill.file_queued,
+          file_dialog_complete_handler: Papermill.file_dialog_complete,
+          upload_start_handler: Papermill.upload_start,
+          upload_progress_handler: Papermill.upload_progress,
+          file_queue_error_handler: Papermill.file_queue_error,
+          upload_error_handler: Papermill.upload_error,
+          upload_success_handler: Papermill.upload_success,
+          upload_complete_handler: Papermill.upload_complete,
+          button_placeholder_id: "browse_for_#{dom_id}",
+          #{ options[:swfupload].map { |key, value| "#{key}: #{(value.is_a?(String) ? "\"#{@template.escape_javascript(value)}\"" : @template.escape_javascript(value.to_s))}" if value }.compact.join(",\n") }
         });
       }
-  	end
-    
-	  %{<div class="papermill">#{@timestamp_field.to_s + options[:form_helper_elements].map{|element| html[element] || ""}.join("\n")}</div>}
+    end
+  end
+  
+  def set_papermill_inline_css(dom_id, width, height, options)
+    html = ["\n"]
+    size = [width && "width:#{width}px", height && "height:#{height}px"].compact.join("; ")
+    if og = options[:gallery]
+      vp, hp, vm, hm, b = [og[:vpadding], og[:hpadding], og[:vmargin], og[:hmargin], og[:border_thickness]].map &:to_i
+      gallery_width = (og[:width] || width) && "width:#{og[:width] || og[:columns]*(width+(hp+hm+b)*2)}px;" || ""
+      gallery_height = (og[:height] || height) && "min-height:#{og[:height] || og[:lines]*(height+(vp+vm+b)*2)}px;" || ""
+      html << %{##{dom_id} { #{gallery_width} #{gallery_height} }}
+      html << %{##{dom_id} .asset { margin:#{vm}px #{hm}px; border-width:#{b}px; padding:#{vp}px #{hp}px; #{size}; }}
+    else
+      html << %{##{dom_id}, ##{dom_id} .asset { #{size} }}
+    end
+    html << %{##{dom_id} .name { width:#{width || "100"}px; }}
+    @template.content_for :papermill_inline_css do
+      html.join("\n")
+    end
   end
 end