0
@@ -106,7 +106,12 @@ class Admin::ArticlesController < Admin::BaseController
0
 
0
   protected
0
     def load_sections
0
-      @assets = site.assets.find(:all, :limit => 6)
0
+      @assets = site.assets.find(:all, :limit => 15)
0
+      @bucket_assets = []
0
+      session[:bucket].each do |id, values|
0
+        (@bucket_assets ||= []) << site.assets.find(id)
0
+      end unless session[:bucket].blank? 
0
+      
0
       @sections = site.sections.find(:all)
0
       home = @sections.find &:home?
0
       @sections.delete  home

0
@@ -73,11 +73,11 @@ class Admin::AssetsController < Admin::BaseController
0
 
0
   # rjs
0
   def add_bucket
0
-    if (session[:bucket] ||= {}).key?(@asset.public_filename)
0
+    if (session[:bucket] ||= {}).key?(@asset.id)
0
       render :nothing => true and return
0
     end
0
     args = asset_image_args_for(@asset, :tiny, :title => "#{@asset.title} \n #{@asset.tags.join(', ')}")
0
-    session[:bucket][@asset.public_filename] = args
0
+    session[:bucket][@asset.id] = args
0
   end
0
 
0
   def clear_bucket

0
@@ -49,11 +49,7 @@
0
     </div>
0
     <div class="tabpanel" id="bucket" style="display:none;">
0
       <ul id="bucket-assets" class="asset-list">
0
-        <% session[:bucket].each do |filename, values| -%>
0
-        <li>
0
-          <%= link_to(image_tag(*values), filename, :target => '_blank') %>
0
-        </li>
0
-        <% end unless session[:bucket].blank? %>
0
+        <%= render :partial => "admin/assets/widget", :collection => @bucket_assets, :locals => { :prefix => 'bucket' } %>
0
       </ul>
0
     </div>
0
   </div>

0
@@ -14,4 +14,5 @@
0
         :style => 'display:none', :class => 'detach-widget') %></a>
0
   <a href="#"><%= image_tag('mephisto/icons/8-em-plus.png', :size => '16x16', :id => widget.dom_id("attach-#{prefix}-widget"), 
0
         :style => 'display:none', :class => 'attach-widget') %></a>
0
-</li>
0
\ No newline at end of file
0
+</li>
0
+<% if widget_counter.remainder(4).zero? && widget_counter > 0 %><br /><% end %>

0
@@ -43,7 +43,7 @@
0
     <ul id="assets">
0
       <% session[:bucket].each do |filename, values| -%>
0
       <li>
0
-        <%= link_to(image_tag(*values), filename, :target => '_blank') %>
0
+        <%= image_tag(*values) %>
0
       </li>
0
       <% end unless session[:bucket].blank? %>
0
     </ul>
0
@@ -55,4 +55,4 @@
0
       <strong><%= number_to_human_size site.assets.sum(:size) %></strong>.
0
     </p>
0
   </div>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -297,7 +297,7 @@ var ArticleForm = {
0
   },
0
 
0
   attachAsset: function(assetId) {
0
-    var articleId = location.href.match(/\/(edit|upload)\/([0-9]+)/)[2];
0
+    var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1];
0
     var attached  = $('attached-widget-' + assetId);
0
     if(attached) return;
0
     new Ajax.Request('/admin/articles/attach/' + articleId + '/' + assetId);
0
@@ -305,7 +305,7 @@ var ArticleForm = {
0
   },
0
 
0
   labelAsset: function(assetId) {
0
-    var articleId = location.href.match(/\/(edit|upload)\/([0-9]+)/)[2];
0
+    var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1];
0
     var attached  = $('attached-widget-' + assetId);
0
     var label     = $('attached-widget-version-' + assetId);
0
     new Ajax.Request('/admin/articles/label/' + articleId + '/' + assetId + '?label=' + escape(label.value));
0
@@ -313,7 +313,7 @@ var ArticleForm = {
0
   },
0
 
0
   detachAsset: function(assetId) {
0
-    var articleId = location.href.match(/\/(edit|upload)\/([0-9]+)/)[2];
0
+    var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1];
0
     var attached  = $('attached-widget-' + assetId);
0
     if(!attached) return;
0
     new Ajax.Request('/admin/articles/detach/' + articleId + '/' + assetId);