@@ -106,7 +106,12 @@ class Admin::ArticlesController < Admin::BaseController protected def load_sections - @assets = site.assets.find(:all, :limit => 6) + @assets = site.assets.find(:all, :limit => 15) + @bucket_assets = [] + session[:bucket].each do |id, values| + (@bucket_assets ||= []) << site.assets.find(id) + end unless session[:bucket].blank? + @sections = site.sections.find(:all) home = @sections.find &:home? @sections.delete home app/controllers/admin/articles_controller.rb @@ -73,11 +73,11 @@ class Admin::AssetsController < Admin::BaseController # rjs def add_bucket - if (session[:bucket] ||= {}).key?(@asset.public_filename) + if (session[:bucket] ||= {}).key?(@asset.id) render :nothing => true and return end args = asset_image_args_for(@asset, :tiny, :title => "#{@asset.title} \n #{@asset.tags.join(', ')}") - session[:bucket][@asset.public_filename] = args + session[:bucket][@asset.id] = args end def clear_bucket app/controllers/admin/assets_controller.rb @@ -49,11 +49,7 @@ </div> <div class="tabpanel" id="bucket" style="display:none;"> <ul id="bucket-assets" class="asset-list"> - <% session[:bucket].each do |filename, values| -%> - <li> - <%= link_to(image_tag(*values), filename, :target => '_blank') %> - </li> - <% end unless session[:bucket].blank? %> + <%= render :partial => "admin/assets/widget", :collection => @bucket_assets, :locals => { :prefix => 'bucket' } %> </ul> </div> </div> app/views/admin/articles/_shared_options.rhtml @@ -14,4 +14,5 @@ :style => 'display:none', :class => 'detach-widget') %></a> <a href="#"><%= image_tag('mephisto/icons/8-em-plus.png', :size => '16x16', :id => widget.dom_id("attach-#{prefix}-widget"), :style => 'display:none', :class => 'attach-widget') %></a> -</li> \ No newline at end of file +</li> +<% if widget_counter.remainder(4).zero? && widget_counter > 0 %><br /><% end %> app/views/admin/assets/_widget.rhtml @@ -43,7 +43,7 @@ <ul id="assets"> <% session[:bucket].each do |filename, values| -%> <li> - <%= link_to(image_tag(*values), filename, :target => '_blank') %> + <%= image_tag(*values) %> </li> <% end unless session[:bucket].blank? %> </ul> @@ -55,4 +55,4 @@ <strong><%= number_to_human_size site.assets.sum(:size) %></strong>. </p> </div> -<% end %> \ No newline at end of file +<% end %> app/views/admin/assets/index.rhtml @@ -297,7 +297,7 @@ var ArticleForm = { }, attachAsset: function(assetId) { - var articleId = location.href.match(/\/(edit|upload)\/([0-9]+)/)[2]; + var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1]; var attached = $('attached-widget-' + assetId); if(attached) return; new Ajax.Request('/admin/articles/attach/' + articleId + '/' + assetId); @@ -305,7 +305,7 @@ var ArticleForm = { }, labelAsset: function(assetId) { - var articleId = location.href.match(/\/(edit|upload)\/([0-9]+)/)[2]; + var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1]; var attached = $('attached-widget-' + assetId); var label = $('attached-widget-version-' + assetId); new Ajax.Request('/admin/articles/label/' + articleId + '/' + assetId + '?label=' + escape(label.value)); @@ -313,7 +313,7 @@ var ArticleForm = { }, detachAsset: function(assetId) { - var articleId = location.href.match(/\/(edit|upload)\/([0-9]+)/)[2]; + var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1]; var attached = $('attached-widget-' + assetId); if(!attached) return; new Ajax.Request('/admin/articles/detach/' + articleId + '/' + assetId); public/javascripts/mephisto/application.js 3afcdaeac833515e2378c826fca7b1505aa48bb4 rick technoweenie@gmail.com http://github.com/technoweenie/mephisto/commit/165d9a73cc9ec17f2f2b69c2155a54cd2596788d 165d9a73cc9ec17f2f2b69c2155a54cd2596788d 2008-03-04T01:44:47-08:00 2008-03-04T01:44:47-08:00 allow assets in the bucket to be attached to articles, fix asset js to reference the new routes [Paul Marsh] 0f42529fb149a0902d0402261d1b130ba2459489 rick technoweenie@gmail.com