radiant-assets-extension 0.0.6 → 0.0.7

data/{README → README.rdoc}

@@ -7,7 +7,7 @@ Supports uploading of images as well as other files.
 
 == Radius Tags
 
-<r:images size="300x" />
+<r:image size="300x" />
 
 Proportionally resizes an image to 300px width. Supports imagemagick geometry
 strings to do advanced resizing straight in Radius tags. Resized images are
@@ -17,4 +17,6 @@ request.
 == Todo
 
 - Attaching Assets to Pages
-- Easy/Automatic migration from paperclipped
+- Easy/Automatic migration from paperclipped (currently this extension should
+  only be used on “fresh” radiant sites w/o an asset management solution
+  already in place)

data/Rakefile

@@ -96,17 +96,17 @@ namespace :spec do
   end
 end
 
-desc 'Generate documentation for the images extension.'
+desc 'Generate documentation for the assets extension.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ImagesExtension'
+  rdoc.title    = 'AssetsExtension'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 # For extensions that are in transition
-desc 'Test the images extension.'
+desc 'Test the assets extension.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.pattern = 'test/**/*_test.rb'

data/app/controllers/admin/assets_controller.rb

@@ -1,28 +1,11 @@
 class Admin::AssetsController < Admin::ResourceController
+  include Admin::UploadHandler
   paginate_models
-  helper :assets
   
   def create
-    # HACK: depends on javascript being present and packaging each file
-    # in its own request
-    # TODO: handle non-js situations with several files in one request
-    @asset = Asset.create! :upload => Array(params[:asset][:upload]).first
-    @asset.save!
-    render_hacky_json(:markup => @template.asset_listing(@asset))
-  rescue => e
-    logger.warn(e.to_s)
-    render_hacky_json(:markup => "Error: #{e.to_s}")
-  end
-  
-private
-  # HACK: sending JSON as text/html
-  # (https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
-  # jquery.fileupload makes use of iframes for browsers like Microsoft
-  # Internet Explorer and Opera, which do not yet support XMLHTTPRequest
-  # uploads. They will only register a load event if the Content-type of the
-  # response is set to text/plain or text/html, not if it is set to
-  # application/json.
-  def render_hacky_json(data)
-    render :json => data, :content_type => 'text/html'
+    rendering_upload_response do
+      @asset = Asset.create! params[:asset]
+      @template.content_tag(:li, @template.asset_listing(@asset))
+    end
   end
 end

data/app/controllers/admin/attachments_controller.rb

@@ -0,0 +1,21 @@
+class Admin::AttachmentsController < Admin::ResourceController
+  include Admin::UploadHandler
+  
+  def create
+    rendering_upload_response do
+      @page = Page.find(params[:page_id])
+      attachment = @page.attachments.create!(params[:attachment])
+      render_to_string(:partial => 'admin/assets/attachment', :locals => {:attachment => attachment})
+    end
+  end
+  
+  # Gets called after successful update
+  # only used when attachment update form not submitted using javascript
+  def index
+    redirect_to edit_admin_page_path(params[:page_id])
+  end
+  
+  def positions
+    render :json => Attachment.reorder(params[:attachment])
+  end
+end

data/app/controllers/admin/upload_handler.rb

@@ -0,0 +1,22 @@
+module Admin::UploadHandler
+  private
+    # HACK: sending JSON as text/html
+    # (https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
+    # jquery.fileupload makes use of iframes for browsers like Microsoft
+    # Internet Explorer and Opera, which do not yet support XMLHTTPRequest
+    # uploads. They will only register a load event if the Content-type of the
+    # response is set to text/plain or text/html, not if it is set to
+    # application/json.
+    def render_hacky_json(data)
+      render :json => data, :content_type => 'text/html'
+    end
+    
+    # Renders a response appropriate for use with jquery.fileupload.js
+    # Takes a block that should return an HTML string
+    def rendering_upload_response
+      render_hacky_json(:markup => yield)
+    rescue => e
+      logger.warn(e.to_s)
+      render_hacky_json(:markup => "Error: #{e.to_s}")
+    end
+end

data/app/helpers/assets_helper.rb

@@ -1,10 +1,16 @@
 module AssetsHelper  
   def asset_listing(asset)
-    icon(asset) +
+    asset_icon(asset) +
     content_tag(:span, asset.to_s, :class=>'title')
   end
   
