beef-has_assets 0.6.8 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.7.0

data/app/controllers/admin/assets_controller.rb

@@ -1,6 +1,6 @@
 class Admin::AssetsController < Admin::BaseController
   unloadable
-  
+
   protect_from_forgery :except => [:destroy, :rename_category]
 
   # GET /assets
@@ -15,9 +15,9 @@ class Admin::AssetsController < Admin::BaseController
       format.js { render :action => 'index'}
     end
   end
-  
+
   alias :by_category :index
-  
+
   def by_content_type
     @asset_types = Asset.grouped_by_content_type
     @grouping = 'by_content_type'
@@ -28,7 +28,7 @@ class Admin::AssetsController < Admin::BaseController
       format.js { render :action => 'index'}
     end
   end
-  
+
   def by_description
     @asset_types = Asset.grouped_by_description
     @grouping = 'by_description'
@@ -59,18 +59,18 @@ class Admin::AssetsController < Admin::BaseController
       format.js { render :layout => false, :action => 'category'}
     end
   end
-  
+
   def descriptions
     @descriptions = Asset.not_thumbnails.find(:all, :select => 'description', :group => 'description', :order => 'description', :conditions => 'description IS NOT NULL')
-    
+
     respond_to do |format|
       format.json { render :json => @descriptions.collect{ |a| a.description }}
     end
   end
-  
+
   def categories
     @categories = Asset.not_thumbnails.find(:all, :select => 'category', :group => 'category', :order => 'category', :conditions => 'category IS NOT NULL')
-    
+
     respond_to do |format|
       format.json { render :json => @categories.collect{ |a| a.category }}
     end
@@ -87,6 +87,7 @@ class Admin::AssetsController < Admin::BaseController
       format.xml  { render :xml => @asset }
     end
   end
+  alias :attach :show
 
   # POST /assets
   # POST /assets.xml
@@ -127,7 +128,7 @@ class Admin::AssetsController < Admin::BaseController
       end
     end
   end
-  
+
   def select_thumbnail
     @asset = Asset.find(params[:id])
     respond_to do |wants|
@@ -135,7 +136,7 @@ class Admin::AssetsController < Admin::BaseController
       wants.js
     end
   end
-  
+
   def replace_thumbnail
     @asset = Asset.find(params[:id])
     @asset.create_or_update_thumbnail(params[:asset][:uploaded_data],:square,Asset.attachment_options[:thumbnails][:square])
@@ -146,15 +147,15 @@ class Admin::AssetsController < Admin::BaseController
       end
       format.js { render :json => @asset, :status => 200 }
     end
-    
+
   rescue Technoweenie::AttachmentFu::ThumbnailError => m
-    
+
     respond_to do |format|
       format.html { flash[:error] = m }
       format.js { render :json => [m] }
     end
   end
-  
+
   def rename_category
     respond_to do |format|
       format.js do

data/app/helpers/admin/assets_helper.rb

@@ -1,33 +1,32 @@
 module Admin::AssetsHelper
-  
+
   def asset_list(content_node)
-    unless content_node.assets.empty?
-      list = render( :partial => '/admin/assets/list', :locals => { :content_node => content_node } )
-    end
+    list = render( :partial => '/admin/assets/list', :locals => { :content_node => content_node, :assets => content_node.assets.images, :title => 'Gallery' } )
+    list << render( :partial => '/admin/assets/list', :locals => { :content_node => content_node, :assets => content_node.assets.documents, :title => 'Downloads' } )
     content_tag :div, list, :id => 'attach-asset-list'
   end
-  
+
   def asset_browser(for_content = false)
-    render :partial => '/admin/assets/browser', 
+    render :partial => '/admin/assets/browser',
            :locals => { :asset_types => Asset.grouped_by_category,
                         :for_content => for_content,
                         :ajaxify        => true }
   end
-  
+
   def asset_upload_form
     render :partial => '/admin/assets/form'
   end
-  
+
   def toggle_grouping_links
     render :partial => 'admin/assets/toggle'
   end
