From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 29 Apr 2010 10:47:37 +0000 (+0000)
Subject: New layout, new views...
X-Git-Tag: argeo-slc-2.1.7~1333
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=730d2bd9dcd58cf9ff28115174a2a43f2c1359cd;p=gpl%2Fargeo-slc.git

New layout, new views...

git-svn-id: https://svn.argeo.org/slc/trunk@3521 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
index 0c01772d5..c997eaab5 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
@@ -42,9 +42,9 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
   		viewsManager.getViewPanesContainer().add(this._tBar);
   		
   		this._splitPane = new qx.ui.splitpane.Pane("horizontal");
-		var leftPane = new org.argeo.ria.components.ViewPane("treeview", "Tree View");
+		var leftPane = new org.argeo.ria.components.TabbedViewPane("treeview", "Tree View");
 		this._splitPane.add(leftPane, 1);
-		var mainPane = new org.argeo.ria.components.ViewPane("fulltree", "Editor View");
+		var mainPane = new org.argeo.ria.components.TabbedViewPane("editor", "Editor View", true);
 		this._splitPane.add(mainPane, 2);
   		viewsManager.registerViewPane(this._tBar);
 		viewsManager.registerViewPane(mainPane);      
@@ -67,11 +67,17 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
   		var inputView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.ContextNodeInputView, "toolbar", dataModel);
   		inputView.load();
   		
+  		/*
 		var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "fulltree", dataModel);
 		testView.load();
+		*/
+		var listView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.ListView, "editor", dataModel);
+		listView.load();
 		
 		var treeView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.TreeView, "treeview", dataModel);
 		treeView.load();
+		
+		dataModel.requireContextChange();
   	},
   	
   	remove : function(viewsManager){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
index 4432c8066..a8f75c0eb 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
@@ -17,6 +17,11 @@ qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 			check : "Array",
 			event : "changeSelection",
 			init : []
+		},
+		selectionSource : {
+			check : "Object",
+			init : null,
+			nullable : true
 		}
 	},
 	
@@ -58,7 +63,11 @@ qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 				this.fireDataEvent("changeContextNode", targetNode);
 			};
 			targetNode.addListener("changeLoadState", observer, this);