-  def icon(asset, size=30)
+  def asset_grid_item(asset)
+    asset_icon(asset, 120) +
+    content_tag(:span, "ID: #{asset.id}", :class => 'id') +
+    content_tag(:span, asset.to_s, :class => 'caption')
+  end
+  
+  def asset_icon(asset, size=30)
     asset.image? ? square_thumb(asset, size) : text_icon(asset, size)
   end
   

data/app/models/asset.rb

@@ -1,16 +1,30 @@
 class Asset < ActiveRecord::Base
+  has_many :attachments, :include => :page, :dependent => :destroy
   # HACK: incomplete
   AUDIO_FORMATS = [:wav, :mp3, :m4a, :ogg]
   VIDEO_FORMATS = [:mp4, :avi]
   
   image_accessor :upload
   validates_presence_of :upload
+  delegate :url, :width, :height, :landscape, :portrait, :to => :upload
+  
+  def uploads
+    []
+  end
+  
+  def uploads=(new_uploads)
+    # HACK: depends on javascript being present and packaging each file
+    # in its own request
+    # TODO: handle non-js situations with several files in one request
+    # see Admin::AttachmentsController#create and Admin::AssetsController#create
+    self.upload = Array(new_uploads).first
+  end
   
   def format
      # HACK: relying on extension instead of using analyser and upload.format
      # analyser can throw us into very long loop when trying to identify
      # non-image files like word docs
-     upload.ext && upload.ext.to_sym
+     upload.ext ? upload.ext.to_sym : :generic
   rescue Dragonfly::FunctionManager::UnableToHandle
     :generic
   end
@@ -32,6 +46,6 @@ class Asset < ActiveRecord::Base
   end
   
   def to_s
-    caption || upload.name
+    caption || upload.name || ''
   end
 end

data/app/models/asset_tags.rb

@@ -27,26 +27,37 @@ module AssetTags
   # TODO: accept width/height attributes and do something sensible like
   # resizing proportionally
   tag 'image' do |tag|
