papermill 0.13.1 → 0.13.2

data/VERSION

@@ -1 +1 @@
-0.13.1
+0.13.2

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

@@ -0,0 +1,13 @@
+<p>
+  <%= form.label :title, I18n.t("title", :scope => 'papermill') %><br />
+  <%= form.text_field :title, :class => "text_field" %>
+</p>
+<p>
+  <%= form.label :copyright, I18n.t("copyright", :scope => 'papermill') %><br />
+  <%= form.text_field :copyright, :class => "text_field" %>
+</p>
+<p>
+  <%= form.label :description, I18n.t("description", :scope => 'papermill') %><br />
+  <%= form.text_area :description %>
+</p>
+<%= submit_tag I18n.t('save', :scope => 'papermill') %>

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

@@ -2,5 +2,5 @@
   <span class="image"><%= image_tag(thumbnail_asset.url(thumbnail_style)) %></span>
 <% else %>
   <span class="name" title="<%= thumbnail_asset.name %>"><%= truncate(thumbnail_asset.name, :length => 15) %></span>
-  <span class="infos"><%= thumbnail_asset.content_type.join('/') %></span>
+  <span class="infos"><%= thumbnail_asset.content_type %></span>
 <% end %>

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

@@ -1,39 +1,33 @@
-<link href="/papermill/papermill.css" media="screen" rel="stylesheet" type="text/css" />
 <div id="papermill-box">
   <div id="left">
-    <%= link_to(@asset.image? ? image_tag(@asset.url("400x#{Papermill::PAPERMILL_DEFAULTS[:max_height]}>")) : I18n.t("file_type", :type => @asset.content_type.join("/"), :scope => 'papermill'), @asset.url, :popup => true) %>
+    <%= link_to(@asset.image? ? image_tag(@asset.url("400x#{Papermill::PAPERMILL_DEFAULTS[:max_height]}>")) : I18n.t("file_type", :type => @asset.content_type, :scope => 'papermill'), @asset.url, :popup => true) %>
   </div>
   <div id="right">
     <div id="read-only">
-      <h3><%= I18n.t("read-only", :scope => 'papermill') %></h3>
-      <p><%= I18n.t("name", :scope => 'papermill') %><span><%= @asset.name %></span></p>
-      <p><%= I18n.t("content_type", :scope => 'papermill') %><span><%= @asset.content_type.join('/') %></span></p>
-      <p><%= I18n.t("size", :scope => 'papermill') %><span><%= number_to_human_size(@asset.size.to_i) %></span></p>
-      <% if @asset.image? %>
-        <p><%= I18n.t("width", :scope => 'papermill') %><span><%= @asset.width.to_i %>px</span></p>
-        <p><%= I18n.t("height", :scope => 'papermill') %><span><%= @asset.height.to_i %>px</span></p>
-      <% end %>
-      <p><%= I18n.t("created_at", :scope => 'papermill') %><span><%= I18n.l(@asset.created_at) %></span></p>
-      <p><%= I18n.t("updated_at", :scope => 'papermill') %><span><%= I18n.l(@asset.updated_at) %></span></p>
-      <p><%= I18n.t("class_name", :scope => 'papermill') %><span><%= @asset.class.name.underscore.humanize %></span></p>
-      <% if assetable = @asset.assetable %>
-        <p onclick="jQuery('#parent-box').toggle(); jQuery('#parent-box-more').toggle(); return false;"><%= I18n.t("parent", :scope => 'papermill') %><span id="parent-box-more">...</span></p>
-        <span style="display:none;" id="parent-box"><%= debug assetable.to_yaml %></span>
-      <% end %>
+      <table border="0">
+        <tr><td class="left-cell"><%= I18n.t("name", :scope => 'papermill') %>        </td><td><%= @asset.name %></td></tr>
+        <tr><td class="left-cell"><%= I18n.t("content_type", :scope => 'papermill') %></td><td><%= @asset.content_type %></td></tr>
+        <tr><td class="left-cell"><%= I18n.t("size", :scope => 'papermill') %>        </td><td><%= number_to_human_size(@asset.size.to_i) %></td></tr>
+        <% if @asset.image? %>                                                                
+        <tr><td class="left-cell"><%= I18n.t("width", :scope => 'papermill') %>       </td><td><%= @asset.width.to_i %>px</td></tr>
+        <tr><td class="left-cell"><%= I18n.t("height", :scope => 'papermill') %>      </td><td><%= @asset.height.to_i %>px</td></tr>
+        <% end %>                                                                             
+        <tr><td class="left-cell"><%= I18n.t("created_at", :scope => 'papermill') %>  </td><td><%= I18n.l(@asset.created_at) %></td></tr>
+        <tr><td class="left-cell"><%= I18n.t("updated_at", :scope => 'papermill') %>  </td><td><%= I18n.l(@asset.updated_at) %></td></tr>
+      </table>
     </div>
     <div id="read-write">
