From 44b1f04c63047dc9ef232dd4c24bf76fafe6b0b3 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 13 Oct 2015 13:32:01 +0000 Subject: [PATCH] 429: Workspace: uploading big files Task-Url: https://support.d4science.org/issues/429 Updated css Added new delete Updated progress bar git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119679 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/resource/FileUpload.css | 2 +- .../resource/WorkspaceUploaderIcons.java | 2 +- .../client/resource/delete.gif | Bin 0 -> 120 bytes .../client/uploader/DialogUpload.java | 2 +- .../client/uploader/UploaderProgressView.java | 21 ++++++++++++------ 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/delete.gif 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 f87c83a..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: 382px; + width: 310px; } .bar-container > div { diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/WorkspaceUploaderIcons.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/WorkspaceUploaderIcons.java index 2e72d4b..2d3d4cb 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/WorkspaceUploaderIcons.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/WorkspaceUploaderIcons.java @@ -43,7 +43,7 @@ public interface WorkspaceUploaderIcons extends ClientBundle { * * @return the image resource */ - @Source("cancel.png") + @Source("delete.gif") ImageResource cancel(); /** diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/delete.gif b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/resource/delete.gif new file mode 100644 index 0000000000000000000000000000000000000000..4ae76db394f98f8e1959c0ae86a933d9de0b55bc GIT binary patch literal 120 zcmZ?wbhEHb6krfwSj50!W@h8!?p|D4zIE%dg9pzsz<}aU7DfgJ76u)V07xwZv#rOj zJKBd&3Odcn=17nhJCF P>^`NS%Qw4+g~1vCd|x9a literal 0 HcmV?d00001 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 74ee2a4..73e7d4a 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("

To select multiple files, press and hold down the Ctrl key, and then click each item

that you want to select

"); + HTML msg = new HTML("

To select multiple files, press and hold down the Ctrl key, and then click each item

that you want to select

"); 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 7ecf177..8c2da94 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 @@ -15,6 +15,7 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.VerticalPanel; @@ -31,6 +32,7 @@ public class UploaderProgressView { private VerticalPanel vp = new VerticalPanel(); private static final int MAX_CHARS = 50; private HorizontalPanel hp = new HorizontalPanel(); + private HorizontalPanel hpBar = new HorizontalPanel(); private HTML html = new HTML(); private ProgressBar bar = new ProgressBar(); private HandlerManager eventBus; @@ -49,6 +51,7 @@ public class UploaderProgressView { cancelImg = WorkspaceUploaderResources.getImageCancel(); cancelImg.setTitle("Cancel upload"); cancelImg.addStyleName("cancel-upload"); + hpBar.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); String text = "
"; String msg = StringUtil.ellipsize("Uploading "+fileName, MAX_CHARS, 0); @@ -63,7 +66,10 @@ public class UploaderProgressView { setVisibleBar(false); vp.add(hp); - vp.add(bar); + + hpBar.add(bar); + vp.add(hpBar); +// vp.add(bar); } public void setVisibleBar(boolean bool){ @@ -86,11 +92,12 @@ public class UploaderProgressView { html.setHTML(text); html.setTitle(uploader.getStatusDescription()); bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage()); +// try{ +// hpBar.remove(cancelImg); +// }catch (Exception e) {} try{ - hp.remove(cancelImg); - }catch (Exception e) {} - try{ - vp.remove(bar); +// hpBar.remove(bar); + hpBar.clear(); }catch (Exception e) {} break; case FAILED: @@ -105,7 +112,7 @@ public class UploaderProgressView { case IN_PROGRESS: setVisibleBar(true); // text = "
"; - text = "
"; + text = "
"; String msg = StringUtil.ellipsize(uploader.getFile().getFileName(), MAX_CHARS, 0); text+=""+msg+""; text+="
"; @@ -115,7 +122,7 @@ public class UploaderProgressView { if(uploader.getUploadProgress().getLastEvent().getReadPercentage()!=100 && !cancel){ cancel = true; - hp.add(handleCancelUpload(uploader)); + hpBar.add(handleCancelUpload(uploader)); } bar.update(uploader.getUploadProgress().getLastEvent().getReadPercentage());