-    assert_id_given(tag)
-    image = find_asset(tag)
-    %{<img src="#{image.url}" width="#{image.width}" height="#{image.height}">}
+    asset = find_asset(tag)
+    options = tag.attr.dup
+    image = resized_or_original_image(asset, options.delete('size'))
+    %{<img src="#{image.url}"#{html_attributes(options)}>}
   end
   
   desc %{
     Selects an asset. Does not render anything itself but gives access to the
     asset's attributes such as size
     
-    Accepts optional @size@ attribute, see documentation for r:image
-    
-    <r:asset id="22" [size="200"]><r:url /></r:asset>
+    <r:asset id="22"><r:url /></r:asset>
   }
   tag 'asset' do |tag|
-    assert_id_given(tag)
     tag.locals.asset = find_asset(tag)
     tag.expand
   end
   
-  %w[url width height].each do |attribute|
+  desc %{
+    Renders the URL of an asset
+    
+    Accepts optional size parameter in which case, if the asset is an image,
+    the URL to a resized version of the image will be returned
+    
+    <r:asset:url [size="200x200"] id="22" />
+  }
+  tag 'asset:url' do |tag|
+    image = resized_or_original_image(tag.locals.asset, tag.attr['size'])
+    (image && image.url) || tag.locals.asset.url
+  end
+  
+  %w[caption width height].each do |attribute|
     desc %{
       Renders the #{attribute} of the current asset
     }
@@ -55,13 +66,6 @@ module AssetTags
     end
   end
   
-  desc %{
-    Renders the caption of the current asset
-  }
-  tag 'asset:caption' do |tag|
-    tag.locals.asset.caption
-  end
-  
   desc %{
     Renders contents if the current asset is an image
   }
@@ -92,17 +96,45 @@ module AssetTags
     end
   end
   
-private
-  def assert_id_given(tag)
-    raise TagError, 'Please supply an id attribute' unless tag.attr['id']
+  # Namespace only
+  tag 'attachments' do |tag|
+    tag.expand
   end
-
+  
+  desc %{
+    Selects the first attached asset of the page and renders the tag's contents.
+    If there are no assets on the page, nothing is rendered.
+  }
+  tag 'attachments:first' do |tag|
+    if attachment = tag.locals.page.attachments.first
+      tag.locals.asset = attachment.asset
+      tag.expand
+    end
+  end
+  
+  tag 'attachments:each' do |tag|
+    tag.locals.page.attachments.collect do |attachment|
+      tag.locals.attachment = attachment
+      tag.locals.asset = attachment.asset
+      tag.expand
+    end
+  end
+  
+private
   def find_asset(tag)
-    asset = Asset.find(tag.attr['id'])
-    if(tag.attr['size'])
-      asset.upload.process(:resize, tag.attr['size'])
-    else
-      asset.upload
+    tag.locals.asset || Asset.find(tag.attr['id'])
+  rescue ActiveRecord::RecordNotFound
+    raise TagError, 'Please supply an id attribute'
+  end
+  
+  def resized_or_original_image(asset, size)
+    if asset.image?
+      size ? asset.upload.process(:resize, size) : asset.upload
     end
   end
+  
+  def html_attributes(options)
+    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+    " #{attributes}" unless attributes.empty?
+  end
 end

data/app/models/attachment.rb

@@ -0,0 +1,23 @@
+require 'acts_as_list'
+
+class Attachment < ActiveRecord::Base
+  belongs_to :asset, :autosave => true
+  belongs_to :page
+  
+  acts_as_list :scope => :page_id
+  
+  def self.reorder(new_order)
+    new_order.each_with_index do |id, index|
+      find(id).update_attributes! :position => index+1
+    end
+    new_order
+  end
+  
+  def uploads=(new_uploads)
+    (asset || build_asset).uploads=new_uploads
+  end
+  
+  def uploads
+    (asset || build_asset).uploads
+  end
+end

data/app/views/admin/assets/_attachment.html.erb

@@ -0,0 +1,3 @@
+<% content_tag_for(:li, attachment) do %>
+  <%= asset_grid_item(attachment.asset) %>
+<% end %>

data/app/views/admin/assets/_attachments.html.erb

@@ -0,0 +1,23 @@
+<h2>Attachments</h2>
+
+<%= render :partial => 'admin/assets/upload', :locals => {:record => @page.attachments.build, :url => admin_page_attachments_path(@page)} %>
+
+<ul id="assets">
+  <%= render :partial => 'admin/assets/attachment', :collection => @page.attachments.reject(&:new_record?) %> 
+</ul>
+
+<script type="text/javascript">
+  (function($) {
+    $(function() {
+      $('#assets').sortable({
+        update: function(event, ui) {
+          $.ajax({
+            type: "POST",
+            url: '<%= positions_admin_page_attachments_path(@page) %>',
+            data: '_method=PUT&'+$(this).sortable('serialize'),
+          });
+        }
+      }).disableSelection();
+    });
+  }(jQuery));
+</script>

data/app/views/admin/assets/_grid.html.erb

@@ -1,11 +1,9 @@
 <ul id="assets">
-  <% unless @assets.empty? %>
-    <% @assets.each do |asset| %>
+  <% unless assets.empty? %>
+    <% assets.each do |asset| %>
       <li>
         <% link_to edit_admin_asset_path(asset) do %>
-          <%= icon(asset, 120) %>
-          <span class="id">ID: <%= asset.id %></span>
-          <span class="caption"><%= asset %></span>
+          <%= asset_grid_item(asset) %>
         <% end %>
         <%= link_to_remove(asset) %>
       </li>

data/app/views/admin/assets/_list.html.erb

@@ -3,6 +3,7 @@
     <th class="name">Name</th>
     <th class="format">Type</th>
     <th class="size">Size</th>
+    <th class="updated_at">Last Changed</th>
     <th class="actions">Modify</th>
   </thead>
   <tbody>
@@ -12,6 +13,7 @@
         <td class="name"><%= asset_listing(asset) %></td>
         <td class="format"><%= asset.format.to_s.mb_chars.upcase %></td>
         <td class="size"><%= number_to_human_size(asset.upload.size) %></td>
+        <td class="updated_at"><%= time_ago_in_words asset.updated_at %> ago</td>
         <td class="actions"><%= link_to_remove(asset)  %></td>
       </tr>
       <% end %>

data/app/views/admin/assets/_upload.html.erb

@@ -0,0 +1,40 @@
+<% include_stylesheet 'admin/extensions/assets/assets' %>
+
+<% form_for record, :url => url, :html => {:multipart => true, :id => 'asset_upload', 'data-onsubmit_status'=>'Uploading Asset&#8230;'} do |f| %>
+  <p>Click or drag files here to upload</p>
+  <%= f.file_field :uploads, :multiple => true %>
+  
+  <p class="buttons">
+    <%= f.submit 'Upload Asset', :class=>'button' %>
+    or <%= link_to 'Cancel', admin_assets_path %>
+  </p>
+<% end %>
+
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
+<% include_stylesheet 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/themes/base/jquery-ui.css' %>
+<script type="text/javascript">jQuery.noConflict();</script>
+<script src="/jquery.fileupload/jquery.fileupload.js" type="text/javascript"></script>
+<script src="/jquery.fileupload/jquery.fileupload-ui.js" type="text/javascript"></script>
+<% include_stylesheet '/jquery.fileupload/jquery.fileupload-ui.css' %>
+<script type="text/javascript">
+  (function($) {
+    $(function () {
+      $('form#asset_upload').fileUploadUI({
+        uploadTable: $('#assets'),
+        downloadTable: $('#assets'),
+        buildUploadRow: function (files, index) {
+          return $('<li>' + files[index].name +
+                   '<span class="file_upload_progress"><div><\/div><\/span>' +
+                   '<span class="file_upload_cancel">' +
+                   '<button class="ui-state-default ui-corner-all" title="Cancel">' +
+                   '<span class="ui-icon ui-icon-cancel">Cancel<\/span>' +
+                   '<\/button><\/span><\/li>');
+        },
+        buildDownloadRow: function (file) {
+          return $(file.markup);
+        }
+      });
+    });
+  }(jQuery));
+</script>

data/app/views/admin/assets/edit.html.erb

@@ -18,6 +18,14 @@
     </table>
     <%= f.file_field :upload %>
     <%= display(@asset) %>
+    <%- if @asset.attachments.any? -%>
+      <h2>Included on <%= pluralize(@asset.attachments.size, 'this page', 'these pages') %>:</h2>
+      <ul>
+        <%- @asset.attachments.each do |attachment| -%>
+          <li><%= link_to attachment.page.title, edit_admin_page_path(attachment.page) %></li>
+        <%- end -%>
+      </ul>
+    <%- end -%>
   </div>
   <p class="buttons">
     <%= save_model_button(@asset) %>

data/app/views/admin/assets/index.html.erb

@@ -1,7 +1,7 @@
 <% include_stylesheet 'admin/extensions/assets/assets' %>
 
 <div class="outset">
-  <%= render :partial => list_view? ? 'list' : 'grid' %>
+  <%= render :partial => (list_view? ? 'list' : 'grid'), :locals => {:assets => @assets} %>
 </div>
 
 <div id="actions">

data/app/views/admin/assets/new.html.erb

@@ -1,45 +1,6 @@
-<% include_stylesheet 'admin/extensions/assets/assets' %>
-
 <h1>Upload New Assets</h1>
-<table id="files">
-  <tbody></tbody>
-</table>
 
-<p>You can select multiple files</p>
-<% form_for [:admin, @asset], :html => {:multipart => true, 'data-onsubmit_status'=>'Uploading Asset&#8230;'} do |f| %>
-  <%= f.file_field :upload, :multiple => true %>
-  
-  <!-- <p class="buttons">
-    <%= f.submit 'Upload Asset', :class=>'button' %>
-    or <%= link_to 'Cancel', admin_assets_path %>
-  </p> -->
-<% end %>
+<ul id="assets">
+</ul>
 
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
-<% include_stylesheet 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/themes/base/jquery-ui.css' %>
-<script type="text/javascript">jQuery.noConflict();</script>
-<script src="/jquery.fileupload/jquery.fileupload.js" type="text/javascript"></script>
-<script src="/jquery.fileupload/jquery.fileupload-ui.js" type="text/javascript"></script>
-<% include_stylesheet '/jquery.fileupload/jquery.fileupload-ui.css' %>
-<script type="text/javascript">
-  (function($) {
-    $(function () {
-      $('form.new_asset').fileUploadUI({
-        uploadTable: $('#files'),
-        downloadTable: $('#files'),
-        buildUploadRow: function (files, index) {
-          return $('<tr><td>' + files[index].name + '<\/td>' +
-                   '<td class="file_upload_progress"><div><\/div><\/td>' +
-                   '<td class="file_upload_cancel">' +
-                   '<button class="ui-state-default ui-corner-all" title="Cancel">' +
-                   '<span class="ui-icon ui-icon-cancel">Cancel<\/span>' +
-                   '<\/button><\/td><\/tr>');
-        },
-        buildDownloadRow: function (file) {
-          return $('<tr><td>' + file.markup + '<\/td><\/tr>');
-        }
-      });
-    });
-  }(jQuery));
-</script>
+<%= render :partial => 'upload', :locals => {:record => @asset, :url => admin_assets_path} %>

data/app/views/admin/assets/remove.html.erb

@@ -8,6 +8,18 @@
 
 <table class="index" id="assets">
   <tr><td class="name"><%= asset_listing(@asset) %></td></tr>
+  <% if @asset.attachments.any? %>
+    <tr>
+      <th>
+        It's being used on the following
+        <%= pluralize(@asset.attachments.size, 'page') %> and will be removed from
+        there as well:
+        </th>
+    </tr>
+    <% @asset.attachments.each do |attachment| %>
+      <tr><td><%= attachment.page.title %></td></tr>
+    <% end %>
+  <% end %>
 </table>
 
 <% form_for [:admin, @asset], :html => {:method => :delete, 'data-onsubmit_status'=>'Removing asset&#8230;'} do |f| %>

data/assets_extension.rb

@@ -29,6 +29,11 @@ class AssetsExtension < Radiant::Extension
     tab 'Content' do
       add_item 'Assets', '/admin/assets', :after => 'Pages'
     end
-    Page.send :include, AssetTags
+    admin.page.edit.add :main, 'admin/assets/attachments', :after => :form
+    ApplicationController.helper(:assets)
+    Page.class_eval do
+      include AssetTags
+      has_many :attachments, :include => :asset, :order => :position
+    end
   end
 end

data/config/routes.rb

@@ -2,4 +2,9 @@ ActionController::Routing::Routes.draw do |map|
   map.namespace :admin, :member => { :remove => :get } do |admin|
     admin.resources :assets
   end
+  map.namespace :admin do |admin|
+    admin.resources :pages do |pages|
+      pages.resources :attachments, :collection => { :positions => :put }
+    end
+  end
 end

data/db/migrate/20110225174217_add_caching_columns_to_asset.rb

@@ -0,0 +1,26 @@
+class AddCachingColumnsToAsset < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :upload_name, :string
+    add_column :assets, :upload_ext, :string
+    add_column :assets, :upload_size, :integer
+    add_column :assets, :upload_width, :integer
+    add_column :assets, :upload_height, :integer
+    puts "Updating existing assets…"
+    Asset.all.each do |asset|
+      asset.upload_name = asset.upload.name
+      asset.upload_ext = asset.upload.ext
+      asset.upload_size = asset.upload.size
+      asset.upload_width = asset.upload.width
+      asset.upload_height = asset.upload.height
+      asset.save!
+    end
+  end
+
+  def self.down
+    remove_column :assets, :upload_name
+    remove_column :assets, :upload_ext
+    remove_column :assets, :upload_size
+    remove_column :assets, :upload_width
+    remove_column :assets, :upload_height
+  end
+end

data/db/migrate/20110225210821_add_attachment_to_pages.rb

@@ -0,0 +1,12 @@
+class AddAttachmentToPages < ActiveRecord::Migration
+  def self.up
+    create_table :attachments do |t|
+      t.belongs_to :asset
+      t.belongs_to :page
+    end
+  end
+
+  def self.down
+    drop_table :attachments
+  end
+end

data/db/migrate/20110225210912_add_timestamps_and_locking_to_assets.rb

@@ -0,0 +1,19 @@
+class AddTimestampsAndLockingToAssets < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :lock_version, :integer, :default => 0
+    add_column :assets, :created_at, :datetime
+    add_column :assets, :updated_at, :datetime
+    puts 'Updating current assets with dates'
+    Asset.all.each do |asset|
+      asset.created_at = Time.now
+      asset.updated_at = Time.now
+      asset.save!
+    end
+  end
+
+  def self.down
+    remove_column :assets, :lock_version
+    add_column :assets, :created_at
+    add_column :assets, :updated_at
+  end
+end

data/db/migrate/20110320152044_add_position_to_attachments.rb

@@ -0,0 +1,14 @@
+class AddPositionToAttachments < ActiveRecord::Migration
+  def self.up
+    add_column :attachments, :position, :integer
+    Page.all(:include => :attachments).each do |page|
+      page.attachments.each_with_index do |attachment, index|
+        attachment.update_attributes :position => index+1
+      end
+    end
+  end
+
+  def self.down
+    remove_column :attachments, :position
+  end
+end

data/lib/radiant-assets-extension/s3_store.rb

@@ -1,4 +1,5 @@
 require 'dragonfly'
+require 'aws/s3'
 
 module RadiantAssetsExtension
   # Subclass that allows connecting to S3 regions other than US-Standard

data/lib/radiant-assets-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantAssetsExtension
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/public/stylesheets/admin/extensions/assets/assets.css

@@ -17,32 +17,41 @@ table.index .size {
   padding-right: 5px;
 }
 
+table#assets .icon,
+table#assets .thumbnail {
+  margin-right: 5px;
+}
+
 #assets .icon {
