From a68eb7675fda57c12074e793fde888e66b2624ff Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 13 Oct 2015 12:44:15 +0000
Subject: [PATCH] 429: Workspace: uploading big files

Task-Url: https://support.d4science.org/issues/429

Changed labels
Updated progress bar view

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119667 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/uploader/DialogUpload.java             |  2 +-
 .../client/uploader/UploaderProgressView.java     | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
index 66b73be..74ee2a4 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
@@ -111,7 +111,7 @@ public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNo
 		hpBottom.getElement().getStyle().setMarginTop(10, Unit.PX);
 		
 		if(uploadType.equals(UPLOAD_TYPE.File)){
-			HTML msg = new HTML("<span>To select multiple files, press and hold down the Ctrl key,</span><span style='dispaly:block; margin-top:-5px'> and then click each item that you want to select</span>");
+			HTML msg = new HTML("<p>To select multiple files, press and hold down the Ctrl key, and then click each item </p><p style='margin-top:-2px'> that you want to select</p>");
 			msg.getElement().getStyle().setFontSize(10, Unit.PX);
 			hpBottom.add(msg);
 		}
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java
index 3b1df0c..7ecf177 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/UploaderProgressView.java
@@ -60,11 +60,16 @@ public class UploaderProgressView {
 		hp.add(html);
 		
 		bar.update(0);
+		setVisibleBar(false);
 		
 		vp.add(hp);
 		vp.add(bar);
 	}
 	
+	public void setVisibleBar(boolean bool){
+		bar.setVisible(bool);
+	}
+	
 	/**
 	 * Update.
 	 *
@@ -74,6 +79,7 @@ public class UploaderProgressView {
 		String text;
 		switch(uploader.getUploadStatus()){
 		case COMPLETED:
+			setVisibleBar(true);
 			text = "<div><img src='"+WorkspaceUploaderResources.getImageCompleted().getUrl()+"'>";
 			text+="<span style='margin-left:5px; vertical-align: top;'>"+StringUtil.ellipsize(uploader.getFile().getFileName()+" uploaded successfully!", MAX_CHARS, 0)+"</span></div>";
 //			GWT.log(text);
@@ -88,6 +94,7 @@ public class UploaderProgressView {
 			}catch (Exception e) {}
 			break;
 		case FAILED:
+			setVisibleBar(true);
 			text = "<div><img src='"+WorkspaceUploaderResources.getImageFailed().getUrl()+"'>";
 			text+="<span style='margin-left:5px; vertical-align: top;'>"+StringUtil.ellipsize(uploader.getStatusDescription(), MAX_CHARS, 0)+"</span></div>";
 //			GWT.log(text);
@@ -96,7 +103,9 @@ public class UploaderProgressView {
 			bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage());
 			break;
 		case IN_PROGRESS:
-			text = "<div><img src='"+WorkspaceUploaderResources.getImageUpload().getUrl()+"'>";
+			setVisibleBar(true);
+//			text = "<div><img src='"+WorkspaceUploaderResources.getImageUpload().getUrl()+"'>";
+			text = "<div>";
 			String msg = StringUtil.ellipsize(uploader.getFile().getFileName(), MAX_CHARS, 0);
 			text+="<span style='margin-left:5px; vertical-align: top;'>"+msg+"</span>";
 			text+="</div>";
@@ -112,8 +121,8 @@ public class UploaderProgressView {
 			bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage());
 			break; 
 		case WAIT:
+			setVisibleBar(false);
 			text = "<div><img src='"+WorkspaceUploaderResources.getImageLoading().getUrl()+"'>";
-			
 			String descr = "";
 			if(uploader.getFile()!=null && uploader.getFile().getFileName()!=null)
 				descr = uploader.getFile().getFileName();
@@ -124,7 +133,7 @@ public class UploaderProgressView {
 			text+="</div>";
 //			GWT.log(text);
 			html.setHTML(text);
-			
+
 			if(uploader.getUploadProgress().getLastEvent()!=null)
 				bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage());
 			else