diff --git a/javascript/LeftAndMain.Tree.js b/javascript/LeftAndMain.Tree.js index 7b8bf9d7..856245b8 100755 --- a/javascript/LeftAndMain.Tree.js +++ b/javascript/LeftAndMain.Tree.js @@ -15,7 +15,7 @@ // TODO Hack to avoid ajax load on init, see http://code.google.com/p/jstree/issues/detail?id=911 'data': treeContainer.html(), 'ajax': { - 'url': 'admin/getsubtree', + 'url': treeContainer.data('url-tree'), 'data': function(node) { return { ID : $(node).data("id") ? $(node).data("id") : 0 , ajax: 1}; } @@ -82,7 +82,7 @@ }); $.ajax({ - 'url': 'admin/savetreenode', + 'url': treeContainer.data('url-savetreenode'), 'data': { ID: $(movedNode).data('id'), ParentID: $(newParentNode).data('id') || 0, diff --git a/javascript/SecurityAdmin.Tree.js b/javascript/SecurityAdmin.Tree.js deleted file mode 100755 index 746d8355..00000000 --- a/javascript/SecurityAdmin.Tree.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * File: SecurityAdmin.Tree.js - * - * Configuration for the left hand tree - */ -if(typeof SiteTreeHandlers == 'undefined') SiteTreeHandlers = {}; -SiteTreeHandlers.parentChanged_url = 'admin/security/ajaxupdateparent'; -SiteTreeHandlers.orderChanged_url = 'admin/security/ajaxupdatesort'; -SiteTreeHandlers.loadPage_url = 'admin/security/getitem'; -SiteTreeHandlers.loadTree_url = 'admin/security/getsubtree'; -SiteTreeHandlers.showRecord_url = 'admin/security/show/'; -SiteTreeHandlers.controller_url = 'admin/security'; \ No newline at end of file diff --git a/templates/Includes/AssetAdmin_left.ss b/templates/Includes/AssetAdmin_left.ss index 3a041ff8..6217702f 100755 --- a/templates/Includes/AssetAdmin_left.ss +++ b/templates/Includes/AssetAdmin_left.ss @@ -36,7 +36,7 @@ -
+
$SiteTreeAsUL
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss index 2e7b4ba7..b951e1ed 100755 --- a/templates/Includes/CMSMain_left.ss +++ b/templates/Includes/CMSMain_left.ss @@ -7,7 +7,7 @@
<% include CMSMain_TreeTools %>
-
+
$SiteTreeAsUL
diff --git a/templates/Includes/ReportAdmin_left.ss b/templates/Includes/ReportAdmin_left.ss index 3473b555..4ff829a3 100755 --- a/templates/Includes/ReportAdmin_left.ss +++ b/templates/Includes/ReportAdmin_left.ss @@ -10,7 +10,7 @@
-
+
<% include ReportAdmin_SiteTree %>
diff --git a/templates/Includes/SecurityAdmin_left.ss b/templates/Includes/SecurityAdmin_left.ss index 0b5979f5..6e3bf232 100644 --- a/templates/Includes/SecurityAdmin_left.ss +++ b/templates/Includes/SecurityAdmin_left.ss @@ -36,7 +36,7 @@
-
+
$SiteTreeAsUL