-  
+
   def admin_assets_path_with_session_information
     session_key = ActionController::Base.session_options[:key]
     params = {request_forgery_protection_token => form_authenticity_token, :cookies => cookies}
     admin_assets_path(params)
   end
-  
+
   def replace_thumbnail_admin_asset_path_with_session_information(asset)
     session_key = ActionController::Base.session_options[:key]
     replace_thumbnail_admin_asset_path(asset, session_key => cookies[session_key], request_forgery_protection_token => form_authenticity_token)
@@ -45,14 +44,14 @@ module Admin::AssetsHelper
     logger.warn "Flickr error: #{e}"
     return
   end
-  
-  
+
+
   def flickr_select
     return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml") and !Settings.flickr_user_id.blank?
     render :partial => 'admin/flickrs/selector'
   end
-  
+
   def flickr_default_size
-    defined?(Beef::Has::Assets::FLICKR_DEFAULT_SIZE) ?  Beef::Has::Assets::FLICKR_DEFAULT_SIZE : :medium 
+    defined?(Beef::Has::Assets::FLICKR_DEFAULT_SIZE) ?  Beef::Has::Assets::FLICKR_DEFAULT_SIZE : :medium
   end
 end

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

@@ -1,6 +1,6 @@
-<h2><%= content_node.class.name.titleize %> Files</h2>
-<ul class="asset-list" id="asset-list">
-<% for asset in content_node.assets -%>
+<h2><%= content_node.class.name.titleize %> <%= title %></h2>
+<ul class="asset-list" id="<%= title.parameterize %>-list">
+<% for asset in assets -%>
   <li id="asset-<%= asset.id %>" class="<%= asset.content_type.gsub('/','-') %>">
 <% if asset.content_type =~ /image/ -%>
     <%= render :partial => "admin/assets/image", :locals => { :asset => asset, :for_content => false } %>
@@ -8,5 +8,5 @@
     <%= render :partial => "admin/assets/document", :locals => { :asset => asset, :for_content => false } %>
 <% end -%>
   </li>
-<% end -%> 
+<% end -%>
 </ul>

data/app/views/admin/assets/attach.js.rjs

@@ -0,0 +1,4 @@
+list_id = "#{@asset.is_image? ? 'gallery' : 'downloads' }-list"
+page.insert_html :bottom, list_id, content_tag( :li, render( :partial => "admin/assets/#{@asset.is_image? ? 'image' : 'document' }", :locals => { :asset => @asset, :for_content => false } ), :id => "asset-#{@asset.id}", :class => @asset.content_type.gsub('/','-') )
+page.show(list_id)
+page << "AssetBrowser.setUpAssetList();"

data/beef-has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-has_assets}
-  s.version = "0.6.8"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-01-26}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "app/views/admin/assets/_image.html.erb",
      "app/views/admin/assets/_list.html.erb",
      "app/views/admin/assets/_toggle.html.erb",
+     "app/views/admin/assets/attach.js.rjs",
      "app/views/admin/assets/category.html.erb",
      "app/views/admin/assets/index.html.erb",
      "app/views/admin/assets/index.js.rjs",

data/config/routes.rb

@@ -1,6 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace(:admin) do |admin|
     admin.resources :flickrs
-    admin.resources :assets, :collection => { :by_content_type => :get, :descriptions => :get, :by_category => :get, :categories => :get, :category => :get, :content_type => :get }, :member => { :set_lead => :put, :rename_category => :post }
+    admin.resources :assets, :collection => { :by_content_type => :get, :descriptions => :get, :by_category => :get, :categories => :get, :category => :get, :content_type => :get }, :member => { :attach => :post, :rename_category => :post }
   end
 end

data/generators/assets_admin_files/templates/public/javascripts/admin/assets.js

