From 107a56c48180ff00b1beb6505365c64ee4b57e66 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 13 Oct 2015 14:11:51 +0000
Subject: [PATCH] Updated css and progress bar

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119682 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/resource/FileUpload.css            |  2 +-
 .../client/uploader/UploaderProgressView.java | 30 ++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/FileUpload.css b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/FileUpload.css
index 59a2078..6216ee8 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/FileUpload.css
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/FileUpload.css
@@ -19,7 +19,7 @@
 	font: 13px/20px 'Lucida Grande', Tahoma, Verdana, sans-serif;
 	color: #404040;
 	margin: 0px auto;
-	width: 330px;
+	width: 310px;
 }
 
 .bar-container > div {
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 cf8cdd6..d75fb99 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
@@ -32,7 +32,7 @@ public class UploaderProgressView {
 	private VerticalPanel vp = new VerticalPanel();
 	private static final int MAX_CHARS = 55;
 	private HorizontalPanel hp = new HorizontalPanel();
-//	private HorizontalPanel hpBar = new HorizontalPanel();
+	private HorizontalPanel hpBar = new HorizontalPanel();
 	private HTML html = new HTML();
 	private ProgressBar bar = new ProgressBar();
 	private HandlerManager eventBus;
@@ -65,14 +65,22 @@ public class UploaderProgressView {
 		
 		bar.update(0);
 		setVisibleBar(false);
-		
+		setVisibleCancel(false);
 		vp.add(hp);
 		
-//		hpBar.add(bar);
-//		vp.add(hpBar);
-		vp.add(bar);
+		hpBar.add(cancelImg);
+		hpBar.add(bar);
+		vp.add(hpBar);
+//		vp.add(bar);
 	}
 	
+	/**
+	 * @param b
+	 */
+	private void setVisibleCancel(boolean b) {
+		cancelImg.setVisible(b);
+	}
+
 	public void setVisibleBar(boolean bool){
 		bar.setVisible(bool);
 	}
@@ -94,11 +102,11 @@ public class UploaderProgressView {
 			html.setTitle(uploader.getStatusDescription());
 			bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage());
 			try{	
-				hp.remove(cancelImg);
+//				hpBar.remove(cancelImg);
 			}catch (Exception e) {}
 			try{
 //				hpBar.remove(bar);
-				vp.remove(bar);
+				hpBar.clear();
 			}catch (Exception e) {}
 			break;
 		case FAILED:
@@ -123,7 +131,13 @@ public class UploaderProgressView {
 			
 			if(uploader.getUploadProgress().getLastEvent().getReadPercentage()!=100 && !cancel){
 				cancel = true;
-				hp.add(handleCancelUpload(uploader));
+				handleCancelUpload(uploader);
+				setVisibleCancel(true);
+			}else if(uploader.getUploadProgress().getLastEvent().getReadPercentage()==100 && cancel){
+				try{	
+					setVisibleCancel(false);
+//					hp.remove(cancelImg);
+				}catch (Exception e) {}
 			}
 			
 			bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage());