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 f56b4569486859f6c3eeafc9207587ce2d8c6cf2..4a4a266bf9fd1a3600f6086e5b3dece30e5fadcc 100644 (file)
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -68,7 +68,8 @@
         "qx.version"     : "${QXVERSION}",\r
         "qx.theme"       : "${QXTHEME}",\r
         "qx.application" : "${APPLICATION}.Application",\r
-        "ria.splashScreen"                     : "org.argeo.security.ria/ArgeoLogo.png",\r
+        "ria.branding.splashScreen"            : "org.argeo.security.ria/ArgeoLogo.png",\r
+        "ria.branding.applicationTitle" : "Slc RIA",\r
         "ria.auth.enableAuth"          : "true",\r
         "ria.auth.credentialsURI"      : "/org.argeo.security.webapp/getCredentials.ria",\r
         "ria.auth.loginURI"                    : "/org.argeo.security.webapp/login.ria",\r

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 96505f8f08f0f7817bedaf29376402eef85d74f7..3d3a1d98a7a97ba37f45d32970ebcf159c159a4d 100644 (file)
--- 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){\r
                                if(event.getData() == "loaded"){\r
                                        org.argeo.jcr.ria.views.JcrTreeFolder.jcrNodeToTreeFolder(jcrNode, treeFolder);\r
+                               }else if(event.getData() == "empty"){\r
+                                       treeFolder.removeAll();\r
+                                       treeFolder.setOpen(false);\r
                                }\r
                        });\r
                        if(jcrNode.getLoadState()=="loaded"){\r
                                org.argeo.jcr.ria.views.JcrTreeFolder.jcrNodeToTreeFolder(jcrNode, treeFolder);\r
-                       }else if(jcrNode.getLoadState() == "empty"){\r
-                               //treeFolder.removeAll();\r
+                       }else if(jcrNode.getLoadState() == "empty"){                            \r
                                jcrNode.load();\r
                        }\r
                },\r
@@ -34,6 +36,7 @@ qx.Class.define("org.argeo.jcr.ria.views.JcrTreeFolder", {
                                parentTreeFolder.add(newFolder);\r
                        }\r
                        parentTreeFolder.setState("loaded");\r
+                       parentTreeFolder.setOpen(true);\r
                }               \r
        },\r
        members : {\r

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 24ee64929f498a2505862ab18f2456579936ac99..a991c802ee730cce3e96a381ba5f425204a00398 100644 (file)
--- 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"\r
                },\r
                instanceLabel : {\r
-                       init:"List",\r
+                       init:"Nodes List",\r
                        event : "changeInstanceLabel"\r
                },\r
                dataModel : {\r

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 92b6755e89d59cbf399ffaddf090b56332e9a03b..ce938badacd410d61b56157f24fd0a1ccbcf7d2d 100644 (file)
--- 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",\r
                                        shortcut        : "Control+w",\r
                                        enabled         : true,\r
-                                       menu            : "Test",\r
-                                       toolbar         : "result",\r
+                                       menu            : null,\r
+                                       toolbar         : null,\r
                                        callback        : function(e){\r
-                                               this._viewPane.closeCurrent();\r
+                                               org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").closeCurrent();\r
                                        },\r
                                        command         : null\r
                                }                               \r

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 ee17460f99abda63059af94eb9b26253725967fb..8b055e06146d79d0a26afd671057853bacee2192 100644 (file)
--- 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,\r
                                        enabled : true,\r
                                        menu : "Zoom",\r
-                                       toolbar : "zoom",\r
+                                       toolbar : null,\r
                                        callback : function(e) {\r
                                                var selection = this.tree.getSelection();\r
                                                if(!selection.length) return;\r
@@ -39,7 +39,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Zoom",\r
-                                       toolbar : "zoom",\r
+                                       toolbar : null,\r
                                        submenu : [],\r
                                        callback : function(e) {\r
                                        },\r
@@ -70,6 +70,31 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                                this.setMenu(pathes);\r
                                        }\r
                                },\r
+                               "refresh" : {\r
+                                       label : "Refresh",\r
+                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       shortcut : null,\r
+                                       enabled : true,\r
+                                       menu : "Selection",\r
+                                       toolbar : "selection",\r
+                                       callback : function(e) {\r
+                                               var selection = this.tree.getSelection();\r
+                                               if(!selection.length) return;\r
+                                               var jcrNode = selection[0].getJcrNode();\r
+                                               var children = jcrNode.getChildren();\r
+                                               for(var i=0;i<children.length;i++){\r
+                                                       jcrNode.removeChild(children[i]);\r
+                                               }\r
+                                               jcrNode.setLoadState("empty");\r
+                                               jcrNode.load();\r
+                                       },\r
+                                       selectionChange : function(viewId, selection){\r
+                                               this.setEnabled(false);\r
+                                               if(selection && selection.length && selection[0].getJcrNode){\r
+                                                       this.setEnabled(true);\r
+                                               }\r
+                                       }\r
+                               },\r
                                "open" : {\r
                                        label : "Open",\r
                                        icon : "org.argeo.slc.ria/media-playback-start.png",\r
@@ -82,7 +107,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                                if(!selection.length) return;\r
                                                var jcrNode = selection[0].getJcrNode();\r
                                                var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();                                         \r
-                                               var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "editor", jcrNode);\r
+                                               var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "editor", jcrNode, "close");\r
                                                testView.load(jcrNode);\r
                                                \r
                                        },\r
@@ -125,7 +150,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                        event : "changeInstanceId"\r
                },\r
                instanceLabel : {\r
-                       init:"Full Tree",\r
+                       init:"JCR Tree",\r
                        event : "changeInstanceLabel"\r
                },\r
                dataModel : {\r
@@ -172,7 +197,9 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                var viewSelection = this.getViewSelection();\r
                                viewSelection.clear();                          \r
                                for(var i=0;i<sel.length;i++){\r
-                                       selection.push(sel[i].getJcrNode());\r
+                                       if(sel[i].getJcrNode){\r
+                                               selection.push(sel[i].getJcrNode());\r
+                                       }\r
                                        viewSelection.addNode(sel[i]);\r
                                }\r
                                this.getDataModel().setSelectionWithSource(selection, this);\r
@@ -200,7 +227,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
                                \r
                        }, this);\r
                        this.tree.setContextMenu(org.argeo.ria.event.CommandsManager\r
-                                       .getInstance().createMenuFromIds(["open", "zoom_in", "zoom_out"]));                             \r
+                                       .getInstance().createMenuFromIds(["open", "dl", "zoom_in", "zoom_out"]));                               \r
                },\r
                \r
                /**\r