From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Fri, 7 Nov 2008 07:42:31 +0000 (+0000)
Subject: Fixed IE build version problems, added icons on download mime types
X-Git-Tag: argeo-slc-2.1.7~2441
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=822367dae62cec5827f98d6090340026b7e36e5d;p=gpl%2Fargeo-slc.git

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 c4e2a8f7f..6e58a00e7 100644
--- 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");
     			break;
     		case 1 : 
-    			xPath = "param[@name='date']";
+    			xPath = 'param[@name="date"]';
 		    	var nameParam = org.argeo.slc.web.util.Element.selectSingleNode(xmlNode, xPath);
+		    	//qx.log.Logger.info(nameParam);
 		    	var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || 0);
 		    	var splits = value.split(".");
-				qx.log.Logger.info(value);
+				//qx.log.Logger.info(value);
 		    	var dateFormat = new qx.util.format.DateFormat("yyyy-MM-dd HH:mm:ss");
 		    	try {
 			    	var date = dateFormat.parse(splits[0]);
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 19bb79076..207580b85 100644
--- 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",
   	},
   	
   	addSubMenuButton : function(label, icon, commandId, menu){
-  		var button = new qx.ui.menu.Button(label);
+  		var button = new qx.ui.menu.Button(label, icon);
   		button.setUserData("commandId", commandId);
   		button.addListener("execute", this.executeSubMenuCallback, this);
   		if(menu){
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 a03a087dd..cee2a7092 100644
--- 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",
   			},
   			"stop" : {
   				label 		: "Stop", 
-  				icon		: "resource/slc/edit-delete.png",
+  				icon		: "resource/slc/process-stop.png",
   				shortcut	: "Control+s",
   				enabled		: false,
   				menu		: null,
@@ -107,10 +107,11 @@ qx.Class.define("org.argeo.slc.web.event.CommandsManager",
   					
   					for(var i=0; i<reports.length;i++){
   						var report = reports[i];
+  						var commandId = qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(report, "@commandid")); 
   						this.addSubMenuButton(
   							qx.dom.Node.getText(report),
-  							qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(report, "@icon")),
-  							qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(report, "@commandid"))
+  							"resource/slc/mime-"+commandId+".png",
+  							commandId
 						);
   					}
   					this.setEnabled(true);
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 6bfcd2d52..a9ee7307d 100644
--- 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",
 		
 		getRequest : function(url, method, responseType){
 			var request = new qx.io.remote.Request(url, method, responseType);
-			/*
-			request.addListener("sending", function(event){
-				this.requestCreated(request);
-			}, this);
-			request.addListener("aborted", function(event){
-				this.requestAborted(request);
+			this.enableCommand(request);
+			request.addListener("timeout", function(e){
+				this.requestTimeout(request);
 			}, this);
-			request.addListener("failed", function(event){
+			request.addListener("failed", function(e){
 				this.requestFailed(request);
 			}, this);
-			request.addListener("timeout", function(event){
-				this.requestTimeout(request);
-			}, this);
-			request.addListener("completed", function(event){
-				this.requestCompleted(request);
+			request.addListener("aborted", function(e){
+				this.requestFailed(request);
 			}, this);
-			*/
-			this.enableCommand(request);
 			return request;
 		},		
 	
@@ -41,33 +33,35 @@ qx.Class.define("org.argeo.slc.web.util.RequestManager",
 		},
 		
 		requestAborted : function(req){
-			this.disableCommand();
+			this.disableCommand(req);
 		},
 		
 		requestFailed : function(req){
-			this.disableCommand();
+			this.disableCommand(req);
 		},
 		
 		requestTimeout : function(req){
-			this.disableCommand();
+			this.disableCommand(req);
 		},
 
-		requestCompleted : function(req){
-			this.disableCommand();
+		requestCompleted : function(request){
+			this.disableCommand(request);
 		},
 		
-		disableCommand : function(){
-			this.command.setEnabled(false);			
-			var manager = qx.event.Registration.getManager(this.command);
-			manager.removeAllListeners(this.command);
+		disableCommand : function(request){
+			this.command.setEnabled(false);
+			var listener = request.getUserData("listener");
+			if(listener){
+				this.command.removeListener("execute", listener);
+			}
 		},
 		
 		enableCommand : function(request){
 			this.command.setEnabled(true);
 			qx.ui.core.queue.Manager.flush();
-			this.command.addListener("execute", function(){
-				request.abort();
-			});
+			var listener = request.abort;
+			request.setUserData("listener", listener);
+			this.command.addListener("execute", listener);
 		}
 	}
 });
\ 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
index 000000000..27faad6fc
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
index 000000000..126f1c878
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
index 000000000..bc00f51a1
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
index 000000000..a4acb09cb
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
index 000000000..fe3aba281
Binary files /dev/null and b/org.argeo.slc.webapp/src/main/webapp/source/resource/slc/process-stop.png differ