dust-generators 0.2.3 → 0.2.4

data/lib/generators/dust/albums/templates/app/views/photos/_photo.html.erb

@@ -1,23 +1,25 @@
-<div class="photo"> 
-	<script type="text/javascript" charset="utf-8">
-		$("a.settings").fancybox({
-			'showCloseButton' : false,
-			'transitionIn'	:	'elastic',
-			'transitionOut'	:	'elastic',
-			'speedIn'		:	400, 
-			'speedOut'		:	200,
-			'hideOnContentClick': false,
-			'overlayOpacity' : 0.6,
-			'overlayColor' : '#000',
-			'opacity' : 'true'
-		});
-	</script>
-	<%= image_tag photo.file.url(:thumb), :height => '50' %>
-	<p>
-		<%= photo.title %> <br />
-		<% unless photo.date_shot.blank? %>
-			(<%= photo.date_shot %>)
-		<% end -%>
-		<%= link_to "Edit Photo", edit_photo_path(photo, :format => :html, :edit => 'photo'), :class => "settings", :title => "Photo Settings" %>
-	</p>
-</div>
+<li id="<%%= "<%=child_singular_name%>_#{<%=child_singular_name%>.id}" %>">
+	<div class="<%=child_singular_name%> <%%= "<%=child_singular_name%>_#{<%=child_singular_name%>.id}" %>"> 
+		<script type="text/javascript" charset="utf-8">
+			$("a.settings").fancybox({
+				'showCloseButton' : false,
+				'transitionIn'	:	'elastic',
+				'transitionOut'	:	'elastic',
+				'speedIn'		:	400, 
+				'speedOut'		:	200,
+				'hideOnContentClick': false,
+				'overlayOpacity' : 0.6,
+				'overlayColor' : '#000',
+				'opacity' : 'true'
+			});
+		</script>
+		<%%= image_tag <%=child_singular_name%>.file.url(:thumb), :height => '50' %>
+		<p>
+			<%%= truncate <%=child_singular_name%>.title, :length => 23 %> <br />
+			<%% unless <%=child_singular_name%>.date_shot.blank? %>
+				(<%%= <%=child_singular_name%>.date_shot %>)
+			<%% end -%>
+			<%%= link_to "Edit <%=child_class_name%>", edit_<%=child_singular_name%>_path(<%=child_singular_name%>.id, :format => 'html', :edit => "<%=child_singular_name%>"), :class => "settings", :title => "<%=child_class_name%> Settings" %>
+		</p>
+	</div>
+</li>

data/lib/generators/dust/albums/templates/app/views/photos/_search.html.erb

@@ -0,0 +1,6 @@
+<div id="searchbox">
+	<%% form_tag <%=child_plural_name%>_path, :method => 'get' do %>
+		<%%= text_field_tag :search, params[:search], :class => "input-text", :placeholder => 'Search <%=child_plural_class_name%>' %>
+  	<%%= image_submit_tag "admin/blank.png", :class => "image-submit"%>
+	<%% end %>
+</div>

data/lib/generators/dust/albums/templates/app/views/photos/array.js.erb

@@ -0,0 +1,3 @@
+$('#status').html('<%%= escape_javascript(flash.delete(:notice)) %>');
+$('#status').fadeIn().delay(2000).slideUp('4000', 'easeInOutBack');
+$.fancybox.hideActivity();

data/lib/generators/dust/albums/templates/app/views/photos/edit.html.erb

@@ -1,6 +1,6 @@
-<% title "Edit Photo" %>
+<%%title "Edit <%=child_class_name%>" %>
 
-<% if params[:edit] == 'photo' %>
+<%%if params[:edit] == '<%=child_singular_name%>' %>
 	<script type="text/javascript" charset="utf-8">
 
 		var options = { 
@@ -9,9 +9,9 @@
 			clearForm: true     
 		};
 
-		$('.edit_photo').ajaxForm(options);
+		$('.edit_<%=child_singular_name%>').ajaxForm(options);
 	