+  float: left;
+  font-size: 75%;
   display: block;
   text-align: center;
   background: #ccc;
   text-transform: uppercase;
+  overflow: hidden;
 }
 
-table#assets .icon {
-  display: block;
-  float: left;
+table#assets th.name,
+table#assets td.name {
+  width: auto;
 }
 
-table#assets .icon, table#assets .thumbnail {
-  margin-right: 5px;
+table#assets th.actions {
+/*  min-width: 7em;*/
+  min-width: auto;
 }
 
-table#assets .icon {
-  font-size: 75%;
-  float: left;
-}
+/*table#assets th.size {*/
+/*  min-width: 5em;*/
+/*}*/
 
-#assets, #assets li {
+ul#assets, #assets li {
   display: block;
   list-style: none;
   margin: 0;
   padding: 0;
+  overflow: hidden;
 }
 
 #assets li {
@@ -51,7 +60,6 @@ table#assets .icon {
   margin-right: 1px;
   margin-bottom: 1px;
   position: relative;
-  overflow: hidden;
 }
 
 #assets li a {
@@ -73,6 +81,10 @@ table#assets .icon {
   display: block;
 }
 
+#assets li .action {
+  right: 2px;
+}
+
 #assets li .caption {
   top: auto;
   bottom: 0;
@@ -92,7 +104,6 @@ table#assets .remove::before {
 }
 
 #assets li .remove {
