Only init sortable pages on children from root page. Fixes AlchemyCMS…

…#177
SweeD · Feb 7, 2012 · 3152398 · 3152398
1 parent 751de2c
commit 3152398
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/assets/javascripts/alchemy/alchemy.page_sorter.js b/app/assets/javascripts/alchemy/alchemy.page_sorter.js
@@ -10,7 +10,8 @@ if (typeof(Alchemy) === 'undefined') {
 	Alchemy.PageSorter = {
 
 		init : function () {
-			$('ul#sitemap').nestedSortable({
+			var $sortables = $('ul#sitemap').find('ul.level_1_children');
+			$sortables.nestedSortable({
 				disableNesting: 'no-nest',
 				forcePlaceholderSize: true,
 				handle: 'span.handle',
@@ -26,7 +27,7 @@ if (typeof(Alchemy) === 'undefined') {
 				Alchemy.pleaseWaitOverlay();
 				e.preventDefault();
 				var params = {
-					set: JSON.stringify($('ul#sitemap').nestedSortable('toHierarchy'))
+					set: JSON.stringify($sortables.nestedSortable('toHierarchy'))
 				};
 				$.post(Alchemy.routes.order_admin_pages_path, params);
 				return false;

diff --git a/app/controllers/alchemy/admin/pages_controller.rb b/app/controllers/alchemy/admin/pages_controller.rb
@@ -203,7 +203,7 @@ def order
 				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)
+					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

diff --git a/app/views/alchemy/admin/pages/_page.html.erb b/app/views/alchemy/admin/pages/_page.html.erb
@@ -2,7 +2,7 @@
 	<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>
+			<span class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %> tooltip"></span>
 			<div class="tooltip_content" style="display: none;">
 				<h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
 				<p>
@@ -107,7 +107,7 @@
 		</div>
 	</div>
 	<%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
-	<ul id="page_<%= page.id %>_children">
+	<ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
 		<%= render :partial => 'page', :collection => page.children %>
 	</ul>
 	<%- end -%>