-		$("#photo_submit").click(function () {
+		$("#<%=child_singular_name%>_submit").click(function () {
 			$("#fancybox-inner").fadeTo("slow", 0.1);
 			$.fancybox.showActivity();
 		});
@@ -23,6 +23,6 @@
 			$("#fancybox-inner").fadeTo("slow", 1);
 		}
 	</script>
-<% end -%>
+<%%end -%>
 
-<%= render :partial => 'form' %>
+<%%= render :partial => 'form' %>

data/lib/generators/dust/albums/templates/app/views/photos/index.html.erb

@@ -1,7 +1,7 @@
-<% title "Photos" %>
+<%% title "<%=child_plural_class_name%>" %>
 
-<%= stylesheet( 'dust_album','uploadify') %>
-<%= javascript( 'uploadify/jquery.uploadify.v2.1.0' ) %>
+<%%= stylesheet( 'dust_<%=parent_singular_name%>','<%=parent_singular_name%>_uploadify') %>
+<%%= javascript( 'uploadify/jquery.uploadify.v2.1.0' ) %>
 
 <script type="text/javascript" charset="utf-8">
 	$(document).ready(function() {
@@ -13,15 +13,20 @@
 	});
 </script>
 
-<%= will_paginate @photos %>
+<div class="button_bar">
+	<%%= render :partial => 'search' %>
+</div>
 
-<% @photo_albums.sort.each do |title, photos| %>
-	<div class='photolist'>
-		<h1><%= link_to title, album_path(photos.first.album) %></h1>
+
+<%%= will_paginate @<%=child_plural_name%> %>
+
+<%% @<%=child_singular_name%>_<%=parent_plural_name%>.sort.each do |title, <%=child_plural_name%>| %>
+	<div class='<%=child_singular_name%>list'>
+		<h1><%%= link_to title, <%=parent_singular_name%>_path(<%=child_plural_name%>.first.<%=parent_singular_name%>) %></h1>
 		
-		<%= form_for(:photo, :url => delete_photos_path) do %>
+		<%% form_for :<%=child_singular_name%>, :url => {:action => 'destroy'} do %>
 		
-		<table class='photos'>
+		<table class='<%=child_plural_name%>'>
 			<tr style='color:#222;'>
 				<th>
 					
@@ -37,44 +42,44 @@
 					Created At
 				</th>
 			</tr>
-		<% for photo in photos %>
-  	<%= hidden_field_tag :album_id, photo.album.id %>
-		<tr class='<%= cycle('odd', 'even')%>'>
+		<%% for <%=child_singular_name%> in <%=child_plural_name%> %>
+  	<%%= hidden_field_tag :<%=parent_singular_name%>_id, <%=child_singular_name%>.<%=parent_singular_name%>.id %>
+		<tr class='<%%= cycle('odd', 'even')%>'>
 			<td>
-				<%= check_box_tag "photo_ids[]", photo.id %>
+				<%%= check_box_tag "<%=child_singular_name%>_ids[]", <%=child_singular_name%>.id %>
 			</td>
 			<td>
-					<%= link_to image_tag(photo.file.url(:thumb), :height => "30"), photo.file.url(:original), :rel => title, :id => 'single_image' %>
+					<%%= link_to image_tag(<%=child_singular_name%>.file.url(:thumb), :height => "30"), <%=child_singular_name%>.file.url(:original), :rel => title, :id => 'single_image' %>
 								
-					<div style="display:none"><div id="<%=photo.id%>"><%= image_tag(photo.file.url(:original)) %></div></div>
+					<div style="display:none"><div id="<%%=<%=child_singular_name%>.id%>"><%%= image_tag(<%=child_singular_name%>.file.url(:original)) %></div></div>
 			</td>
 			<td>
-				<%= photo.file_file_name %>
+				<%%= <%=child_singular_name%>.file_file_name %>
 			</td>
 			<td>
-				<%= number_to_human_size(photo.file_file_size) %>
+				<%%= number_to_human_size(<%=child_singular_name%>.file_file_size) %>
 			</td>
 			<td>
-				<%= photo.created_at.to_s(:m_d_y) %>
+				<%%= <%=child_singular_name%>.created_at.to_s(:m_d_y) %>
 			</td>
 		</tr>
-		<% end %>
+		<%% end %>
 		<tr class='odd'>
 			<td colspan='5'>
 				<input type="checkbox" class="checkall"> Check all
-				<%= submit_tag "Delete checked" %>
+				<%%= submit_tag "Delete checked" %>
 			</td>
 		</tr>
 		</table>
 		 
 		
-		<% end -%>
+		<%% end -%>
 		
 	</div>
 
 	
 
-<% end %>
+<%% end %>
 
-<%= will_paginate @photos %>
+<%%= will_paginate @<%=child_plural_name%> %>
 

data/lib/generators/dust/albums/templates/app/views/photos/new.html.erb

@@ -1,7 +1,7 @@
-<% title "New Photo" %>
+<%% title "New <%=child_class_name%>" %>
 
-<%= stylesheet( 'dust_album','uploadify') %>
+<%%= stylesheet( 'dust_<%=parent_singular_name%>','<%=parent_singular_name%>_uploadify') %>
 
-<%= render :partial => 'form' %>
+<%%= render :partial => 'form' %>
 
-<p><%= link_to "Back to List", photos_path %></p>
+<p><%%= link_to "Back to List", <%=child_plural_name%>_path %></p>

data/lib/generators/dust/albums/templates/app/views/photos/show.html.erb

@@ -1,26 +1,26 @@
-<% title "Photo" %>
+<%% title "<%=child_class_name%>" %>
 
-<%= stylesheet( 'dust_album','uploadify') %>
+<%%= stylesheet( 'dust_<%=parent_singular_name%>','<%=parent_singular_name%>_uploadify') %>
 
 <p>
   <strong>Title:</strong>
-  <%=h @photo.title %>
+  <%%=h @<%=child_singular_name%>.title %>
 </p>
 <p>
   <strong>Desc:</strong>
-  <%=h @photo.desc %>
+  <%%=h @<%=child_singular_name%>.desc %>
 </p>
 <p>
   <strong>Date Shot:</strong>
-  <%=h @photo.date_shot %>
+  <%%=h @<%=child_singular_name%>.date_shot %>
 </p>
 <p>
   <strong>Location:</strong>
-  <%=h @photo.location %>
+  <%%=h @<%=child_singular_name%>.location %>
 </p>
 
 <p>
-  <%= link_to "Edit", edit_photo_path(@photo) %> |
-  <%= link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete %> |
-  <%= link_to "View All", photos_path %>
+  <%%= link_to "Edit", edit_<%=child_singular_name%>_path(@<%=child_singular_name%>) %> |
+  <%%= link_to "Destroy", @<%=child_singular_name%>, :confirm => 'Are you sure?', :method => :delete %> |
+  <%%= link_to "View All", <%=child_plural_name%>_path %>
 </p>

data/lib/generators/dust/albums/templates/app/views/photos/show.js.erb

@@ -1,5 +1,5 @@
-$('#photos_count').html('<%= pluralize(@total_uploads.count, "Photo") %> | <%= link_to "Manage Photos", photos_path %>');
-$('#uploads').append("<%= escape_javascript(render(:partial => "photos/photo", :locals => {:photo => @photo})) %>");
+$('#<%=child_plural_name%>_count').html('<%%= pluralize(@<%=parent_singular_name%>.<%=child_plural_name%>.size, "<%=child_class_name%>")%> | <%%= link_to "Select <%=child_plural_class_name%> For Deletion", manage_<%=child_plural_name%>_path(@<%=parent_singular_name%>), :class => 'settings' %> ');
+$('#uploads').append("<%%= escape_javascript(render(:partial => "<%=child_plural_name%>/<%=child_singular_name%>", :locals => {:<%=child_singular_name%> => @<%=child_singular_name%>})) %>");
 $("a#inline").fancybox({
 	'transitionIn'	:	'elastic',
 	'transitionOut'	:	'elastic',

data/lib/generators/dust/albums/templates/app/views/view_albums/index.html.erb

@@ -1,20 +1,31 @@
-<% title "All Albums" %>
-<% heading "All Albums" %>
+<%% title "All <%=parent_plural_class_name%>" %>
+<%% heading "All <%=parent_plural_class_name%>" %>
 
-<% content_for :head do -%>
-	<%= stylesheet_link_tag 'dust_album' %>
-<% end -%>
+<%% content_for :head do %>
+	<%%= stylesheet_link_tag 'dust_<%=parent_singular_name%>_app' %>
+<%% end -%>
 
-<%= will_paginate @albums %>
+<%%= will_paginate @<%=parent_plural_name%> %>
 
-<% @albums.each do |album| %>
-	<div class="photo">
-		<% unless album.photos.empty? %>
-			<%  @photo = album.photos.find(:first)  %>
-			<%= link_to image_tag(@photo.file.url(:thumb)), view_album_path(album.filename) %>
-		<% end -%>
+<%% @<%=parent_plural_name%>.each do |<%=parent_singular_name%>| %>
+	<div class="<%=parent_singular_name%>_thumb">
+		<%% unless <%=parent_singular_name%>.<%=child_plural_name%>.empty? %>
+			
+			<%% @<%=child_singular_name%> = <%=parent_singular_name%>.<%=child_plural_name%>.find(:first)  %>
+			
+			<%% link_to view_<%=parent_singular_name%>_path(<%=parent_singular_name%>.filename), :style => 'float:left; ' do %>
+				<%%= image_tag @<%=child_singular_name%>.file.url(:thumb), :alt => <%=parent_singular_name%>.heading %>
+			<%% end %>
+			
+			<p>
+				<%%= link_to <%=parent_singular_name%>.title, view_<%=parent_singular_name%>_path(<%=parent_singular_name%>.filename) %><br />
+				<%%= truncate(<%=parent_singular_name%>.desc, :length => 100) %>
+				<%%= link_to "Read More", view_<%=parent_singular_name%>_path(<%=parent_singular_name%>.filename) unless <%=parent_singular_name%>.desc.blank? %>
+			</p>
+			
+		<%% end -%>
 	</div>
-<% end -%>
+<%% end -%>
 <div class="clear"></div>
 
-<%= will_paginate @albums %>
+<%%= will_paginate @<%=parent_plural_name%> %>

data/lib/generators/dust/albums/templates/app/views/view_albums/show.html.erb

@@ -1,20 +1,31 @@
-<% title @album.title %>
-<% heading @album.title %>
-<%= @album.desc %>
+<%% title @<%=parent_singular_name%>.title %>
+<%% heading @<%=parent_singular_name%>.heading %>
 
-<% content_for :head do -%>
-	<%= stylesheet_link_tag 'dust_album' %>
-<% end -%>
+<%% content_for :head do %>
+	<%%= stylesheet_link_tag 'dust_<%=parent_singular_name%>_app' %>
+<%% end -%>
 
-<%= will_paginate @photos %>
+<%%= @<%=parent_singular_name%>.desc %>
+
+<%%= will_paginate @<%=child_plural_name%> %>
 
 <div id="uploads">
-	<% @photos.each do |photo| %>
-		<div class="photo">
-			<%= link_to image_tag(photo.file.url(:thumb), :alt => photo.title), photo.file.url(:original), :id => 'single_image' %>
+	<%% @<%=child_plural_name%>.each do |<%=child_singular_name%>| %>
+		<div class="<%=child_singular_name%>">
+			<%%= link_to image_tag(<%=child_singular_name%>.file.url(:thumb), :alt => <%=child_singular_name%>.desc), <%=child_singular_name%>.file.url(:large), :class => 'group', :rel => "#{@<%=parent_singular_name%>.title}" %><br />
+			<%%= truncate <%=child_singular_name%>.title, :length => 23 %>
 		</div>
-	<% end -%>	
+	<%% end -%>	
 </div>
 <div class="clear"></div>
 
-<%= will_paginate @photos %>
+<%%= will_paginate @<%=child_plural_name%> %>
+
+<%% if permitted_to? :manage, :<%=parent_plural_name%> %>
+	<p>
+		<%%= link_to "Manage <%=child_plural_class_name%>", @<%=parent_singular_name%> %> |
+	  <%%= link_to "Edit", edit_<%=parent_singular_name%>_path(@<%=parent_singular_name%>) %> |
+	  <%%= link_to "Destroy", @<%=parent_singular_name%>, :confirm => 'Are you sure?', :method => :delete %> |
+	  <%%= link_to "View All", <%=parent_plural_name%>_path %>
+	</p>
+<%% end %>

data/lib/generators/dust/albums/templates/javascripts/dragsort.js

@@ -0,0 +1,288 @@
+// jQuery List DragSort v0.4
+// Website: http://dragsort.codeplex.com/
+// License: http://dragsort.codeplex.com/license
+
+(function($) {
+
+	$.fn.dragsort = function(options) {
+		var opts = $.extend({}, $.fn.dragsort.defaults, options);
+		var lists = [];
+		var list = null, lastPos = null;
+		if (this.selector)
+			$("head").append("<style type='text/css'>" + (this.selector.split(",").join(" " + opts.dragSelector + ",") + " " + opts.dragSelector) + " { cursor: pointer; }</style>");
+
+		this.each(function(i, cont) {
+
+			if ($(cont).is("table") && $(cont).children().size() == 1 && $(cont).children().is("tbody"))
+				cont = $(cont).children().get(0);
+
+			var newList = {
+				draggedItem: null,
+				placeHolderItem: null,
+				pos: null,
+				offset: null,
+				offsetLimit: null,
+				scroll: null,
+				container: cont,
+
+				init: function() {
+					$(this.container).attr("data-listIdx", i).mousedown(this.grabItem).find(opts.dragSelector).css("cursor", "pointer");
+					$(this.container).children(opts.itemSelector).each(function(j) { $(this).attr("data-itemIdx", j); });
+				},
+
+				grabItem: function(e) {
+					if (e.which != 1 || $(e.target).is(opts.dragSelectorExclude))
+						return;
+
+					var elm = e.target;
+					while (!$(elm).is("[data-listIdx='" + $(this).attr("data-listIdx") + "'] " + opts.dragSelector)) {
+						if (elm == this) return;
+						elm = elm.parentNode;
+					}
+
+					if (list != null && list.draggedItem != null)
+						list.dropItem();
+
+					$(e.target).css("cursor", "move");
+
+					list = lists[$(this).attr("data-listIdx")];
+					list.draggedItem = $(elm).closest(opts.itemSelector);
+					var mt = parseInt(list.draggedItem.css("marginTop"));
+					var ml = parseInt(list.draggedItem.css("marginLeft"));
+					list.offset = list.draggedItem.offset();
+					list.offset.top = e.pageY - list.offset.top + (isNaN(mt) ? 0 : mt) - 1;
+					list.offset.left = e.pageX - list.offset.left + (isNaN(ml) ? 0 : ml) - 1;
+
+					if (!opts.dragBetween) {
+						var containerHeight = $(list.container).outerHeight() == 0 ? Math.max(1, Math.round(0.5 + $(list.container).children(opts.itemSelector).size() * list.draggedItem.outerWidth() / $(list.container).outerWidth())) * list.draggedItem.outerHeight() : $(list.container).outerHeight();
+						list.offsetLimit = $(list.container).offset();
+						list.offsetLimit.right = list.offsetLimit.left + $(list.container).outerWidth() - list.draggedItem.outerWidth();
+						list.offsetLimit.bottom = list.offsetLimit.top + containerHeight - list.draggedItem.outerHeight();
+					}
+
+					var h = list.draggedItem.height();
+					var w = list.draggedItem.width();
+					var orig = list.draggedItem.attr("style");
+					list.draggedItem.attr("data-origStyle", orig ? orig : "");
+					if (opts.itemSelector == "tr") {
+						list.draggedItem.children().each(function() { $(this).width($(this).width()); });
+						list.placeHolderItem = list.draggedItem.clone().attr("data-placeHolder", true);
+						list.draggedItem.after(list.placeHolderItem);
+						list.placeHolderItem.children().each(function() { $(this).css({ borderWidth:0, width: $(this).width() + 1, height: $(this).height() + 1 }).html("&nbsp;"); });
+					} else {
+						list.draggedItem.after(opts.placeHolderTemplate);
+						list.placeHolderItem = list.draggedItem.next().css({ height: h, width: w }).attr("data-placeHolder", true);
+					}
+					list.draggedItem.css({ position: "absolute", opacity: 0.8, "z-index": 999, height: h, width: w });
+
+					$(lists).each(function(i, l) { l.createDropTargets(); l.buildPositionTable(); });
+
+					list.scroll = { moveX: 0, moveY: 0, maxX: $(document).width() - $(window).width(), maxY: $(document).height() - $(window).height() };
+					list.scroll.scrollY = window.setInterval(function() {
+						if (opts.scrollContainer != window) {
+							$(opts.scrollContainer).scrollTop($(opts.scrollContainer).scrollTop() + list.scroll.moveY);
+							return;
+						}
+						var t = $(opts.scrollContainer).scrollTop();
+						if (list.scroll.moveY > 0 && t < list.scroll.maxY || list.scroll.moveY < 0 && t > 0) {
+							$(opts.scrollContainer).scrollTop(t + list.scroll.moveY);
+							list.draggedItem.css("top", list.draggedItem.offset().top + list.scroll.moveY + 1);
+						}
+					}, 10);
+					list.scroll.scrollX = window.setInterval(function() {
+						if (opts.scrollContainer != window) {
+							$(opts.scrollContainer).scrollLeft($(opts.scrollContainer).scrollLeft() + list.scroll.moveX);
+							return;
+						}
+						var l = $(opts.scrollContainer).scrollLeft();
+						if (list.scroll.moveX > 0 && l < list.scroll.maxX || list.scroll.moveX < 0 && l > 0) {
+							$(opts.scrollContainer).scrollLeft(l + list.scroll.moveX);
+							list.draggedItem.css("left", list.draggedItem.offset().left + list.scroll.moveX + 1);
+						}
+					}, 10);
+
+					list.setPos(e.pageX, e.pageY);
+					$(document).bind("selectstart", list.stopBubble); //stop ie text selection
+					$(document).bind("mousemove", list.swapItems);
+					$(document).bind("mouseup", list.dropItem);
+					if (opts.scrollContainer != window)
+						$(window).bind("DOMMouseScroll mousewheel", list.wheel);
+					return false; //stop moz text selection
+				},
+
+				setPos: function(x, y) {
+					var top = y - this.offset.top;
+					var left = x - this.offset.left;
+
+					if (!opts.dragBetween) {
+						top = Math.min(this.offsetLimit.bottom, Math.max(top, this.offsetLimit.top));
+						left = Math.min(this.offsetLimit.right, Math.max(left, this.offsetLimit.left));
+					}
+
+					this.draggedItem.parents().each(function() {
+						if ($(this).css("position") != "static" && (!$.browser.mozilla || $(this).css("display") != "table")) {
+							var offset = $(this).offset();
+							top -= offset.top;
+							left -= offset.left;
+							return false;
+						}
+					});
+
+					if (opts.scrollContainer == window) {
+						y -= $(window).scrollTop();
+						x -= $(window).scrollLeft();
+						y = Math.max(0, y - $(window).height() + 5) + Math.min(0, y - 5);
+						x = Math.max(0, x - $(window).width() + 5) + Math.min(0, x - 5);
+					} else {
+						var cont = $(opts.scrollContainer);
+						var offset = cont.offset();
+						y = Math.max(0, y - cont.height() - offset.top) + Math.min(0, y - offset.top);
+						x = Math.max(0, x - cont.width() - offset.left) + Math.min(0, x - offset.left);
+					}
+					
+					list.scroll.moveX = x == 0 ? 0 : x * opts.scrollSpeed / Math.abs(x);
+					list.scroll.moveY = y == 0 ? 0 : y * opts.scrollSpeed / Math.abs(y);
+
+					this.draggedItem.css({ top: top, left: left });
+				},
+				
+				wheel: function(e) {
+					if (($.browser.safari || $.browser.mozilla) && list && opts.scrollContainer != window) {
+						var cont = $(opts.scrollContainer);
+						var offset = cont.offset();
+						if (e.pageX > offset.left && e.pageX < offset.left + cont.width() && e.pageY > offset.top && e.pageY < offset.top + cont.height()) {
+							var delta = e.detail ? e.detail * 5 : e.wheelDelta / -2;
+							cont.scrollTop(cont.scrollTop() + delta);
+							e.preventDefault();
+						}
+					}
+				},
+
+				buildPositionTable: function() {
+					var item = this.draggedItem == null ? null : this.draggedItem.get(0);
+					var pos = [];
+					$(this.container).children(opts.itemSelector).each(function(i, elm) {
+						if (elm != item) {
+							var loc = $(elm).offset();
+							loc.right = loc.left + $(elm).width();
+							loc.bottom = loc.top + $(elm).height();
+							loc.elm = elm;
+							pos.push(loc);
+						}
+					});
+					this.pos = pos;
+				},
+
+				dropItem: function() {
+					if (list.draggedItem == null)
+						return;
+
+					$(list.container).find(opts.dragSelector).css("cursor", "pointer");
+					list.placeHolderItem.before(list.draggedItem);
+
+					var orig = list.draggedItem.attr("data-origStyle");
+					if (orig == "")
+						list.draggedItem.removeAttr("style");
+					else
+						list.draggedItem.attr("style", orig);
+					list.draggedItem.removeAttr("data-origStyle");
+					list.placeHolderItem.remove();
+
+					$("[data-dropTarget]").remove();
+
+					window.clearInterval(list.scroll.scrollY);
+					window.clearInterval(list.scroll.scrollX);
+
+					var changed = false;
+					$(lists).each(function() {
+						$(this.container).children(opts.itemSelector).each(function(j) {
+							if (parseInt($(this).attr("data-itemIdx")) != j) {
+								changed = true;
+								$(this).attr("data-itemIdx", j);
+							}
+						});
+					});
+					if (changed)
+						opts.dragEnd.apply(list.draggedItem);
+					list.draggedItem = null;
+					$(document).unbind("selectstart", list.stopBubble);
+					$(document).unbind("mousemove", list.swapItems);
+					$(document).unbind("mouseup", list.dropItem);
+					if (opts.scrollContainer != window)
+						$(window).unbind("DOMMouseScroll mousewheel", list.wheel);
+					return false;
+				},
+
+				stopBubble: function() { return false; },
+
+				swapItems: function(e) {
+					if (list.draggedItem == null)
+						return false;
+
+					list.setPos(e.pageX, e.pageY);
+
+					var ei = list.findPos(e.pageX, e.pageY);
+					var nlist = list;
+					for (var i = 0; ei == -1 && opts.dragBetween && i < lists.length; i++) {
+						ei = lists[i].findPos(e.pageX, e.pageY);
+						nlist = lists[i];
+					}
+
+					if (ei == -1 || $(nlist.pos[ei].elm).attr("data-placeHolder"))
+						return false;
+
+					if (lastPos == null || lastPos.top > list.draggedItem.offset().top || lastPos.left > list.draggedItem.offset().left)
+						$(nlist.pos[ei].elm).before(list.placeHolderItem);
+					else
+						$(nlist.pos[ei].elm).after(list.placeHolderItem);
+
+					$(lists).each(function(i, l) { l.createDropTargets(); l.buildPositionTable(); });
+					lastPos = list.draggedItem.offset();
+					return false;
+				},
+
+				findPos: function(x, y) {
+					for (var i = 0; i < this.pos.length; i++) {
+						if (this.pos[i].left < x && this.pos[i].right > x && this.pos[i].top < y && this.pos[i].bottom > y)
+							return i;
+					}
+					return -1;
+				},
+
+				createDropTargets: function() {
+					if (!opts.dragBetween)
+						return;
+
+					$(lists).each(function() {
+						var ph = $(this.container).find("[data-placeHolder]");
+						var dt = $(this.container).find("[data-dropTarget]");
+						if (ph.size() > 0 && dt.size() > 0)
+							dt.remove();
+						else if (ph.size() == 0 && dt.size() == 0) {
+							//list.placeHolderItem.clone().removeAttr("data-placeHolder") crashes in IE7 and jquery 1.5.1 (doesn't in jquery 1.4.2 or IE8)
+							$(this.container).append(list.placeHolderItem.removeAttr("data-placeHolder").clone().attr("data-dropTarget", true));
+							list.placeHolderItem.attr("data-placeHolder", true);
+						}
+					});
+				}
+			};
+
+			newList.init();
+			lists.push(newList);
+		});
+
+		return this;
+	};
+
+	$.fn.dragsort.defaults = {
+		itemSelector: "li",
+		dragSelector: "li",
+		dragSelectorExclude: "input, textarea, a[href]",
+		dragEnd: function() { },
+		dragBetween: false,
+		placeHolderTemplate: "<li>&nbsp;</li>",
+		scrollContainer: window,
+		scrollSpeed: 5
+	};
+
+})(jQuery);