Fixed IE build version problems, added icons on download mime types

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js
index c4e2a8f7f1ecdc904e16d46ab597d2e4be9ffff4..6e58a00e775160169786533b44e067c6b09233ee 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js
@@ -22,11 +22,12 @@ qx.Class.define("org.argeo.slc.web.components.XmlRenderer",
                        var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || "Not Found");\r
                        break;\r
                case 1 : \r
-                       xPath = "param[@name='date']";\r
+                       xPath = 'param[@name="date"]';\r
                        var nameParam = org.argeo.slc.web.util.Element.selectSingleNode(xmlNode, xPath);\r
+                       //qx.log.Logger.info(nameParam);\r
                        var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || 0);\r
                        var splits = value.split(".");\r
-                               qx.log.Logger.info(value);\r
+                               //qx.log.Logger.info(value);\r
                        var dateFormat = new qx.util.format.DateFormat("yyyy-MM-dd HH:mm:ss");\r
                        try {\r
                                var date = dateFormat.parse(splits[0]);\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js
index 19bb790767c200aec6ec3e7f2adaf4b487e0599b..207580b85d17c8adaae5592d1167d91060eda584 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js
@@ -79,7 +79,7 @@ qx.Class.define("org.argeo.slc.web.event.Command",
        },\r
        \r
        addSubMenuButton : function(label, icon, commandId, menu){\r
-               var button = new qx.ui.menu.Button(label);\r
+               var button = new qx.ui.menu.Button(label, icon);\r
                button.setUserData("commandId", commandId);\r
                button.addListener("execute", this.executeSubMenuCallback, this);\r
                if(menu){\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js
index a03a087dd6c9794fb41569b3e702e7bd65b321bf..cee2a7092151ca26c6b16c163e0f65d4e9a184ec 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js
@@ -29,7 +29,7 @@ qx.Class.define("org.argeo.slc.web.event.CommandsManager",
                        },\r
                        "stop" : {\r
                                label           : "Stop", \r
-                               icon            : "resource/slc/edit-delete.png",\r
+                               icon            : "resource/slc/process-stop.png",\r
                                shortcut        : "Control+s",\r
                                enabled         : false,\r
                                menu            : null,\r
@@ -107,10 +107,11 @@ qx.Class.define("org.argeo.slc.web.event.CommandsManager",
                                        \r
                                        for(var i=0; i<reports.length;i++){\r
                                                var report = reports[i];\r
+                                               var commandId = qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(report, "@commandid")); \r
                                                this.addSubMenuButton(\r
                                                        qx.dom.Node.getText(report),\r
-                                                       qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(report, "@icon")),\r
-                                                       qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(report, "@commandid"))\r
+                                                       "resource/slc/mime-"+commandId+".png",\r
+                                                       commandId\r
                                                );\r
                                        }\r
                                        this.setEnabled(true);\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js
index 6bfcd2d52d4cbe74c530b6d5e624f644e57a3959..a9ee7307d54556ee557962b2125bc39bee08cc8f 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js
@@ -15,24 +15,16 @@ qx.Class.define("org.argeo.slc.web.util.RequestManager",
                \r
                getRequest : function(url, method, responseType){\r
                        var request = new qx.io.remote.Request(url, method, responseType);\r
-                       /*\r
-                       request.addListener("sending", function(event){\r
-                               this.requestCreated(request);\r
-                       }, this);\r
-                       request.addListener("aborted", function(event){\r
-                               this.requestAborted(request);\r
+                       this.enableCommand(request);\r
+                       request.addListener("timeout", function(e){\r
+                               this.requestTimeout(request);\r
                        }, this);\r
-                       request.addListener("failed", function(event){\r
+                       request.addListener("failed", function(e){\r
                                this.requestFailed(request);\r
                        }, this);\r
-                       request.addListener("timeout", function(event){\r
-                               this.requestTimeout(request);\r
-                       }, this);\r
-                       request.addListener("completed", function(event){\r
-                               this.requestCompleted(request);\r
+                       request.addListener("aborted", function(e){\r
+                               this.requestFailed(request);\r
                        }, this);\r
-                       */\r
-                       this.enableCommand(request);\r
                        return request;\r
                },              \r
        \r
@@ -41,33 +33,35 @@ qx.Class.define("org.argeo.slc.web.util.RequestManager",
                },\r
                \r
                requestAborted : function(req){\r
-                       this.disableCommand();\r
+                       this.disableCommand(req);\r
                },\r
                \r
                requestFailed : function(req){\r
-                       this.disableCommand();\r
+                       this.disableCommand(req);\r
                },\r
                \r
                requestTimeout : function(req){\r
-                       this.disableCommand();\r
+                       this.disableCommand(req);\r
                },\r
 \r
-               requestCompleted : function(req){\r
-                       this.disableCommand();\r
+               requestCompleted : function(request){\r
+                       this.disableCommand(request);\r
                },\r
                \r
-               disableCommand : function(){\r
-                       this.command.setEnabled(false);                 \r
-                       var manager = qx.event.Registration.getManager(this.command);\r
-                       manager.removeAllListeners(this.command);\r
+               disableCommand : function(request){\r
+                       this.command.setEnabled(false);\r
+                       var listener = request.getUserData("listener");\r
+                       if(listener){\r
+                               this.command.removeListener("execute", listener);\r
+                       }\r
                },\r
                \r
                enableCommand : function(request){\r
                        this.command.setEnabled(true);\r
                        qx.ui.core.queue.Manager.flush();\r
-                       this.command.addListener("execute", function(){\r
-                               request.abort();\r
-                       });\r
+                       var listener = request.abort;\r
+                       request.setUserData("listener", listener);\r
+                       this.command.addListener("execute", listener);\r
                }\r
        }\r
 });
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-pdf.png b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-pdf.png
new file mode 100644 (file)
index 0000000..27faad6
Binary files /dev/null and b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-pdf.png differ

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xls.png b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xls.png
new file mode 100644 (file)
index 0000000..126f1c8
Binary files /dev/null and b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xls.png differ

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xml.png b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xml.png
new file mode 100644 (file)
index 0000000..bc00f51
Binary files /dev/null and b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xml.png differ

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xsl.png b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xsl.png
new file mode 100644 (file)
index 0000000..a4acb09
Binary files /dev/null and b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/mime-xsl.png differ

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/process-stop.png b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/process-stop.png
new file mode 100644 (file)
index 0000000..fe3aba2
Binary files /dev/null and b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/process-stop.png differ