alchemy_cms 2.1.rc5 → 2.1.rc6

data/app/assets/javascripts/alchemy/alchemy.image_cropper.js

@@ -45,10 +45,13 @@ if (typeof(Alchemy) === 'undefined') {
 		},
 
 		destroy : function() {
-			Alchemy.ImageCropper.api.destroy();
-			Alchemy.ImageCropper.initialized = false;
+			try {
+				Alchemy.ImageCropper.api.destroy();
+			} catch(e) {} finally {
+				Alchemy.ImageCropper.initialized = false;
+			}
 		}
 
-  }
+	}
 
 })(jQuery);

data/app/assets/javascripts/alchemy/alchemy.page_sorter.js

@@ -3,12 +3,12 @@ if (typeof(Alchemy) === 'undefined') {
 }
 
 (function($) {
-	
+
 	var PageSorter = {};
 	$.extend(Alchemy, PageSorter);
-	
+
 	Alchemy.PageSorter = {
-		
+
 		init : function () {
 			$('ul#sitemap').nestedSortable({
 				disableNesting: 'no-nest',
@@ -22,21 +22,26 @@ if (typeof(Alchemy) === 'undefined') {
 				tolerance: 'pointer',
 				toleranceElement: '> div'
 			});
-			$('#save_page_order').click(function(){
-				var params = $('ul#sitemap').nestedSortable('serialize');
+			$('#save_page_order').click(function(e){
+				Alchemy.pleaseWaitOverlay();
+				e.preventDefault();
+				var params = {
+					set: JSON.stringify($('ul#sitemap').nestedSortable('toHierarchy'))
+				};
 				$.post(Alchemy.routes.order_admin_pages_path, params);
+				return false;
 			});
 			Alchemy.PageSorter.disableButton();
 			Alchemy.resizeFrame();
 		},
-		
+
 		disableButton : function() {
 			var $buttonLink = $('#page_sorting_button a');
 			$buttonLink.removeAttr('onclick');
 			$('#page_sorting_button').addClass('active');
 			$buttonLink.css({cursor: 'default'});
 		}
-		
+
 	}
-	
+
 })(jQuery);

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -221,7 +221,7 @@ div.pagination span.gap {
 #login_box {
 	height: 310px;
 	width: 394px;
-	margin-top: -210px;
+	margin-top: -230px;
 	margin-left: -197px;
 	position: absolute;
 	top: 50%;
@@ -980,8 +980,11 @@ ul#layoutpages li {
 }
 
 ul#sitemap li {
-	padding-left: 22px;
-	padding-right: 0;
+	padding-left: 0;
+	li {
+		padding-left: 22px;
+		padding-right: 0;
+	}
 }
 
 ul#layoutpages li {

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -192,17 +192,17 @@ module Alchemy
 
 			def order
 				@page_root = Page.language_root_for(session[:language_id])
-				pages_from_raw_request.each do |page|
-					page_id = page.first[0]
-					parent_id = page.first[1]
-					if parent_id == 'root'
-						parent = @page_root
-					else
-						parent = Page.find(parent_id)
-					end
-					page = Page.find(page_id)
-					page.move_to_child_of(parent)
+				
+				# Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+				neworder = JSON.parse(params[:set])
+				prev_item = nil
+				neworder.each do |item|
+					dbitem = Page.find(item['id'])
+					prev_item.nil? ? dbitem.move_to_child_of(Page.root) : dbitem.move_to_right_of(prev_item)
+					sort_children(item, dbitem) unless item['children'].nil?
+					prev_item = dbitem.reload
 				end
+				
 				flash[:notice] = t("Pages order saved")
 				@redirect_url = admin_pages_path
 				render :action => :redirect
@@ -258,6 +258,17 @@ module Alchemy
 				).path)
 			end
 
+			# Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+			def sort_children(element,dbitem)
+				prevchild = nil
+				element['children'].each do |child|
+					childitem = Page.find(child['id'])
+					prevchild.nil? ? childitem.move_to_child_of(dbitem) : childitem.move_to_right_of(prevchild)
+					sort_children(child, childitem) unless child['children'].nil?
+					prevchild = childitem
+				end
+			end
+
 		end
 	end
 end

data/app/models/alchemy/element.rb

@@ -78,11 +78,11 @@ module Alchemy
 		end
 
 		def all_contents_by_name(name)
-			self.contents.find_all_by_name(name)
+			self.contents.where(:name => name)
 		end
 
 		def all_contents_by_type(essence_type)
-			self.contents.find_all_by_essence_type(Content.normalize_essence_type(essence_type))
+			self.contents.where(:essence_type => Content.normalize_essence_type(essence_type))
 		end
 
 		# Returns the content that is marked as rss title.

data/app/views/alchemy/admin/essence_pictures/update.js.erb

@@ -10,7 +10,7 @@
 	Alchemy.ImageCropper.destroy();
 	Alchemy.closeCurrentWindow();
 	Alchemy.reloadPreview();
-<%- if @content.element.contents.find_all_by_essence_type("Alchemy::EssencePicture").size > 1 -%>
+<%- if @content.element.all_contents_by_type("Alchemy::EssencePicture").count > 1 -%>
 	Alchemy.SortableContents('<%= form_authenticity_token -%>');
 <%- end -%>
 

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -1,114 +1,114 @@
 <li id="page_<%= page.id %>" class="page_level_<%= page.level %>">
-  <div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
-    <div class="sitemap_left_images">
-      <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
-      <span class="site_status <%= @sorting ? 'handle' : nil %> tooltip"></span>
-      <div class="tooltip_content" style="display: none;">
-        <h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
-        <p>
-          <%= page.humanized_status %>
-        </p>
-        <p>
-          <strong><%= t("created_at") %>:</strong>
-          <%= l(page.created_at) %> von <%= page.creator %>
-        </p>
-        <p>
-          <strong><%= t("updated_at") %>:</strong>
-          <%= l(page.updated_at) %> durch <%= page.updater %>
-        </p>
-        <%- if page.locked? -%>
-        <p>
-          <%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= page.current_editor %></span>
-        </p>
-        <%- end -%>
-      </div>
-    </div>
-    <div class="sitemap_right_tools">
-      <%- unless @sorting -%>
-      <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
-      <%= link_to_overlay_window(
-        render_icon('configure_page'),
-        alchemy.configure_admin_page_path(page),
-        {
-          :title => t('edit_page_properties'),
-          :size => page.redirects_to_external? ? '410x270' : '410x620'
-        },
-        :class => '',
-        :title => t('edit_page_properties')
-      ) -%>
-      <%- end -%>
-      <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
-      <span class="sitemap_sitetools">
-        <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
-        <%= link_to(
-          render_icon("copy_page"),
-          alchemy.insert_admin_clipboard_path(
-            :remarkable_type => page.class.name.demodulize.underscore,
-            :remarkable_id => page.id
-          ),
-          :remote => true,
-          :method => :post,
-          :class => "",
-          :title => t("copy_page")
-        ) %>
-        <%- end -%>
-        <%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
-        <%= link_to_confirmation_window(
-          render_icon('delete_page'),
-          t("confirm_to_delete_page"),
-          url_for(
-            :controller => 'pages',
-            :action => 'destroy',
-            :id => page.id
-          ),
-          {
-            :class => "",
-            :title => t("delete_page")
-          }
-        ) -%>
-        <%- end -%>
-        <%- permitted_to?(:new, :alchemy_admin_pages) do -%>
-        <%= link_to_overlay_window(
-          render_icon('add_page'),
-          alchemy.new_admin_page_path(:parent_id => page.id),
-          {
-            :title => t('create_page'),
-            :size => '340x150',
-            :overflow => true
-          },
-          :class => '',
-          :title => t('create_page')
-        ) -%>
-        <%- end -%>
-      </span>
-      <%- end -%>
-      <%- end -%>
-    </div>
-    <div class="page_infos" id="page_<%= page.id %>_infos">
-      <%= render :partial => 'page_infos', :locals => {:page => page} %>
-    </div>
-    <div class="sitemap_sitename">
-    <%- if page.redirects_to_external? -%>
-      <span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
-      <span class="redirect_url">
-        &raquo; <%= t('Redirects to') %>:
-        <%= h page.urlname %>
-      </span>
-    <%- else -%>
-      <%- cycle_class = cycle('even', 'odd') -%>
-      <%= link_to_unless(
-        @sorting,
-        page.name,
-        alchemy.edit_admin_page_path(page),
-        :title => t("edit_page"),
-        :class => "sitemap_pagename_link #{cycle_class}"
-      ) { content_tag('span', page.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
-    <%- end -%>
-    </div>
-  </div>
-  <%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
-  <ul id="page_<%= page.id %>_children">
-    <%= render :partial => 'page', :collection => page.children %>
-  </ul>
-  <%- end -%>
+	<div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
+		<div class="sitemap_left_images">
+			<%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
+			<span class="site_status <%= @sorting ? 'handle' : nil %> tooltip"></span>
+			<div class="tooltip_content" style="display: none;">
+				<h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
+				<p>
+					<%= page.humanized_status %>
+				</p>
+				<p>
+					<strong><%= t("created_at") %>:</strong>
+					<%= l(page.created_at) %> von <%= page.creator %>
+				</p>
+				<p>
+					<strong><%= t("updated_at") %>:</strong>
+					<%= l(page.updated_at) %> durch <%= page.updater %>
+				</p>
+				<%- if page.locked? -%>
+				<p>
+					<%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= page.current_editor %></span>
+				</p>
+				<%- end -%>
+			</div>
+		</div>
+		<div class="sitemap_right_tools">
+			<%- unless @sorting -%>
+			<%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
+			<%= link_to_overlay_window(
+				render_icon('configure_page'),
+				alchemy.configure_admin_page_path(page),
+				{
+					:title => t('edit_page_properties'),
+					:size => page.redirects_to_external? ? '410x270' : '410x620'
+				},
+				:class => '',
+				:title => t('edit_page_properties')
+			) -%>
+			<%- end -%>
+			<%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
+			<span class="sitemap_sitetools">
+				<%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
+				<%= link_to(
+					render_icon("copy_page"),
+					alchemy.insert_admin_clipboard_path(
+						:remarkable_type => page.class.name.demodulize.underscore,
+						:remarkable_id => page.id
+					),
+					:remote => true,
+					:method => :post,
+					:class => "",
+					:title => t("copy_page")
+				) %>
+				<%- end -%>
+				<%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
+				<%= link_to_confirmation_window(
+					render_icon('delete_page'),
+					t("confirm_to_delete_page"),
+					url_for(
+						:controller => 'pages',
+						:action => 'destroy',
+						:id => page.id
+					),
+					{
+						:class => "",
+						:title => t("delete_page")
+					}
+				) -%>
+				<%- end -%>
+				<%- permitted_to?(:new, :alchemy_admin_pages) do -%>
+				<%= link_to_overlay_window(
+					render_icon('add_page'),
+					alchemy.new_admin_page_path(:parent_id => page.id),
+					{
+						:title => t('create_page'),
+						:size => '340x150',
+						:overflow => true
+					},
+					:class => '',
+					:title => t('create_page')
+				) -%>
+				<%- end -%>
+			</span>
+			<%- end -%>
+			<%- end -%>
+		</div>
+		<div class="page_infos" id="page_<%= page.id %>_infos">
+			<%= render :partial => 'page_infos', :locals => {:page => page} %>
+		</div>
+		<div class="sitemap_sitename">
+		<%- if page.redirects_to_external? -%>
+			<span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
+			<span class="redirect_url">
+				&raquo; <%= t('Redirects to') %>:
+				<%= h page.urlname %>
+			</span>
+		<%- else -%>
+			<%- cycle_class = cycle('even', 'odd') -%>
+			<%= link_to_unless(
+				@sorting,
+				page.name,
+				alchemy.edit_admin_page_path(page),
+				:title => t("edit_page"),
+				:class => "sitemap_pagename_link #{cycle_class}"
+			) { content_tag('span', page.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
+		<%- end -%>
+		</div>
+	</div>
+	<%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
+	<ul id="page_<%= page.id %>_children">
+		<%= render :partial => 'page', :collection => page.children %>
+	</ul>
+	<%- end -%>
 </li>

data/app/views/alchemy/admin/pages/_sitemap.html.erb

@@ -1,99 +1,3 @@
 <ul id="sitemap" class="list">
-	<div class="page_root">
-		<div class="sitemap_page<%= @page_root.locked ? ' locked' : '' %>">
-			<div class="sitemap_left_images">
-				<span class="site_status tooltip"></span>
-				<div class="tooltip_content" style="display: none;">
-					<h1><%= t("page_type") %>: <%= @page_root.layout_display_name %></h1>
-					<p>
-						<%= @page_root.humanized_status %>
-					</p>
-					<p>
-						<strong><%= t("created_at") %>:</strong>
-						<%= l(@page_root.created_at) %> von <%= @page_root.creator %>
-					</p>
-					<p>
-						<strong><%= t("updated_at") %>:</strong>
-						<%= l(@page_root.updated_at) %> durch <%= @page_root.updater %>
-					</p>
-					<%- if @page_root.locked? -%>
-					<p>
-						<%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= @page_root.current_editor %></span>
-					</p>
-					<%- end -%>
-				</div>
-			</div>
-			<div class="sitemap_right_tools">
-				<%- unless @sorting -%>
-				<%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
-				<%= link_to_overlay_window(
-					render_icon('configure_page'),
-					alchemy.configure_admin_page_path(@page_root),
-					{
-						:title => t('edit_page_properties'),
-						:size => @page_root.redirects_to_external? ? '410x270' : '410x620'
-					},
-					:class => '',
-					:title => t('edit_page_properties')
-				) -%>
-				<%- end -%>
-				<%- permitted_to?([:new, :destroy], :alchemy_admin_pages) do -%>
-				<span class="sitemap_sitetools">
-					<%= render_icon('blank') %>
-					<%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
-					<%= link_to_confirmation_window(
-						render_icon('delete_page'),
-						t("confirm_to_delete_page"),
-						url_for(
-							:controller => 'pages',
-							:action => 'destroy',
-							:id => @page_root.id
-						),
-						{
-							:class => "",
-							:title => t("delete_page")
-						}
-					) -%>
-					<%- end -%>
-					<%- permitted_to?(:new, :alchemy_admin_pages) do -%>
-					<%= link_to_overlay_window(
-						render_icon('add_page'),
-						alchemy.new_admin_page_path(:parent_id => @page_root.id),
-						{
-							:title => t('create_page'),
-							:size => '340x150',
-							:overflow => true
-						},
-						:class => '',
-						:title => t('create_page')
-					) -%>
-					<%- end -%>
-				</span>
-				<%- end -%>
-				<%- end -%>
-			</div>
-			<div class="page_infos" id="page_<%= @page_root.id %>_infos">
-				<%= render :partial => 'page_infos', :locals => {:page => @page_root} %>
-			</div>
-			<div class="sitemap_sitename">
-				<%- if @page_root.redirects_to_external? -%>
-				<span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= @page_root.name %></span>
-				<span class="redirect_url">
-					&raquo; <%= t('Redirects to') %>:
-					<%= h @page_root.urlname %>
-				</span>
-				<%- else -%>
-				<%- cycle_class = cycle('even', 'odd') -%>
-				<%= link_to_unless(
-					@sorting,
-					@page_root.name,
-					alchemy.edit_admin_page_path(@page_root),
-					:title => t("edit_page"),
-					:class => "sitemap_pagename_link #{cycle_class}"
-				) { content_tag('span', @page_root.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
-				<%- end -%>
-			</div>
-		</div>
-	</div>
-	<%= render :partial => 'page', :collection => @page_root.children %>
+	<%= render :partial => 'page', :object => @page_root %>
 </ul>

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.rc5"
+	VERSION = "2.1.rc6"
 
 end

data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js

@@ -1,15 +1,15 @@
 /*
- * jQuery UI Nested Sortable 1.2.1
- *
- * Copyright 2010, Manuele J Sarfatti
- *
+ * jQuery UI Nested Sortable
+ * v 1.3.4 / 28 apr 2011
  * http://mjsarfatti.com/sandbox/nestedSortable
  *
  * Depends:
- *	 jquery.ui.core.js 1.8+
- *	 jquery.ui.widget.js 1.8+
  *	 jquery.ui.sortable.js 1.8+
+ *
+ * License CC BY-SA 3.0
+ * Copyright 2010-2011, Manuele J Sarfatti
  */
+
 (function($) {
 
 	$.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
@@ -18,14 +18,23 @@
 			tabSize: 20,
 			disableNesting: 'ui-nestedSortable-no-nesting',
 			errorClass: 'ui-nestedSortable-error',
-			listType: 'ol'
+			listType: 'ol',
+			maxLevels: 0,
+			revertOnError: 1
 		},
 
-		_create: function(){
-			this.element.data('sortable', this.element.data('sortableTree'));
+		_create: function() {
+			this.element.data('sortable', this.element.data('nestedSortable'));
 			return $.ui.sortable.prototype._create.apply(this, arguments);
 		},
 
+		destroy: function() {
+			this.element
+				.removeData("nestedSortable")
+				.unbind(".nestedSortable");
+			return $.ui.sortable.prototype.destroy.apply(this, arguments);
+		},
+
 		_mouseDrag: function(event) {
 
 			//Compute the helpers position
@@ -85,14 +94,17 @@
 
 				if(itemElement != this.currentItem[0] //cannot intersect with itself
 					&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
-					&&	!$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
-					&& (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
+					&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+					&& (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
 					//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
 				) {
 
+					$(itemElement).mouseenter();
+
 					this.direction = intersection == 1 ? "down" : "up";
 
 					if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+						$(itemElement).mouseleave();
 						this._rearrange(event, item);
 					} else {
 						break;
@@ -106,44 +118,46 @@
 				}
 			}
 
-			// Get the real previous item
-			itemBefore = this.placeholder[0].previousSibling;
-			while (itemBefore != null) {
-				if (itemBefore.nodeType == 1 && itemBefore != this.currentItem[0]) {
-					break;
-				} else {
-					itemBefore = itemBefore.previousSibling;
+			var parentItem = (this.placeholder[0].parentNode.parentNode
+				       && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
+				       ? $(this.placeholder[0].parentNode.parentNode)
+				       : null,
+			    level = this._getLevel(this.placeholder),
+			    childLevels = this._getChildLevels(this.helper),
+			    previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
+
+			if (previousItem != null) {
+				while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
+					if (previousItem[0].previousSibling) {
+						previousItem = $(previousItem[0].previousSibling);
+					} else {
+						previousItem = null;
+						break;
+					}
 				}
 			}
 
-			parentItem = this.placeholder[0].parentNode.parentNode;
 			newList = document.createElement(o.listType);
 
-			// Make/delete nested ul's/ol's
-			if (parentItem != null && parentItem.nodeName == 'LI' && this.positionAbs.left < $(parentItem).offset().left) {
-				$(parentItem).after(this.placeholder[0]);
-				this._clearEmpty(parentItem);
-			} else if (itemBefore != null && itemBefore.nodeName == 'LI' && this.positionAbs.left > $(itemBefore).offset().left + this.options.tabSize) {
-				if (!($(itemBefore).hasClass(this.options.disableNesting))) {
-					if ($(this.placeholder[0]).hasClass(this.options.errorClass)) {
-						$(this.placeholder[0]).css('marginLeft', 0).removeClass(this.options.errorClass);
-					}
-					if (itemBefore.children[1] == null) {
-						itemBefore.appendChild(newList);
-					}
-					itemBefore.children[1].appendChild(this.placeholder[0]);
-				} else {
-					$(this.placeholder[0]).addClass(this.options.errorClass).css('marginLeft', this.options.tabSize);
-				}
-			} else if (itemBefore != null) {
-				if ($(this.placeholder[0]).hasClass(this.options.errorClass)) {
-					$(this.placeholder[0]).css('marginLeft', 0).removeClass(this.options.errorClass);
-				}
-				$(itemBefore).after(this.placeholder[0]);
-			} else {
-				if ($(this.placeholder[0]).hasClass(this.options.errorClass)) {
-					$(this.placeholder[0]).css('marginLeft', 0).removeClass(this.options.errorClass);
+			this.beyondMaxLevels = 0;
+
+			// If the item is moved to the left, send it to its parent level
+			if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
+				parentItem.after(this.placeholder[0]);
+				this._clearEmpty(parentItem[0]);
+				this._trigger("change", event, this._uiHash());
+			}
+			// If the item is below another one and is moved to the right, make it a children of it
+			else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
+				this._isAllowed(previousItem, level+childLevels+1);
+				if (!previousItem.children(o.listType).length) {
+					previousItem[0].appendChild(newList);
 				}
+				previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+				this._trigger("change", event, this._uiHash());
+			}
+			else {
+				this._isAllowed(parentItem, level+childLevels);
 			}
 
 			//Post events to containers
@@ -160,15 +174,61 @@
 
 		},
 
+		_mouseStop: function(event, noPropagation) {
+
+			// If the item is in a position not allowed, send it back
+			if (this.beyondMaxLevels) {
+
+				this.placeholder.removeClass(this.options.errorClass);
+
+				if (this.options.revertOnError) {
+					if (this.domPosition.prev) {
+						$(this.domPosition.prev).after(this.placeholder);
+					} else {
+						$(this.domPosition.parent).prepend(this.placeholder);
+					}
+					this._trigger("revert", event, this._uiHash());
+				} else {
+					var parent = this.placeholder.parent().closest(this.options.items);
+
+					for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
+						parent = parent.parent().closest(this.options.items);
+					}
+
+					parent.after(this.placeholder);
+					this._trigger("change", event, this._uiHash());
+				}
+
+			}
+
+			// Clean last empty ul/ol
+			for (var i = this.items.length - 1; i >= 0; i--) {
+				var item = this.items[i].item[0];
+				this._clearEmpty(item);
+			}
+
+			$.ui.sortable.prototype._mouseStop.apply(this, arguments);
+
+		},
+
 		serialize: function(o) {
 
-			var items = this._getItemsAsjQuery(o && o.connected);
-			var str = []; o = o || {};
+			var items = this._getItemsAsjQuery(o && o.connected),
+			    str = []; o = o || {};
 
 			$(items).each(function() {
-				var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-				var pid = ($(o.item || this).parent(o.listType).parent('li').attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-				if(res) str.push((o.key || res[1]+'['+(o.key && o.expression ? res[1] : res[2])+']')+'='+(pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
+				var res = ($(o.item || this).attr(o.attribute || 'id') || '')
+						.match(o.expression || (/(.+)[-=_](.+)/)),
+				    pid = ($(o.item || this).parent(o.listType)
+						.parent('li')
+						.attr(o.attribute || 'id') || '')
+						.match(o.expression || (/(.+)[-=_](.+)/));
+
+				if (res) {
+					str.push((o.key || res[1] + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
+						+ '='
+						+ (pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
+				}
 			});
 
 			if(!str.length && o.key) {
@@ -179,113 +239,153 @@
 
 		},
 
-		toArray: function(o) {
+		toHierarchy: function(o) {
 
 			o = o || {};
-			var sDepth = o.startDepthCount || 0;
-			var ret = [];
-			var left = 2;
+			var sDepth = o.startDepthCount || 0,
+			    ret = [];
+
+			$(this.element).children('li').each(function () {
+				var level = _recursiveItems($(this));
+				ret.push(level);
+			});
+
+			return ret;
+
+			function _recursiveItems(li) {
+				var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				if (id) {
+					var item = {"id" : id[2]};
+					if ($(li).children(o.listType).children('li').length > 0) {
+						item.children = [];
+						$(li).children(o.listType).children('li').each(function() {
+							var level = _recursiveItems($(this));
+							item.children.push(level);
+						});
+					}
+					return item;
+				}
+			}
+		},
 
-			ret.push({"item_id": 'root', "parent_id": 'none', "depth": sDepth, "left": '1', "right": ($('li', this.element).length + 1) * 2});
+		toArray: function(o) {
+
+			o = o || {};
+			var sDepth = o.startDepthCount || 0,
+			    ret = [],
+			    left = 2;
+
+			ret.push({
+				"item_id": 'root',
+				"parent_id": 'none',
+				"depth": sDepth,
+				"left": '1',
+				"right": ($('li', this.element).length + 1) * 2
+			});
 
-			$(this.element).children('li').each(function() {
-				left = _recursiveArray($(this), sDepth + 1, left);
+			$(this.element).children('li').each(function () {
+				left = _recursiveArray(this, sDepth + 1, left);
 			});
 
+			ret = ret.sort(function(a,b){ return (a.left - b.left); });
+
 			return ret;
 
 			function _recursiveArray(item, depth, left) {
 
-				right = left + 1;
+				var right = left + 1,
+				    id,
+				    pid;
 
 				if ($(item).children(o.listType).children('li').length > 0) {
 					depth ++;
-					$(item).children(o.listType).children('li').each(function() {
+					$(item).children(o.listType).children('li').each(function () {
 						right = _recursiveArray($(this), depth, right);
 					});
 					depth --;
 				}
 
-				id = $(item).attr('id').match(o.expression || (/(.+)[-=_](.+)/));
+				id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
 
-				if (depth === sDepth + 1) pid = 'root';
-				else {
-					parentItem = $(item).parent(o.listType).parent('li').attr('id').match(o.expression || (/(.+)[-=_](.+)/));
+				if (depth === sDepth + 1) {
+					pid = 'root';
+				} else {
+					var parentItem = ($(item).parent(o.listType)
+						.parent('li')
+						.attr(o.attribute || 'id'))
+						.match(o.expression || (/(.+)[-=_](.+)/));
 					pid = parentItem[2];
 				}
 
-				ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+				if (id) {
+						ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+				}
 
-				return left = right + 1;
+				left = right + 1;
+				return left;
 			}
 
 		},
 
-		_createPlaceholder: function(that) {
-
-			var self = that || this, o = self.options;
-
-			if(!o.placeholder || o.placeholder.constructor == String) {
-				var className = o.placeholder;
-				o.placeholder = {
-					element: function() {
+		_clearEmpty: function(item) {
 
-						var el = $(document.createElement(self.currentItem[0].nodeName))
-							.addClass(className || self.currentItem[0].className+" ui-sortable-placeholder")
-							.removeClass("ui-sortable-helper")[0];
+			var emptyList = $(item).children(this.options.listType);
+			if (emptyList.length && !emptyList.children().length) {
+				emptyList.remove();
+			}
 
-						if(!className)
-							el.style.visibility = "hidden";
+		},
 
-						return el;
-					},
-					update: function(container, p) {
+		_getLevel: function(item) {
 
-						// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
-						// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-						if(className && !o.forcePlaceholderSize) return;
+			var level = 1;
 
-						//If the element doesn't have an actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-						if(!p.height() || p.css('height') == 'auto') { p.height(self.currentItem.height()); };
-						if(!p.width()) { p.width(self.currentItem.width()); };
-					}
-				};
+			if (this.options.listType) {
+				var list = item.closest(this.options.listType);
+				while (!list.is('.ui-sortable')) {
+					level++;
+					list = list.parent().closest(this.options.listType);
+				}
 			}
 
-			//Create the placeholder
-			self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem));
-
-			//Append it after the actual current item
-			self.currentItem.after(self.placeholder);
-
-			//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-			o.placeholder.update(self, self.placeholder);
-
+			return level;
 		},
 
-		_clear: function(event, noPropagation) {
+		_getChildLevels: function(parent, depth) {
+			var self = this,
+			    o = this.options,
+			    result = 0;
+			depth = depth || 0;
 
-			$.ui.sortable.prototype._clear.apply(this, arguments);
-
-			// Clean last empty ul/ol
-			for (var i = this.items.length - 1; i >= 0; i--) {
-				var item = this.items[i].item[0];
-				this._clearEmpty(item);
-			}
-			return true;
+			$(parent).children(o.listType).children(o.items).each(function (index, child) {
+					result = Math.max(self._getChildLevels(child, depth + 1), result);
+			});
 
+			return depth ? result + 1 : result;
 		},
 
-		_clearEmpty: function(item) {
-
-			if (item.children[1] && item.children[1].children.length == 0) {
-				item.removeChild(item.children[1]);
+		_isAllowed: function(parentItem, levels) {
+			var o = this.options;
+			// Are we trying to nest under a no-nest or are we nesting too deep?
+			if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
+				if (o.maxLevels < levels && o.maxLevels != 0) {
+					this.placeholder.addClass(o.errorClass);
+					this.beyondMaxLevels = levels - o.maxLevels;
+				} else {
+					this.placeholder.removeClass(o.errorClass);
+					this.beyondMaxLevels = 0;
+				}
+			} else {
+				this.placeholder.addClass(o.errorClass);
+				if (o.maxLevels < levels && o.maxLevels != 0) {
+					this.beyondMaxLevels = levels - o.maxLevels;
+				} else {
+					this.beyondMaxLevels = 1;
+				}
 			}
-
 		}
 
 	}));
 
 	$.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
-
 })(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.rc5
+  version: 2.1.rc6
   prerelease: 4
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70208029023740 !ruby/object:Gem::Requirement
+  requirement: &70135245578000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029023740
+  version_requirements: *70135245578000
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70208029023320 !ruby/object:Gem::Requirement
+  requirement: &70135245577560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029023320
+  version_requirements: *70135245577560
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70208029022760 !ruby/object:Gem::Requirement
+  requirement: &70135245576980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029022760
+  version_requirements: *70135245576980
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70208029022240 !ruby/object:Gem::Requirement
+  requirement: &70135245576460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70208029022240
+  version_requirements: *70135245576460
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70208029021740 !ruby/object:Gem::Requirement
+  requirement: &70135245575980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70208029021740
+  version_requirements: *70135245575980
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70208029021260 !ruby/object:Gem::Requirement
+  requirement: &70135245575500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029021260
+  version_requirements: *70135245575500
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70208029020780 !ruby/object:Gem::Requirement
+  requirement: &70135245575020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029020780
+  version_requirements: *70135245575020
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70208029020300 !ruby/object:Gem::Requirement
+  requirement: &70135245574540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029020300
+  version_requirements: *70135245574540
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70208029019820 !ruby/object:Gem::Requirement
+  requirement: &70135245574060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70208029019820
+  version_requirements: *70135245574060
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70208029035700 !ruby/object:Gem::Requirement
+  requirement: &70135245573580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70208029035700
+  version_requirements: *70135245573580
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70208029035220 !ruby/object:Gem::Requirement
+  requirement: &70135245573100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70208029035220
+  version_requirements: *70135245573100
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70208029034740 !ruby/object:Gem::Requirement
+  requirement: &70135245572620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70208029034740
+  version_requirements: *70135245572620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70208029034200 !ruby/object:Gem::Requirement
+  requirement: &70135245572120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70208029034200
+  version_requirements: *70135245572120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70208029033660 !ruby/object:Gem::Requirement
+  requirement: &70135245571740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208029033660
+  version_requirements: *70135245571740
 description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
   architecture.
 email:
@@ -793,7 +793,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -607147014317575995
+      hash: -4092920375307944882
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: