@@ -26,10 +26,10 @@ module AssetTags
result = []
# all = tag.attr['all']
# all == 'true' ? assets = Asset.find(:all) : assets = tag.locals.page.assets
- associations = tag.locals.page.attachments.sort_by{ |a| a.position }
- tag.locals.assets = associations
- associations.each do |assoc|
- tag.locals.asset = assoc.asset
+ attachments = tag.locals.page.attachments
+ tag.locals.assets = attachments
+ attachments.each do |attachment|
+ tag.locals.asset = attachment.asset
result << tag.expand
end
result
@@ -38,17 +38,17 @@ module AssetTags
tag 'asset:first' do |tag|
# all = tag.attr['all']
# all == 'true' ? assets = Asset.find(:all) :
- associations = tag.locals.page.attachments.sort_by{ |a| a.position }
- if first = associations.first
+ attachmentss = tag.locals.page.attachments
+ if first = attachmentss.first
tag.locals.asset = first.asset
tag.expand
end
end
tag 'asset:if_first' do |tag|
- associations = tag.locals.assets
+ attachments = tag.locals.assets
asset = tag.locals.asset
- if asset == associations.first.asset
+ if asset == attachments.first.asset
tag.expand
end
end
app/models/asset_tags.rb
@@ -7,18 +7,23 @@
= image_tag(asset.public_filename(:thumbnail))
.image_info{ :id => info_id, :style => "display: none" }
- %p
- %strong= asset.title
- %p= link_to "Edit", asset_edit_url(asset)
- %p= link_to "Thumbnail Url", asset.public_filename(:thumbnail)
- %p= link_to "Original Url", asset.public_filename
- - if @page and @page.id
- - if @page.assets.include?(asset)
- %p= link_to_remote "Remove Image", :url => remove_asset_url(:asset => asset.id, :page => @page.id), |
- :after => "Effect.Fade('#{dom_id}', { duration: 0.8 })", :complete => "Element.remove('#{dom_id}')" if id_name == 'attachment' |
- - else
- %p= link_to_remote "Attach Image", :url => attach_asset_url(:asset => asset.id, :page => @page.id)
+ %h4= asset.title
+ %div.image_links
+ - if @page and @page.id
+ %p
+ %strong
+ - if @page.assets.include?(asset)
+ = link_to_remote "Remove Image", :url => remove_asset_url(:asset => asset.id, :page => @page.id), |
+ :confirm => "Are you sure you want to remove this asset from the page?", |
+ :after => "Effect.Fade('#{dom_id}', { duration: 0.8 })", :complete => "Element.remove('#{dom_id}')" if id_name == 'attachment' |
+
+ - else
+ = link_to_remote "Attach Image", :url => attach_asset_url(:asset => asset.id, :page => @page.id)
+
+ %p= link_to "Edit", asset_edit_url(asset)
+ %p= link_to "Thumbnail Url", asset.public_filename(:thumbnail)
+ %p= link_to "Original Url", asset.public_filename
- %p
+ %div
%a{ :href => "#", :onclick => "Effect.Fade('#{info_id}', { duration: 0.4 }); return false; " }
Close
app/views/admin/asset/_asset.html.haml
@@ -20,7 +20,8 @@
%h4
Bucket
%span.note Items placed here can be used in your pages, layouts and snippets.
- = link_to_remote('Clear Bucket', {:url => clear_bucket_url}, :id => 'clear-bucket')
+ %span#clear-bucket
+ = link_to_remote('Clear Bucket', {:url => clear_bucket_url} )
= render :partial => "admin/asset/bucket"
app/views/admin/asset/_assets_container.html.haml
@@ -6,8 +6,7 @@
= render :partial => "admin/asset/asset", :locals => { :asset => asset, :id_name => 'asset' }
- else
%li
- %p
- %em Your bucket is empty
+ %p.note Your bucket is empty
app/views/admin/asset/_bucket.html.haml
@@ -4,8 +4,7 @@
- else
%li
- %p
- %em You have no attached assets.
+ %p.note You have no attached assets.
app/views/admin/asset/_page_assets.html.haml
db/migrate/004_add_position.rb
96e829366c80e00084033e3e68119b028be7e2f7
Keith Bingman
keith@Calculon.local
http://github.com/kbingman/assets_extension/commit/ca1f33daa6648d846e25251afecb89d6b57ff70d
ca1f33daa6648d846e25251afecb89d6b57ff70d
2008-03-30T02:57:21-07:00
2008-03-30T02:57:21-07:00
Don't really know what I updated here, the bucket I suspect
1000e839cd8b180526ab660552bb4ef340018a0b
Keith Bingman
keith@Calculon.local