papermill 1.0.2 → 1.0.3

data/README.rdoc

@@ -1,12 +1,9 @@
 = Papermill 
 
-Asset management made easy. Now in pre-1.0.0 release!
+Asset management made easy.
 
 == News..
 
-1.0.0 Release, finally!
-Things should be more stable now.
-
 I can't make it work with IE6, there seems to be a jQuery problem. SWFUpload and jQuery should both work fine with it, but anyway, it dies with strange errors that I don't understand. Any help appreciated...
 
 == Install the gems
@@ -57,12 +54,12 @@ Loads of them
 
 === Generic catch-all declaration
 
-  papermill {options}                                     # in your papermilled assetable model
+  papermill options_hash                                # in your papermilled assetable model
   @article.assets(:any_key, options_hash)               # data access
 
 === Association specific declaration
 
-  papermill :my_association, options_hash                 # in your papermilled assetable model
+  papermill :my_association, options_hash               # in your papermilled assetable model
   @article.my_association                               # data access
 
 == Usage:

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

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

@@ -1,11 +1,11 @@
 <%- 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>} %>
 
-<li id="<%= dom_id %>" 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", :ressource => 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} %>
 	<%- else -%>
 	  <%= render :partial => "papermill/raw_asset", :object => asset %>
 	<%- end -%>
-</li>
+</div>

data/lib/papermill/form_builder.rb

@@ -74,9 +74,9 @@ module ActionView::Helpers::FormTagHelper
             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} li { margin:#{vm}px #{hm}px; border-width:#{b}px; padding:#{vp}px #{hp}px; #{size}; }}
+            inline_css << %{##{id} .asset { margin:#{vm}px #{hm}px; border-width:#{b}px; padding:#{vp}px #{hp}px; #{size}; }}
           else
-            inline_css << %{##{id}, ##{id} li { #{size} }}
+            inline_css << %{##{id}, ##{id} .asset { #{size} }}
           end
           inline_css << %{##{id} .name { width:#{w || "100"}px; }}
           inline_css.join("\n")
@@ -115,7 +115,7 @@ module ActionView::Helpers::FormTagHelper
     collection = PapermillAsset.all(:conditions => conditions, :order => "position")
     
     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(:ul, :id => id, :class => "#{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {
+    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]) }
     } 
     
@@ -128,9 +128,21 @@ module ActionView::Helpers::FormTagHelper
       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")}'})}})} if options[:gallery]}
+    @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]
+    
+    @template.content_for :papermill_inline_js do %{
         new SWFUpload({
           upload_id: "#{id}",
           upload_url: "#{@template.escape_javascript create_url}",

data/lib/papermill/papermill_helper.rb

@@ -8,8 +8,8 @@ module PapermillHelper
   def papermill_javascript_tag(options = {})
     html = []
     if options[:with_jquery] || options[:with_jqueryui]
-      html << %{<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"</script>} if options[:with_jquery]
-      html << %{<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"</script>} if options[:with_jquery] || options[:with_jqueryui_only]
+      html << %{<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript"></script>} if options[:with_jquery]
+      html << %{<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js" type="text/javascript"></script>} if options[:with_jquery] || options[:with_jqueryui_only]
       html << %{<script type="text/javascript">jQuery.noConflict();</script>} if options[:with_jquery] == "no_conflict"
     end
     html << %{<script type="text/javascript">}
@@ -19,9 +19,13 @@ module PapermillHelper
     html << %{</script>}
     html << javascript_include_tag("/papermill/papermill", "/papermill/swfupload")
     unless @content_for_papermill_inline_js.blank?
-      html << '<script type="text/javascript">jQuery(document).ready(function() {'
+      html << '<script type="text/javascript">'
+      html << '//<![CDATA['
+      html << 'jQuery(document).ready(function() {'
       html << @content_for_papermill_inline_js
-      html << '});</script>'
+      html << '});'
+      html << '//]]>'
+      html << '</script>'
     end
     html.join("\n")
   end

data/public/papermill/papermill.css

@@ -14,8 +14,8 @@
 
 .papermill { overflow:hidden; }
 .papermill a img { border:0px; }
-.papermill li:hover { border-color:blue; }
-.papermill li a { display:block;  }
+.papermill .asset:hover { border-color:blue; }
+.papermill .asset a { display:block;  }
 .papermill .progress { display:block; border:1px solid #C2E3EF; text-align:left; height:6px; }
 .papermill .progress span { background:#7BB963; height:6px; width:0; display:block; }
 
@@ -24,34 +24,29 @@
 .papermill .dashboard li.mass_delete a { background:transparent url(images/mass-delete.png) no-repeat top left; }
 
 .papermill-thumb-container { position:relative; border:5px solid #EEE; padding:4px; overflow:hidden; }	
-.papermill-thumb-container li { border:0px solid transparent; min-height:25px; min-width:25px; display:block; float:left; position:relative; }
-.papermill-thumb-container li span { display:block; }
-.papermill-thumb-container li .delete { position:absolute; bottom:5px; right:5px;  }
-.papermill-thumb-container li .name { font-size:10px; overflow:hidden; font-weight:bold; }
-.papermill-thumb-container li .infos { font-size:8px; overflow:hidden; }
-.papermill-thumb-container li .status { margin-bottom:10px; }
+.papermill-thumb-container .asset { border:0px solid transparent; min-height:25px; min-width:25px; display:block; float:left; position:relative; }
+.papermill-thumb-container .asset span { display:block; }
+.papermill-thumb-container .asset .delete { position:absolute; bottom:5px; right:5px;  }
+.papermill-thumb-container .asset .name { font-size:10px; overflow:hidden; font-weight:bold; }
+.papermill-thumb-container .asset .infos { font-size:8px; overflow:hidden; }
+.papermill-thumb-container .asset .status { margin-bottom:10px; }
 
 .papermill-asset-container {  border:1px solid #EEE; padding:3px; }
-.papermill-asset-container li { display:block; height:22px; }
-.papermill-asset-container li .swfupload .name { margin-left:21px; }
-.papermill-asset-container li .name { float:left; }
-.papermill-asset-container li .status { margin-left:5px; float:left; }
-.papermill-asset-container li .progress { float:left; margin-top:6px; margin-left:5px; width:100px; }
-.papermill-asset-container li .delete { float:left; margin-top:2px; margin-right:5px; }
+.papermill-asset-container .asset { display:block; height:22px; }
+.papermill-asset-container .asset .swfupload .name { margin-left:21px; }
+.papermill-asset-container .asset .name { float:left; }
+.papermill-asset-container .asset .status { margin-left:5px; float:left; }
+.papermill-asset-container .asset .progress { float:left; margin-top:6px; margin-left:5px; width:100px; }
+.papermill-asset-container .asset .delete { float:left; margin-top:2px; margin-right:5px; }
 
-.papermill-thumb-container.papermill-multiple-items li { cursor:move; }
+.papermill-thumb-container.papermill-multiple-items .asset { cursor:move; }
 
 .papermill-asset-container.papermill-multiple-items { padding-left:10px; border-left:5px solid #EEE; min-height:44px; }
-.papermill-asset-container.papermill-multiple-items li { cursor:row-resize; }
+.papermill-asset-container.papermill-multiple-items .asset { cursor:row-resize; }
 
 .papermill-asset-container.papermill-unique-item { padding-left:5px; min-height:22px; }
 
-/* Using formtastic? Move this to your formtastic_changes.css to make it cleaner : */
-form.formtastic .papermill ul li {
-	margin-bottom:0;
-}
-
 /* Need some backgrounds?
-.papermill li { background:transparent url(images/background.png) repeat top left; }
+.papermill .asset { background:transparent url(images/background.png) repeat top left; }
 .papermill-thumb-container { background:transparent url(images/container-background.jpg) repeat top left; }
 */

data/public/papermill/papermill.js

@@ -81,17 +81,17 @@ var Upload = {
 			this.sorted_queue = file_queue.sort(function(a,b){
 				if(b.name < a.name){return (1)}
 			})
-			self = this;
+			var self = this;
 			jQuery(this.sorted_queue).each( function(index, file) {
-				li = jQuery('<li></li>').attr({ 'id': file.id, 'class': 'swfupload' });
-				li.append(jQuery('<span></span>').attr('class', 'name').html(file.name.substring(0, 10) + '...'));
-				li.append(jQuery('<span></span>').attr('class', 'status').html(SWFUPLOAD_PENDING));
-				li.append(jQuery('<span></span>').attr('class', 'progress').append('<span></span>'));
+				div = jQuery('<div></div>').attr({ 'id': file.id, 'class': 'swfupload asset' });
+				div.append(jQuery('<span></span>').attr('class', 'name').html(file.name.substring(0, 10) + '...'));
+				div.append(jQuery('<span></span>').attr('class', 'status').html(SWFUPLOAD_PENDING));
+				div.append(jQuery('<span></span>').attr('class', 'progress').append('<span></span>'));
 
 				if(self.settings.file_queue_limit == 1) {
-					jQuery("#" + self.settings.upload_id).html(li);
+					jQuery("#" + self.settings.upload_id).html(div);
 				} else {
-					jQuery("#" + self.settings.upload_id).append(li);
+					jQuery("#" + self.settings.upload_id).append(div);
 				}
 			})
 			this.startUpload(this.sorted_queue[this.index++].id);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"