From 5b1f933e269aba6a96eb161b0233b2abcfd9292b Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Mon, 11 Apr 2016 09:29:33 +0000 Subject: [PATCH] Margin changed from px to % to better handler responsiveness git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/user-statistics@126962 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/StatisticsPanel.java | 6 ------ .../client/ui/StatisticWidget.java | 7 ------- .../client/ui/StatisticWidget.ui.xml | 1 + .../server/UserStatisticsServiceImpl.java | 4 ++-- src/main/webapp/Statistics.css | 13 +------------ 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java index 4f2bbfb..d84d496 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java @@ -190,12 +190,6 @@ public class StatisticsPanel extends Composite { // set the style for the user image userImage.setStyleName("user-image"); - // set the right margin according isRoot variable value - if(isRoot) - userImage.addStyleName("user-image-margin-right-root"); - else - userImage.addStyleName("user-image-margin-right-vre"); - // add image to mainPanel mainPanel.add(userImage); diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.java index 75963ed..b388d19 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.java @@ -1,7 +1,6 @@ package org.gcube.portlet.user.userstatisticsportlet.client.ui; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; @@ -34,12 +33,6 @@ public class StatisticWidget extends Composite{ public StatisticWidget(boolean isRoot) { initWidget(uiBinder.createAndBindUi(this)); - - //Set the right margin of this widget according to where the portlet is currently deployed. - if(isRoot) - container.getElement().getStyle().setMarginRight(10.0, Unit.PX); - else - container.getElement().getStyle().setMarginRight(5.0, Unit.PX); } public void setHeader(String header) { diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.ui.xml b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.ui.xml index bd8d92b..bf3b08a 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.ui.xml +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.ui.xml @@ -7,6 +7,7 @@ vertical-align: top; height: 60px; width: auto; + margin-right: 5%; } .statistic-header { diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java index 2ab35ad..b942305 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java @@ -118,7 +118,7 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U */ public String getDevelopmentUser() { String user = userid; - // user = "massimiliano.assante"; + // user = "massimiliano.assante"; return user; } @@ -249,7 +249,7 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U return new UserInformation(isInfrastructure, thumbnailURL, userName, actualVre); } - else return new UserInformation(false, null, userName, vreID); + else return new UserInformation(true, null, userName, vreID); } @SuppressWarnings("deprecation") diff --git a/src/main/webapp/Statistics.css b/src/main/webapp/Statistics.css index 5f06c03..2712a87 100644 --- a/src/main/webapp/Statistics.css +++ b/src/main/webapp/Statistics.css @@ -7,18 +7,7 @@ display: inline-block; vertical-align: top; margin-left: 10px; -} - -.user-image-margin-right-vre { - margin-right: 5px; -} - -.user-image-margin-right-root { - margin-right: 10px; -} - -.user-image-editable:hover { - cursor: pointer; + margin-right: 5%; } .error-msg {