-      <h3><%= I18n.t("modifiable_fields", :scope => 'papermill') %></h3>
-      <% remote_form_for :papermill_asset, @asset, :url => papermill_path(@asset), :html => { :method => :put, :class => "edit_asset" } do |f| %>
-        <%= f.label :title, I18n.t("title", :scope => 'papermill') %>
-        <%= f.text_field :title, :class => "text_field" %>
-        <%= f.label :copyright, I18n.t("copyright", :scope => 'papermill') %>
-        <%= f.text_field :copyright, :class => "text_field" %>
-        <%= f.label :description, I18n.t("description", :scope => 'papermill') %>
-        <%= f.text_area :description %>
-        <div><%= submit_tag I18n.t('save', :scope => 'papermill') %></div>
-      <% end %>
+      <form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); return false;" method="post" action="/papermill/76">
+        <input type="hidden" value="put" name="_method"/>
+        <% fields_for :papermill_asset, @asset do |form| %>
+          <%= render :partial => 'form', :object => form %>
+        <% end %>
+      </form>
     </div>
   </div>
   <div style="clear:both;"></div>
-  <p id="footer"><%= I18n.t("location", :scope => 'papermill') +  @asset.url %></p>
+  <p id="footer">
+    <%= I18n.t("location", :scope => 'papermill') +  @asset.file.path %><br />
+    <%= I18n.t("url", :scope => 'papermill') +  @asset.url %>
+  </p>
 </div>

data/config/locales/papermill.yml

@@ -13,22 +13,20 @@ en:
     SWFUPLOAD_LOADING: "Loading..."
     SWFUPLOAD_ERROR: "Something happened while loading" # + " <file_name> (<swfupload error message> [<error code>])"
     file_type: "{{type.capitalize}} file"
-    read-only: "Read-only informations: "
-    modifiable_fields: "Modifiable fields: "
-    name: "Name: "
-    content_type: "Content-type: "
-    size: "File size: "
-    class_name: "Asset type: "
-    created_at: "Created at: "
-    updated_at: "Updated at: "
+    name: "Name"
+    content_type: "Content-type"
+    size: "File size"
+    class_name: "Asset type"
+    created_at: "Created at"
+    updated_at: "Updated at"
     title: "Title"
-    copyright: "Copyright: "
-    description: "Description: "
+    copyright: "Copyright"
+    description: "Description"
+    width: "Width"
+    height: "Height"
     save: "Send to server"
-    location: "File-system location: "
-    parent: "Parent object: "
-    width: "Width: "
-    height: "Height: "
+    location: "File : "
+    url: "URL : "
 fr:
   papermill:
     not-processed: "Erreur/ressource non trouvée"
@@ -44,19 +42,17 @@ fr:
     SWFUPLOAD_LOADING: "Chargement..."
     SWFUPLOAD_ERROR: "Une erreur est survenue pendant le chargement de"
     file_type: "Fichier {{type}}"
-    read-only: "Informations en lecture seule : "
-    modifiable_fields: "Informations modifiables : "
     name: "Nom : "
-    content_type: "Content-type : "
-    size: "Taille du fichier : "
-    class_name: "Type d'asset : "
-    created_at: "Création : "
-    updated_at: "Mise à jour : "
-    title: "Titre : "
-    copyright: "Copyright : "
-    description: "Description : "
+    content_type: "Content-type"
+    size: "Taille du fichier"
+    class_name: "Type d'asset"
+    created_at: "Création"
+    updated_at: "Mise à jour"
+    title: "Titre"
+    copyright: "Copyright"
+    description: "Description"
+    width: "Largeur"
+    height: "Hauteur"
     save: "Envoyer"
-    location: "Emplacement du fichier : "
-    parent: "Objet parent : "
-    width: "Largeur : "
-    height: "Hauteur : "
+    location: "Fichier : "
+    url: "Lien : "

data/lib/papermill/papermill_asset.rb

@@ -42,12 +42,16 @@ class PapermillAsset < ActiveRecord::Base
     file.url(style && CGI::escape(style.to_s))
   end
   
+  def path(style = nil)
+    file.path(style)
+  end
+  
   def content_type
-    file_content_type && file_content_type.split("/")
+    file_content_type
   end
   
   def image?
-    content_type && content_type.first == "image" && content_type[1]
+    content_type && content_type.split("/")[0] == "image" && (content_type.split("/")[1] || "unknown")
   end
   
   def destroy_files

data/public/papermill/papermill.css

@@ -1,16 +1,16 @@
-#papermill-box{width:942px; margin-bottom:10px;}
-#papermill-box #left {float:left; width:400px; padding-bottom:10px;}
-#papermill-box #right {float:right; width:500px; margin-left:20px; border-left:2px solid GREY; padding-left:20px; padding-bottom:10px;}
-#papermill-box #read-only {}
-#papermill-box #read-write {margin-top:30px;}
-#papermill-box p {margin:4px;}
-#papermill-box p span{font-weight:bold;}
-#papermill-box #parent-box {display:block; border:1px solid GREY; padding: 5px; margin:5px;}
-#papermill-box h3 {}
-#papermill-box input.text_field {width:400px; margin:10px; margin-top:5px;}
-#papermill-box textarea {width:400px; height:100px; margin:10px; margin-top:5px;}
-#papermill-box label {margin-left:4px;}
-#papermill-box #footer {text-align:center; font-size:12px; padding:5px}
+#papermill-box { width:862px; margin-bottom:10px; }
+#papermill-box #left { float:left; width:400px; padding-bottom:10px; }
+#papermill-box #right { float:right; width:420px; margin-left:20px; border-left:2px solid GREY; padding-left:20px; padding-bottom:10px; }
+#papermill-box input.text_field { width:400px; margin:5px 0; }
+#papermill-box textarea { width:403px; height:100px; margin:5px 0; }
+#papermill-box label {  }
+#papermill-box p { padding: 3px 0; margin:0;}
+
+#papermill-box #footer { text-align:center; font-size:10px; padding:5px }
+#papermill-box #read-write { margin:10px 0 0 5px; }
+
+#papermill-box .right-cell {}
+#papermill-box .left-cell {font-weight:bold; padding-right:10px; text-align:right;}
 
 .papermill a:hover { background:none; color:inherit; }
 .papermill a img { border:0px; }
@@ -44,4 +44,5 @@
 /* Need some backgrounds?
 .papermill li { 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

@@ -1,5 +1,5 @@
 popup = function(title1, title) {
-	window.open (title1, title, config='height=650, width=950, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, directories=no, status=no')
+	window.open (title1, title, config='height=580, width=870, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no')
 }
 
 
@@ -24,8 +24,8 @@ popup = function(url) {
 		Shadowbox.open({ 
 	  	content:    url,
 	    player:     "iframe",
-			width: 			950,
-			height: 		650
+			width: 			870,
+			height: 		580
 	  });
 	}
 	return false;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -39,6 +39,7 @@ files:
 - VERSION
 - app/controllers/papermill_controller.rb
 - app/views/papermill/_asset.html.erb
+- app/views/papermill/_form.html.erb
 - app/views/papermill/_raw_asset.html.erb
 - app/views/papermill/_thumbnail_asset.html.erb
 - app/views/papermill/edit.html.erb