diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 0aa2ab1..c897cc3 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + diff --git a/pom.xml b/pom.xml index 8bbc025..b62d9e5 100644 --- a/pom.xml +++ b/pom.xml @@ -56,17 +56,14 @@ org.gcube.portlets.user gcube-widgets - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.portal custom-portal-handler - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.common.portal portal-manager - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.applicationsupportlayer @@ -75,12 +72,10 @@ org.gcube.dvos usermanagement-core - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) com.liferay.portal portal-service - ${liferay.version} provided diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java b/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java index 441e9c0..81fc8b2 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java @@ -8,37 +8,37 @@ import org.gcube.portlet.user.my_vres.client.widgets.ClickableVRE; import org.gcube.portlet.user.my_vres.shared.VRE; 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.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.HasHorizontalAlignment; +import com.google.gwt.user.client.ui.HasAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; /** * * @author Massimiliano Assante - ISTI CNR - * @version 1.1 Dec 2012 * */ public class VresPanel extends Composite { - /** - * Create a remote service proxy to talk to the server-side service - */ + public static final String loading = GWT.getModuleBaseURL() + "../images/loading.gif"; private final MyVREsServiceAsync myVREsService = GWT.create(MyVREsService.class); private FlowPanel flowPanel; private VerticalPanel mainPanel = new VerticalPanel(); private SimplePanel catPanel = new SimplePanel(); private HorizontalPanel imagesPanel = new HorizontalPanel(); - + private Image loadingImage = new Image(loading); private LinkedHashMap> cachedVREs = null; boolean hasVres = false; public VresPanel() { super(); - + loadingImage.getElement().getStyle().setMarginTop(59, Unit.PX); + mainPanel.setHorizontalAlignment(HasAlignment.ALIGN_CENTER); mainPanel.setWidth("100%"); mainPanel.setStyleName("mainPanel"); this.flowPanel = new FlowPanel(); @@ -50,7 +50,7 @@ public class VresPanel extends Composite { } private void loadVREs() { - + mainPanel.add(loadingImage); myVREsService.getUserVREs(new AsyncCallback>>() { @Override @@ -71,6 +71,7 @@ public class VresPanel extends Composite { private void showIconView() { mainPanel.clear(); + mainPanel.setHorizontalAlignment(HasAlignment.ALIGN_LEFT); for (String cat : cachedVREs.keySet()) { if (! cachedVREs.get(cat).isEmpty()) { SimplePanel catPanel = new SimplePanel(); diff --git a/src/main/webapp/MyVREs.css b/src/main/webapp/MyVREs.css index 4ba12d4..610aa57 100644 --- a/src/main/webapp/MyVREs.css +++ b/src/main/webapp/MyVREs.css @@ -1,5 +1,3 @@ -@import url(http://fonts.googleapis.com/css?family=Architects+Daughter); - div.vreButton { float: left; }