more fixes to tree

frappe/public/css/tree.css

@@ -2,7 +2,6 @@
 	list-style: none; 
 }
 .tree ul { 
-	margin-top: 2px; 
 }
 .tree-link { 
 	cursor: pointer; 

frappe/public/js/frappe/translate.js

@@ -7,4 +7,5 @@ frappe._ = function(txt, replace) {
 	if(!txt) return txt;
 	if(typeof(txt) != "string") return txt;
 	return frappe._messages[txt.replace(/\n/g, "")] || txt;
-};
+};
+window.__ = frappe._

frappe/public/js/frappe/ui/tree.js

@@ -14,7 +14,12 @@ frappe.ui.Tree = Class.extend({
 			parent: this.$w, 
 			label: this.label, 
 			parent_label: null,
-			expandable: true
+			expandable: true,
+			root: true,
+			data: {
+				value: this.label,
+				expandable: true
+			}
 		});
 		this.rootnode.toggle();
 	},
@@ -45,7 +50,7 @@ frappe.ui.TreeNode = Class.extend({
 	make: function() {
 		var me = this;
 		this.$a = $('<span class="tree-link">')
-			.click(function() { 
+			.click(function(event) { 
 				me.tree.selected_node = me;
 				if(me.tree.toolbar) {
 					me.show_toolbar();
@@ -69,12 +74,17 @@ frappe.ui.TreeNode = Class.extend({
 	},
 	make_icon: function() {
 		// label with icon
+		var me= this;
 		var icon_html = '<i class="icon-fixed-width icon-file"></i>';
 		if(this.expandable) {
 			icon_html = '<i class="icon-fixed-width icon-folder-close"></i>';
 		}
 		$(icon_html + ' <a class="tree-label">' + this.label + "</a>").
 			appendTo(this.$a);
+			
+		this.$a.find('i').click(function() { 
+			setTimeout(function() { me.toolbar.find(".btn-expand").click(); }, 100);			
+		});
 	},
 	toggle: function(callback) {
 		if(this.expandable && this.tree.method && !this.loaded) {
@@ -97,12 +107,28 @@ frappe.ui.TreeNode = Class.extend({
 		var me = this;
 		this.toolbar = $('<span class="tree-node-toolbar"></span>').insertAfter(this.$a);
 		
-		$.each(this.tree.toolbar, function(i, d) {
-			$("<a class='tree-toolbar-item'>")
-				.html(d.label)
+		$.each(this.tree.toolbar, function(i, item) {
+			if(item.toggle_btn) {
+				item = {
+					condition: function() { return me.expandable; },
+					get_label: function() { return me.expanded ? __("Collapse") : __("Expand") },
+					click:function(node, btn) {
+						node.toggle(function() {
+							$(btn).html(node.expanded ? __("Collapse") : __("Expand"));
+						});
+					},
+					btnClass: "btn-expand"
+				}
+			}
+			if(item.condition) {
+				if(!item.condition(me)) return;
+			}
+			var link = $("<a class='tree-toolbar-item'>")
+				.html(item.get_label ? item.get_label() : item.label)
 				.appendTo(me.toolbar)
-				.click(function() { d.click(me, this); return false; });
+				.click(function() { item.click(me, this); return false; });
 				
+			if(item.btnClass) link.addClass(item.btnClass);
 		})
 				
 	},

frappe/website/page/sitemap_browser/sitemap_browser.js

@@ -39,12 +39,7 @@ frappe.website.SitemapBrowser = Class.extend({
 			method: 'frappe.website.page.sitemap_browser.sitemap_browser.get_children',
 			toolbar: [
 				{
-					label:frappe._("Expand"),
-					click:function(node, btn) {
-						node.toggle(function() {
-							$(btn).html(node.expanded ? frappe._("Collapse") : frappe._("Expand"));
-						});
-					}
+					toggle_btn: true,
 				},
 				{
 					label: frappe._("Update Parent"),

frappe/website/page/sitemap_browser/sitemap_browser.py

@@ -13,8 +13,10 @@ def get_children(parent=None):
 	if parent=="Sitemap":
 		parent = ""
 
-	return frappe.conn.sql("""select name as value, 1 as expandable from `tabWebsite Sitemap` where 
-		ifnull(parent_website_sitemap, '')=%s and idx is not null order by -idx desc""", parent, as_dict=True)
+	return frappe.conn.sql("""select name as value, 1 as expandable, ref_doctype, docname 
+		from `tabWebsite Sitemap` where 
+		ifnull(parent_website_sitemap, '')=%s 
+			and idx is not null order by -idx desc""", parent, as_dict=True)
 		
 @frappe.whitelist()
 def move(name, up_or_down):