-  right: 2px;
   width: 12px;
   height: 12px;
   text-indent: -1000em;
@@ -114,3 +125,28 @@ table#assets .remove::before,
 #actions .new a::before {
   background: url('/images/admin/plus.png') no-repeat left bottom;
 }
+
+/*
+  Overriding values from jquery.fileupload-ui.css
+  Need higher specificity as that file is only loaded later
+*/
+
+html .file_upload {
+  width: auto;
+  height: auto;
+  margin: 1em 0;
+}
+
+html .file_upload .buttons {display: none}
+
+
+html .file_upload,
+html .file_upload_small,
+html .file_upload_large {
+  background: #F5F1E2;
+  border-color: #ccc;
+}
+
+html .file_upload_highlight {
+  background: lawngreen;
+}

data/radiant-assets-extension.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   
   s.add_dependency 'dragonfly', '~>0.8.2'
   s.add_dependency 'aws-s3', '~>0.6.2'
+  s.add_dependency 'acts_as_list', '~>0.1.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-assets-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Gerrit Kaiser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +00:00
+date: 2011-03-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,22 @@ dependencies:
         version: 0.6.2
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: acts_as_list
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :runtime
+  version_requirements: *id003
 description: Makes Radiant better by adding images!
 email: 
 - gerrit@gerritkaiser.de