-			targetNode.load();
+			targetNode.load(1);
+		},
+		setSelectionWithSource : function(selection, source){
+			this.setSelectionSource(source);
+			this.setSelection(selection);
 		}
 	}
 	
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
index f8d59f7f7..81edc5218 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
@@ -41,8 +41,10 @@ qx.Class.define("org.argeo.jcr.ria.model.Node", {
 		_children : null,
 		_properties : null,
 		
-		load : function(){
-			this.getNodeProvider().loadNode(this);
+		load : function(depth, filter){
+			if(!depth) depth = 1;
+			if(!filter) filter = '';
+			this.getNodeProvider().loadNode(this, depth, filter);
 		},
 		
 		remove : function(){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/INodeProvider.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/INodeProvider.js
index fe81c569d..867ad611a 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/INodeProvider.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/INodeProvider.js
@@ -1,6 +1,6 @@
 qx.Interface.define("org.argeo.jcr.ria.provider.INodeProvider", {
 	members : {
 		initProvider : function(properties){},
-		loadNode : function(path, nodeCallback, childCallback){}
+		loadNode : function(path, depth, filter){}
 	}
 });
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
index 41a830c83..19990d04f 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
@@ -27,7 +27,7 @@ qx.Class.define("org.argeo.jcr.ria.provider.XmlNodeProvider", {
 		 * @param nodeCallback Function
 		 * @param childCallback Function
 		 */
-		loadNode : function(node, nodeCallback, childCallback){
+		loadNode : function(node, depth, filter){
 			if(node.getLoadState() == "loaded") return;
 			
 			if(this.getXmlDocLoaded()){
@@ -41,21 +41,23 @@ qx.Class.define("org.argeo.jcr.ria.provider.XmlNodeProvider", {
 				}
 			}else{
 				this.addListenerOnce("changeXmlDocLoaded", function(){
-					this.loadNode(node, nodeCallback, childCallback);
+					this.loadNode(node, depth, filter);
 				}, this);
 				node.setLoadState("loading");
-				this.loadXmlDoc(node);
+				this.loadXmlDoc(node, depth, filter);
 			}
 		},
 				
-		loadXmlDoc : function(node){
+		loadXmlDoc : function(node, depth, filter){
 			var properties = this.getSettings();
 			if(!properties.xmlSrc && !properties.xmlString) return;
 			if(properties.xmlSrc){
 				var request = new org.argeo.ria.remote.Request(properties.xmlSrc, 'GET', 'application/xml');
 				if(properties.dynamic && properties.pathParameter){
 					request.setParameter(properties.pathParameter, (node.getPath()|| "/"));
-					request.setParameter("depth", 1);
+					if(depth && depth != -1){
+						request.setParameter("depth", depth);
+					}
 				}
 				request.addListener("completed", function(response){
 					this._xmlDoc = response.getContent();
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js
index 5b94762c1..bf01cefbc 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js
@@ -45,7 +45,7 @@ qx.Class.define("org.argeo.jcr.ria.views.ContextNodeInputView", {
 			this.set({
 				layout : new qx.ui.layout.HBox(),
 				dataModel : dataModel,
-				padding: 10, 
+				padding: 5, 
 				decorator : 'toolbar'
 			});			
 			
@@ -60,6 +60,7 @@ qx.Class.define("org.argeo.jcr.ria.views.ContextNodeInputView", {
 			
 			this.selectionInput = new qx.ui.form.TextField();
 			this.selectionInput.setWidth(300);
+			this.selectionInput.setReadOnly(true);
 			this.add(this.selectionInput);
 			
 			this._attachInputsToDM();			
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js
new file mode 100644
index 000000000..24ee64929
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ListView.js
@@ -0,0 +1,137 @@
+qx.Class.define("org.argeo.jcr.ria.views.ListView", {
+	extend : qx.ui.container.Composite, 
+	implement : [org.argeo.ria.components.IView],
+	properties : {
+		/**
+		 * The commands definition Map that will be automatically added and wired to the menubar and toolbar.
+		 * See {@link org.argeo.ria.event.CommandsManager#definitions} for the keys to use for defining commands.
+		 */
+		commands : {
+			init : {}
+		},
+	  	viewSelection : {
+	  		nullable:false, 
+	  		check:"org.argeo.ria.components.ViewSelection"
+	  	},
+	  	instanceId : {
+	  		init:"listView",
+	  		event : "changeInstanceId"
+	  	},
+	  	instanceLabel : {
+	  		init:"List",
+	  		event : "changeInstanceLabel"
+	  	},
+	  	dataModel : {
+	  		
+	  	}
+	},
+	
+	construct : function(){
+		this.base(arguments);
+	},
+	
+	members : {
+		/**
+		 * The implementation should contain the GUI initialisation.
+		 * This is the role of the manager to actually add the graphical component to the pane, 
+		 * so it's not necessary to do it here. 
+		 * @param viewPane {org.argeo.ria.components.ViewPane} The pane manager
+		 * @param data {Mixed} Any object or data passed by the initiator of the view
+		 * @return {Boolean}
+		 */
+		init : function(viewPane, dataModel){
+			this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));	  			
+			this.setLayout(new qx.ui.layout.VBox());
+			this.setDataModel(dataModel);
+			
+			var split = new qx.ui.splitpane.Pane("vertical");
+			split.setDecorator(null);
+			this.add(split, {flex:1});
+			
+			this.list = new qx.ui.form.List();			
+			split.add(this.list,1);
+			
+			this.propInput = new qx.ui.form.TextArea();
+			split.add(this.propInput,1);
+			var call = new qx.util.DeferredCall(function(){
+				qx.bom.element.Style.set(this.propInput.getContentElement().getDomElement(), "lineHeight", "1.8");
+			}, this);
+			call.schedule();
+		},
+		/**
+		 * The implementation should contain the real data loading (i.o. query...)
+		 * @return {Boolean}
+		 */
+		load : function(){
+			var dataModel = this.getDataModel();
+			dataModel.addListener("changeSelection", function(event){
+				if(dataModel.getSelectionSource() == this) return;
+				var selection = event.getData();
+				this.list.removeAll();
+				if(!selection.length) {
+					return;
+				}
+				var contextNode = selection[0];
+				this._parseNode(contextNode);
+			}, this);
+		},
+		
+		_parseNode : function (jcrNode){
+			if(jcrNode.getLoadState() == "loaded"){
+				this.list.removeAll();
+				if(jcrNode.getParent()){
+					this.list.add(this._initListItem(jcrNode.getParent(), ".."));
+				}
+				var children = jcrNode.getChildren();
+				for(var i=0;i<children.length;i++){
+					this.list.add(this._initListItem(children[i]));
+				}
+				if(this.list.hasChildren()){
+					this.list.setSelection([this.list.getChildren()[0]]);
+				}
+				var properties = jcrNode.getProperties();
+				var propString = "";
+				for(var i=0;i<properties.length;i++){
+					propString += properties[i].getName()+"="+properties[i].getValue()+"\n";
+				}
+				this.propInput.setValue(propString);
+			}else{
+				var listener = function(event){
+					if(event.getData() == "loaded"){
+						this._parseNode(jcrNode);
+						jcrNode.removeListener("changeLoadState", listener, this);
+					}
+				};
+				jcrNode.addListener("changeLoadState", listener, this);
+				if(jcrNode.getLoadState() != "loading"){
+					jcrNode.load();
+				}
+			}
+		},
+		
+		_initListItem : function(jcrNode, label){
+			var li = new qx.ui.form.ListItem((label?label:jcrNode.getName()));
+			li.setModel(jcrNode);
+			li.addListener("dblclick", function(){
+				this.getDataModel().setSelectionWithSource([jcrNode], this);
+			}, this);
+			return li;
+		},
+		
+		/**
+		 * Whether this component is already contained in a scroller (return false) or not (return true).
+		 * @return {Boolean}
+		 */
+		addScroll : function(){
+			return false;
+		},
+		/**
+		 * Called at destruction time
+		 * Perform all the clean operations (stopping polling queries, etc.) 
+		 */
+		close : function(){
+			
+		}		
+		
+	}
+});
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js
index a164315a5..92b6755e8 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js
@@ -8,7 +8,21 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 		 * See {@link org.argeo.ria.event.CommandsManager#definitions} for the keys to use for defining commands.
 		 */
 		commands : {
-			init : {}
+			init : {
+	  			"close" : {
+	  				label	 	: "Close",
+	  				shared		: true,
+	  				icon 		: "org.argeo.slc.ria/window-close.png",
+	  				shortcut 	: "Control+w",
+	  				enabled  	: true,
+	  				menu	   	: "Test",
+	  				toolbar  	: "result",
+	  				callback	: function(e){
+	  					this._viewPane.closeCurrent();
+	  				},
+	  				command 	: null
+	  			}				
+			}
 		},
 	  	viewSelection : {
 	  		nullable:false, 
@@ -21,9 +35,6 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 	  	instanceLabel : {
 	  		init:"Xml Editor",
 	  		event : "changeInstanceLabel"
-	  	},
-	  	dataModel : {
-	  		
 	  	}
 	},
 	
@@ -40,11 +51,14 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 		 * @param data {Mixed} Any object or data passed by the initiator of the view
 		 * @return {Boolean}
 		 */
-		init : function(viewPane, dataModel){
+		init : function(viewPane, jcrNode){
+			this._viewPane = viewPane;
 			this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));	  			
 			this.setLayout(new qx.ui.layout.VBox());
-			this.setDataModel(dataModel);
-						
+			
+			this.setInstanceId("edit:" + jcrNode.getPath());
+			this.setInstanceLabel("Node '" + jcrNode.getName()+"'");
+			
 			this.htmlPane = new qx.ui.embed.Html();
 			this.htmlPane.setOverflow("auto", "auto");
 			this.htmlPane.setDecorator("input");
@@ -55,52 +69,56 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 		 * The implementation should contain the real data loading (i.o. query...)
 		 * @return {Boolean}
 		 */
-		load : function(){
-			var dataModel = this.getDataModel();
-			dataModel.addListener("changeSelection", function(event){
-				var selection = event.getData();
-				if(!selection.length) {
-					this.htmlPane.setHtml("");
-					return;
+		load : function(jcrNode){
+			// Load full XML (deep)			
+			//jcrNode.load(-1);
+			var fakeNode = new org.argeo.jcr.ria.model.Node(jcrNode.getName(), jcrNode.getNodeProvider(), true);
+			fakeNode.setPath(jcrNode.getPath());
+			fakeNode.addListener("changeLoadState", function(event){
+				if(event.getData() == "loaded"){
+					var xmlString = fakeNode.toXmlString(true);
+					this._loadXmlString(xmlString);
+				}
+			}, this);
+			fakeNode.load(-1);
+		},
+		
+		_loadXmlString : function(xmlString){
+		    var TAG_START_PATTERN = new RegExp("<([0-9a-zA-Z\.:]+)([^>]*)>", "gi");
+		    var TAG_END_PATTERN = new RegExp("</([0-9a-zA-Z\.:]+)>", "gi");
+		    var TAG_CLOSE_PATTERN = new RegExp("(/?>)", "gi");
+		    var TAG_ATTRIBUTE = new RegExp("\\s([0-9a-zA-Z:_]+)\\=\"([^\"]*)\"", "gi");
+		    // Not implemented yet
+		    var TAG_COMMENT = new RegExp("(<!--.*-->)", "gi");
+		    var TAG_CDATA_START = new RegExp("(\\<!\\[CDATA\\[).*", "gi");
+		    var TAG_CDATA_END = new RegExp(".*(]]>)", "gi");
+			
+		    xmlString = xmlString.replace(TAG_START_PATTERN, 'xml_div_begin&lt;xml_tagname_begin$1xml_tagname_end$2&gt;');
+		    xmlString = xmlString.replace(TAG_END_PATTERN, '&lt;/xml_tagname_begin$1xml_tagname_end&gt;xml_div_end');
+		    xmlString = xmlString.replace(TAG_CLOSE_PATTERN, '&gt;');
+		    
+		    xmlString = xmlString.replace(TAG_ATTRIBUTE, ' xml_attname_begin$1xml_attname_end="xml_attvalue_begin$2xml_attvalue_end"');
+			
+			//xmlString = qx.xml.String.escape(xmlString);
+			xmlString = xmlString.replace(new RegExp("(xml_div_begin)", "g"), '<div style="padding:1px;line-height:17px;padding-left:15px;">');
+			xmlString = xmlString.replace(new RegExp("(xml_div_end)", "g"), '</div>');
+			xmlString = xmlString.replace(new RegExp("(xml_tagname_begin)", "g"), '<b style="color:rgb(63,127,127);">');
+			xmlString = xmlString.replace(new RegExp("(xml_tagname_end)", "g"), '</b>');
+			xmlString = xmlString.replace(new RegExp("(xml_attname_begin)", "g"), '<b>');
+			xmlString = xmlString.replace(new RegExp("(xml_attname_end)", "g"), '</b>');
+			xmlString = xmlString.replace(new RegExp("(xml_attvalue_begin)", "g"), '<span style="color:rgb(0,0,255)">');
+			xmlString = xmlString.replace(new RegExp("(xml_attvalue_end)", "g"), '</span>');
+			xmlString = '<div style="margin-left:-10px;">' + xmlString + '</div>';
+			this.htmlPane.setHtml(xmlString);
+			var call = new qx.util.DeferredCall(function(){
+				var htmlDom = this.htmlPane.getContentElement().getDomElement();
+				var spans = qx.bom.Selector.query("span", htmlDom);
+				for(var i=0;i<spans.length;i++){
+					var oThis = this;
+					spans[i].onclick = function(){oThis._setAttributesSpanEditable(this)};
 				}
-				var xmlString = selection[0].toXmlString(true);
-			    var TAG_START_PATTERN = new RegExp("<([0-9a-zA-Z\.:]+)([^>]*)>", "gi");
-			    var TAG_END_PATTERN = new RegExp("</([0-9a-zA-Z\.:]+)>", "gi");
-			    var TAG_CLOSE_PATTERN = new RegExp("(/?>)", "gi");
-			    var TAG_ATTRIBUTE = new RegExp("\\s([0-9a-zA-Z:_]+)\\=\"([^\"]*)\"", "gi");
-			    // Not implemented yet
-			    var TAG_COMMENT = new RegExp("(<!--.*-->)", "gi");
-			    var TAG_CDATA_START = new RegExp("(\\<!\\[CDATA\\[).*", "gi");
-			    var TAG_CDATA_END = new RegExp(".*(]]>)", "gi");
-				
-			    xmlString = xmlString.replace(TAG_START_PATTERN, 'xml_div_begin&lt;xml_tagname_begin$1xml_tagname_end$2&gt;');
-			    xmlString = xmlString.replace(TAG_END_PATTERN, '&lt;/xml_tagname_begin$1xml_tagname_end&gt;xml_div_end');
-			    xmlString = xmlString.replace(TAG_CLOSE_PATTERN, '&gt;');
-			    
-			    xmlString = xmlString.replace(TAG_ATTRIBUTE, ' xml_attname_begin$1xml_attname_end="xml_attvalue_begin$2xml_attvalue_end"');
-				
-				//xmlString = qx.xml.String.escape(xmlString);
-				xmlString = xmlString.replace(new RegExp("(xml_div_begin)", "g"), '<div style="padding:1px;line-height:17px;padding-left:15px;">');
-				xmlString = xmlString.replace(new RegExp("(xml_div_end)", "g"), '</div>');
-				xmlString = xmlString.replace(new RegExp("(xml_tagname_begin)", "g"), '<b style="color:rgb(63,127,127);">');
-				xmlString = xmlString.replace(new RegExp("(xml_tagname_end)", "g"), '</b>');
-				xmlString = xmlString.replace(new RegExp("(xml_attname_begin)", "g"), '<b>');
-				xmlString = xmlString.replace(new RegExp("(xml_attname_end)", "g"), '</b>');
-				xmlString = xmlString.replace(new RegExp("(xml_attvalue_begin)", "g"), '<span style="color:rgb(0,0,255)">');
-				xmlString = xmlString.replace(new RegExp("(xml_attvalue_end)", "g"), '</span>');
-				xmlString = '<div style="margin-left:-10px;">' + xmlString + '</div>';
-				this.htmlPane.setHtml(xmlString);
-				var call = new qx.util.DeferredCall(function(){
-					var htmlDom = this.htmlPane.getContentElement().getDomElement();
-					var spans = qx.bom.Selector.query("span", htmlDom);
-					for(var i=0;i<spans.length;i++){
-						var oThis = this;
-						spans[i].onclick = function(){oThis._setAttributesSpanEditable(this)};
-					}
-				}, this);
-				call.schedule();
 			}, this);
-			dataModel.requireContextChange();			
+			call.schedule();			
 		},
 		
 		_setAttributesSpanEditable : function(span){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
index 9fd2e163c..1dff09f37 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
@@ -14,8 +14,8 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					icon : "org.argeo.slc.ria/media-playback-start.png",
 					shortcut : null,
 					enabled : true,
-					menu : "Context",
-					toolbar : "context",
+					menu : "Zoom",
+					toolbar : "zoom",
 					callback : function(e) {
 						var selection = this.tree.getSelection();
 						if(!selection.length) return;
@@ -38,8 +38,8 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					icon : "org.argeo.slc.ria/media-playback-start.png",
 					shortcut : null,
 					enabled : true,
-					menu : "Context",
-					toolbar : "context",
+					menu : "Zoom",
+					toolbar : "zoom",
 					submenu : [],
 					callback : function(e) {
 					},
@@ -69,6 +69,26 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 						}
 						this.setMenu(pathes);
 					}
+				},
+				"open" : {
+					label : "Open",
+					icon : "org.argeo.slc.ria/media-playback-start.png",
+					shortcut : null,
+					enabled : true,
+					menu : "Selection",
+					toolbar : "selection",
+					callback : function(e) {
+						var selection = this.tree.getSelection();
+						if(!selection.length) return;
+						var jcrNode = selection[0].getJcrNode();
+						var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();						
+						var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "editor", jcrNode);
+						testView.load(jcrNode);
+						
+					},
+					selectionChange : function(viewId, selection){
+						
+					}
 				}				
 			}
 		},
@@ -81,7 +101,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 	  		event : "changeInstanceId"
 	  	},
 	  	instanceLabel : {
-	  		init:"Tree View",
+	  		init:"Full Tree",
 	  		event : "changeInstanceLabel"
 	  	},
 	  	dataModel : {
@@ -118,7 +138,6 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 			var dataModel = this.getDataModel();
 			dataModel.addListener("changeContextNode", function(event){
 				var contextNode = event.getData();
-				var loader = function(){};
 				var newRoot = new org.argeo.jcr.ria.views.JcrTreeFolder(contextNode);
 				this.tree.setRoot(newRoot);
 				this.tree.setSelection([newRoot]);
@@ -132,10 +151,32 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					selection.push(sel[i].getJcrNode());
 					viewSelection.addNode(sel[i]);
 				}
-				this.getDataModel().setSelection(selection);
+				this.getDataModel().setSelectionWithSource(selection, this);
+			}, this);
+			dataModel.addListener("changeSelection", function(e){
+				if(this.getDataModel().getSelectionSource() == this) return;
+				var selection = this.getDataModel().getSelection();
+				// Arbitrary : for the moment, external select can only apply
+				// to children of the current selection
+				var crtSel = this.tree.getSelection();
+				if(!crtSel.length || !selection.length) return;
+				var crtTreeSel = crtSel[0];
+				if(selection[0].getParent() && crtTreeSel.getJcrNode().getPath() == selection[0].getParent().getPath()){
+					crtTreeSel.setOpen(true);
+					var crtChildren =crtTreeSel.getChildren(); 
+					for(var i=0;i<crtChildren.length;i++){
+						if(crtChildren[i].getJcrNode().getPath() == selection[0].getPath()){
+							this.tree.setSelection([crtChildren[i]]);
+							return;
+						}
+					}
+				}else if(crtTreeSel.getParent() && crtTreeSel.getJcrNode().getParent().getPath() == selection[0].getPath()){
+					this.tree.setSelection([crtTreeSel.getParent()]);
+				}
+				
 			}, this);
 			this.tree.setContextMenu(org.argeo.ria.event.CommandsManager
-					.getInstance().createMenuFromIds(["zoom_in", "zoom_out"]));				
+					.getInstance().createMenuFromIds(["open", "zoom_in", "zoom_out"]));				
 		},
 		
 		/**