From 7ded01868f1daf21f6b55049b49878356627a112 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 24 Jun 2015 16:43:36 +0000 Subject: [PATCH] 256: Workspace explorer Task-Url: https://support.d4science.org/issues/256 Enhancements git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@115521 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../wsexplorer/client/resources/Icons.java | 6 ++++++ .../client/resources/Resources.java | 20 ++++++++---------- .../wsexplorer/client/resources/loading.gif | Bin 0 -> 7146 bytes .../wsexplorer/client/view/Breadcrumbs.java | 6 ++---- .../wsexplorer/client/view/Navigation.java | 2 +- .../client/view/WorkspaceExplorer.java | 13 +++++++++--- 6 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/loading.gif diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Icons.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Icons.java index 652eadd..1298595 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Icons.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Icons.java @@ -7,5 +7,11 @@ public interface Icons extends ClientBundle { @Source("cancel.png") ImageResource cancel(); + + /** + * @return + */ + @Source("loading.gif") + ImageResource loading(); } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Resources.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Resources.java index 7cf05f5..c0561f3 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Resources.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/Resources.java @@ -1,7 +1,6 @@ package org.gcube.portlets.widgets.wsexplorer.client.resources; import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.AbstractImagePrototype; /** @@ -9,17 +8,16 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; * */ public class Resources { - - public static final Icons ICONS = GWT.create(Icons.class); - - public static AbstractImagePrototype getIconCancel(){ - - return AbstractImagePrototype.create(ICONS.cancel()); + public static final Icons ICONS = GWT.create(Icons.class); + + public static AbstractImagePrototype getIconCancel() { + + return AbstractImagePrototype.create(ICONS.cancel()); } - public static ImageResource getImageCancel() { - return ICONS.cancel(); + + public static AbstractImagePrototype getIconLoading() { + + return AbstractImagePrototype.create(ICONS.loading()); } - - } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/loading.gif b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/resources/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..ae484b26586f2fda12e6c467ee450da8675fcd0e GIT binary patch literal 7146 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 I;xglZ0oT@V>;M1& literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Breadcrumbs.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Breadcrumbs.java index 87042ad..e33fcbf 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Breadcrumbs.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Breadcrumbs.java @@ -24,11 +24,10 @@ import com.google.gwt.user.client.ui.Widget; */ public class Breadcrumbs extends Composite { - public static final String DIVIDER = ">"; + public static final String DIVIDER = "/"; private LinkedHashMap hashFileModel = new LinkedHashMap();// Ordered-HashMap private Item lastParent; private static BreadcrumbsUiBinder uiBinder = GWT.create(BreadcrumbsUiBinder.class); - private NavLink homeLink = new NavLink("Home"); @UiField com.github.gwtbootstrap.client.ui.Breadcrumbs breadcrumbs; @@ -80,8 +79,7 @@ public class Breadcrumbs extends Composite { private void initBreadcrumbs() { breadcrumbs.clear(); breadcrumbs.add(new NavLink(""));// INIT - breadcrumbs.add(homeLink);// INIT - breadcrumbs.add(new NavLink("2"));// INIT + breadcrumbs.add(new NavLink("")); } // @UiHandler("add") diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java index 9768de8..26de841 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/Navigation.java @@ -50,6 +50,6 @@ public class Navigation extends Composite{ vre_folder.setActive(true); vre_folder.setText(WorkspaceExplorerConstants.VRE_FOLDERS_LABEL); - vre_folder.setIcon(IconType.FOLDER_OPEN_ALT); + vre_folder.setIcon(IconType.FOLDER_CLOSE); } } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java index 47f05f7..229cbb3 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorer.java @@ -7,6 +7,7 @@ import java.util.Map; import org.gcube.portlets.widgets.wsexplorer.client.Util; import org.gcube.portlets.widgets.wsexplorer.client.grid.ItemsTable; +import org.gcube.portlets.widgets.wsexplorer.client.resources.Resources; import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerService; import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerServiceAsync; import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria; @@ -14,9 +15,11 @@ import org.gcube.portlets.widgets.wsexplorer.shared.Item; import org.gcube.portlets.widgets.wsexplorer.shared.ItemType; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.ScrollPanel; /** @@ -26,11 +29,15 @@ public class WorkspaceExplorer { private final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class); protected static final HorizontalPanel LOADING_PANEL = new HorizontalPanel(); + protected static final Image LOADING_IMAGE = Resources.getIconLoading().createImage(); static { - LOADING_PANEL.setSpacing(3); - // LOADING_PANEL.add(LOADING_IMAGE); - LOADING_PANEL.add(new HTML("Loading...")); + LOADING_PANEL.getElement().getStyle().setMargin(5.0, Unit.PX); +// LOADING_PANEL.setSpacing(3); + LOADING_PANEL.add(LOADING_IMAGE); + HTML loading = new HTML("Loading..."); + loading.getElement().getStyle().setPaddingLeft(5.0, Unit.PX); + LOADING_PANEL.add(loading); } protected List selectableTypes = new ArrayList(); protected List showableTypes = new ArrayList();