@@ -62,14 +78,20 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- README
+- README.rdoc
 - Rakefile
 - app/controllers/admin/assets_controller.rb
+- app/controllers/admin/attachments_controller.rb
+- app/controllers/admin/upload_handler.rb
 - app/helpers/assets_helper.rb
 - app/models/asset.rb
 - app/models/asset_tags.rb
+- app/models/attachment.rb
+- app/views/admin/assets/_attachment.html.erb
+- app/views/admin/assets/_attachments.html.erb
 - app/views/admin/assets/_grid.html.erb
 - app/views/admin/assets/_list.html.erb
+- app/views/admin/assets/_upload.html.erb
 - app/views/admin/assets/edit.html.erb
 - app/views/admin/assets/index.html.erb
 - app/views/admin/assets/new.html.erb
@@ -82,6 +104,10 @@ files:
 - db/migrate/20110224001246_add_images_table.rb
 - db/migrate/20110225021327_add_caption.rb
 - db/migrate/20110225023017_rename_model_class.rb
+- db/migrate/20110225174217_add_caching_columns_to_asset.rb
+- db/migrate/20110225210821_add_attachment_to_pages.rb
+- db/migrate/20110225210912_add_timestamps_and_locking_to_assets.rb
+- db/migrate/20110320152044_add_position_to_attachments.rb
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-assets-extension.rb
@@ -101,7 +127,7 @@ has_rdoc: true
 homepage: http://ext.radiantcms.org/extensions/269-assets
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.6'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.7'\n  "
 rdoc_options: []
 
 require_paths: