beef-has_assets 0.3.9 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0

data/app/controllers/admin/flickrs_controller.rb

@@ -13,4 +13,14 @@ class Admin::FlickrsController < Admin::BaseController
     end
   end
 
+  def index
+    @flickr_result = {}
+    if defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml")
+      flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
+      flickr_params = { :per_page => '12', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
+      flickr_params[:tags] = params[:tags] unless params[:tags].blank?
+      @flickr_result = flickr.photos.search(flickr_params)
+    end
+    render :layout => false
+  end
 end

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

@@ -0,0 +1 @@
+<%= render :partial => 'admin/shared/flickr_image.html.erb', :collection => @flickr_result -%>

data/app/views/admin/shared/_flickr.html.erb

@@ -1,11 +1,14 @@
 
 <div id="flickr-select">
-  <% form_remote_tag( :url => admin_flickr_path ) do -%>
+  <% form_remote_tag( :url => admin_flickrs_path ) do -%>
   <p><label for="tags">Search by tag:</label>
   <%= text_field_tag :tags, params[:tags] %> &nbsp; <%= submit_tag "go" %></p>
   
   <% end -%>
-
-  <%= render :partial => 'admin/shared/flickr_image.html.erb', :collection => flickr_images -%>
+  
+  <div id="flickr-image-container">
+    <p>Loading Flickr images</p>
+    <% #= render :partial => 'admin/shared/flickr_image.html.erb', :collection => flickr_images -%>
+  </div>
 
 </div>

data/app/views/admin/shared/_flickr_image.html.erb

@@ -1 +1 @@
-<img src="<%= flickr_image.url(:square) %>" flickr_src="<%= flickr_image.url(:square) %>" alt="<%= flickr_image.description || flickr_image.title %>" title="<%= flickr_image.title %>" onclick="addLinkedImage('<%= flickr_image.url(:medium) %>',this.alt)"/>
+<img src="<%= flickr_image.url(:square) %>" alt="<%= flickr_image.description || flickr_image.title %>" title="<%= flickr_image.title %>" onclick="addLinkedImage('<%= flickr_image.url(:medium) %>',this.alt)"/>

data/config/routes.rb

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

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

@@ -392,9 +392,15 @@ var Renameable = Class.create(Holdable, {
 });
 
 var load_flickr_select = function(){
-  $$('#flickr-select img').each(function(el){
-    
-    el.writeAttribute('src', el.readAttribute('flickr_src'));
-  });
+  new Ajax.Updater('flickr-image-container', '/flickrs/', {
+    parameters: { format: 'html', authenticity_token: AJ.authenticity_token() },
+    onSuccess: swap_flickr_image_src
+});
+}
+var load_flickr_select = function(){
+  new Ajax.Updater('flickr-image-container', '/admin/flickrs', {
+    method: 'get',
+    parameters: { format: 'html', authenticity_token: AJ.authenticity_token() }
+});
 }
-document.observe('dom:loaded', load_flickr_select);
+document.observe('dom:loaded', load_flickr_select);

data/has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.3.9"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-17}
+  s.date = %q{2009-09-22}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "app/views/admin/assets/show.html.erb",
      "app/views/admin/assets/show.js.rjs",
      "app/views/admin/flickrs/_selector.html.erb",
+     "app/views/admin/flickrs/index.html.erb",
      "app/views/admin/flickrs/show.html.erb",
      "app/views/admin/flickrs/show.js.rjs",
      "app/views/admin/shared/_flickr.html.erb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +48,7 @@ files:
 - app/views/admin/assets/show.html.erb
 - app/views/admin/assets/show.js.rjs
 - app/views/admin/flickrs/_selector.html.erb
+- app/views/admin/flickrs/index.html.erb
 - app/views/admin/flickrs/show.html.erb
 - app/views/admin/flickrs/show.js.rjs
 - app/views/admin/shared/_flickr.html.erb