From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 29 Apr 2010 13:27:13 +0000 (+0000)
Subject: Update options in config.json, fine tune JCR browser
X-Git-Tag: argeo-slc-2.1.7~1326
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3fa6f9082cb27ae94109d1de5013e88dc9cb895f;p=gpl%2Fargeo-slc.git

Update options in config.json, fine tune JCR browser

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

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index f56b45694..4a4a266bf 100644
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -68,7 +68,8 @@
         "qx.version"     : "${QXVERSION}",
         "qx.theme"       : "${QXTHEME}",
         "qx.application" : "${APPLICATION}.Application",
-        "ria.splashScreen"			: "org.argeo.security.ria/ArgeoLogo.png",
+        "ria.branding.splashScreen"		: "org.argeo.security.ria/ArgeoLogo.png",
+        "ria.branding.applicationTitle" : "Slc RIA",
         "ria.auth.enableAuth"		: "true",
         "ria.auth.credentialsURI"	: "/org.argeo.security.webapp/getCredentials.ria",
         "ria.auth.loginURI"			: "/org.argeo.security.webapp/login.ria",
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js
index 96505f8f0..3d3a1d98a 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js
@@ -17,12 +17,14 @@ qx.Class.define("org.argeo.jcr.ria.views.JcrTreeFolder", {
 			jcrNode.addListener("changeLoadState", function(event){
 				if(event.getData() == "loaded"){
 					org.argeo.jcr.ria.views.JcrTreeFolder.jcrNodeToTreeFolder(jcrNode, treeFolder);
+				}else if(event.getData() == "empty"){
+					treeFolder.removeAll();
+					treeFolder.setOpen(false);
 				}
 			});
 			if(jcrNode.getLoadState()=="loaded"){
 				org.argeo.jcr.ria.views.JcrTreeFolder.jcrNodeToTreeFolder(jcrNode, treeFolder);
-			}else if(jcrNode.getLoadState() == "empty"){
-				//treeFolder.removeAll();
+			}else if(jcrNode.getLoadState() == "empty"){				
 				jcrNode.load();
 			}
 		},
@@ -34,6 +36,7 @@ qx.Class.define("org.argeo.jcr.ria.views.JcrTreeFolder", {
 				parentTreeFolder.add(newFolder);
 			}
 			parentTreeFolder.setState("loaded");
+			parentTreeFolder.setOpen(true);
 		}		
 	},
 	members : {
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
index 24ee64929..a991c802e 100644
--- 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
@@ -18,7 +18,7 @@ qx.Class.define("org.argeo.jcr.ria.views.ListView", {
 	  		event : "changeInstanceId"
 	  	},
 	  	instanceLabel : {
-	  		init:"List",
+	  		init:"Nodes List",
 	  		event : "changeInstanceLabel"
 	  	},
 	  	dataModel : {
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 92b6755e8..ce938bada 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
@@ -15,10 +15,10 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 	  				icon 		: "org.argeo.slc.ria/window-close.png",
 	  				shortcut 	: "Control+w",
 	  				enabled  	: true,
-	  				menu	   	: "Test",
-	  				toolbar  	: "result",
+	  				menu	   	: null,
+	  				toolbar  	: null,
 	  				callback	: function(e){
-	  					this._viewPane.closeCurrent();
+	  					org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").closeCurrent();
 	  				},
 	  				command 	: null
 	  			}				
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 ee17460f9..8b055e061 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
@@ -15,7 +15,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					shortcut : null,
 					enabled : true,
 					menu : "Zoom",
-					toolbar : "zoom",
+					toolbar : null,
 					callback : function(e) {
 						var selection = this.tree.getSelection();
 						if(!selection.length) return;
@@ -39,7 +39,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					shortcut : null,
 					enabled : true,
 					menu : "Zoom",
-					toolbar : "zoom",
+					toolbar : null,
 					submenu : [],
 					callback : function(e) {
 					},
@@ -70,6 +70,31 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 						this.setMenu(pathes);
 					}
 				},
+				"refresh" : {
+					label : "Refresh",
+					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 children = jcrNode.getChildren();
+						for(var i=0;i<children.length;i++){
+							jcrNode.removeChild(children[i]);
+						}
+						jcrNode.setLoadState("empty");
+						jcrNode.load();
+					},
+					selectionChange : function(viewId, selection){
+						this.setEnabled(false);
+						if(selection && selection.length && selection[0].getJcrNode){
+							this.setEnabled(true);
+						}
+					}
+				},
 				"open" : {
 					label : "Open",
 					icon : "org.argeo.slc.ria/media-playback-start.png",
@@ -82,7 +107,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 						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);
+						var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "editor", jcrNode, "close");
 						testView.load(jcrNode);
 						
 					},
@@ -125,7 +150,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 	  		event : "changeInstanceId"
 	  	},
 	  	instanceLabel : {
-	  		init:"Full Tree",
+	  		init:"JCR Tree",
 	  		event : "changeInstanceLabel"
 	  	},
 	  	dataModel : {
@@ -172,7 +197,9 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 				var viewSelection = this.getViewSelection();
 				viewSelection.clear();				
 				for(var i=0;i<sel.length;i++){
-					selection.push(sel[i].getJcrNode());
+					if(sel[i].getJcrNode){
+						selection.push(sel[i].getJcrNode());
+					}
 					viewSelection.addNode(sel[i]);
 				}
 				this.getDataModel().setSelectionWithSource(selection, this);
@@ -200,7 +227,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 				
 			}, this);
 			this.tree.setContextMenu(org.argeo.ria.event.CommandsManager
-					.getInstance().createMenuFromIds(["open", "zoom_in", "zoom_out"]));				
+					.getInstance().createMenuFromIds(["open", "dl", "zoom_in", "zoom_out"]));				
 		},
 		
 		/**