@@ -150,7 +150,7 @@ Object.extend(AssetBrowser, {
       this.setUpAssetList();
       this.contentNodeForm.addAssetIDs = function() {
         $$('input.asset_id').invoke('remove');
-        assets = $$('#asset-list li');
+        assets = $$('#attach-asset-list li');
         
         if (assets.size() == 0) {
             $(this).insert('<input type="hidden" name="' + this.model_name + '[asset_ids]" class="asset_id" value="" />');
@@ -174,89 +174,13 @@ Object.extend(AssetBrowser, {
   },
   
   setUpAssetList: function() {
-    this.assetList = $('asset-list');
-    if (this.assetList) {
-      Sortable.create(this.assetList);
-    }
-    this.contentNodeForm.assetList = this.assetList;
+    Sortable.create('gallery-list');
+    Sortable.create('downloads-list');
   },
 
   addAssetToContentNode: function(asset) {
-    if (!this.assetList) {
-    $('attach-asset-list').insert({top:'<h2 class="drop-down open">' + this.contentNodeForm.model_name.charAt(0).toUpperCase() + this.contentNodeForm.model_name.slice(1).toLowerCase() + ' Files</h2><ul class="asset-list" id="asset-list"></ul>'});
-      this.setUpAssetList();
-    }
-
-    this.assetList.show();
     if (!$('asset-' + asset.id)) {
-      
-      if(/image/.test(asset.content_type)){
-        li = new Element('li', { 'class': asset.content_type.replace('/','-'), id: 'asset-' + asset.id }).update('<img alt=\"' + asset.filename + '\" src=\"' + asset.sizes.find(function(size){ return size[0] == 'square'; })[1] + '\" />');
-      } else {
-        li = new Element('li', { 'class': asset.content_type.replace('/','-'), id: 'asset-' + asset.id }).update(asset.filename + ' ' + asset.description);
-      }
-
-      filename = new Element('h4').update(asset.filename);
-      div = new Element('div');
-      h4 = new Element('h4').update("Insert Image");
-      view_info = new Element('a').update('View Info');
-    
-      view_info.onclick = function() {
-        AssetBrowser.openInfo(asset.id, this);
-        return false;
-      };
-
-      insert_image_large = new Element('a').update('Large | ');
-      insert_image_medium = new Element('a').update('Medium | ');
-      insert_image_small = new Element('a').update('Small');
-    
-      insert_image_large.onclick = function() {
-        addAsset(asset.id, 'large' );
-        return false;
-      };
-      insert_image_medium.onclick = function() {
-        addAsset(asset.id, 'medium' );
-        return false;
-      };
-      insert_image_small.onclick = function() {
-        addAsset(asset.id, 'thumb' );
-        return false;
-      };
-      insert_document = new Element('a').update(' | Insert');
-    
-      var theForm = this.contentNodeForm;
-    
-      deleter = new Element('a').update('Detach');
-        deleter.onclick = function() {
-        AssetBrowser.removeAssetFromContentNode(asset.id);
-        return false;
-      };
-    
-      div.insert(filename);
-      div.insert(view_info);
-      div.insert('<br/>');
-      div.insert(deleter);
-
-      li.insert(div);
-      
-      if (/image/.test(asset.content_type)) {
-        //setup for images
-        div.insert(h4);
-        div.insert(insert_image_large);
-        div.insert(insert_image_medium);
-        div.insert(insert_image_small);
-
-      } else {
-        //setup for documents
-        insert_document.onclick = function() {
-          addAsset(asset.id);
-          return false;
-        };
-        div.insert(insert_document);
-      }
-
-      this.assetList.insert(li);    
-      this.setUpAssetList();
+      new Ajax.Request('/admin/assets/'+asset.id+'/attach');
     }
   },
 
@@ -307,7 +231,7 @@ Event.observe(window, 'load', function() {
       flash_url : '/flash/swfupload.swf',
       file_post_name: 'asset[uploaded_data]', 
 
-      file_size_limit : '5 MB',
+      file_size_limit : '7 MB',
       file_upload_limit : 0,
 
       file_queue_error_handler : UploadHandler.fileQueueError,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +00:00
+date: 2010-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - app/views/admin/assets/_image.html.erb
 - app/views/admin/assets/_list.html.erb
 - app/views/admin/assets/_toggle.html.erb
+- app/views/admin/assets/attach.js.rjs
 - app/views/admin/assets/category.html.erb
 - app/views/admin/assets/index.html.erb
 - app/views/admin/assets/index.js.rjs