gCubeSystem
/
user-statistics
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Costantino Perciante 2016-04-11 09:29:33 +00:00
parent fa22e6f116
commit 5b1f933e26
5 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java
View File

@ -190,12 +190,6 @@ public class StatisticsPanel extends Composite {
// set the style for the user image // set the style for the user image
userImage.setStyleName("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 // add image to mainPanel
mainPanel.add(userImage); mainPanel.add(userImage);

7
src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.java
View File

@ -1,7 +1,6 @@
package org.gcube.portlet.user.userstatisticsportlet.client.ui; package org.gcube.portlet.user.userstatisticsportlet.client.ui;
import com.google.gwt.core.client.GWT; 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.UiBinder;
import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Composite;
@ -34,12 +33,6 @@ public class StatisticWidget extends Composite{
public StatisticWidget(boolean isRoot) { public StatisticWidget(boolean isRoot) {
initWidget(uiBinder.createAndBindUi(this)); 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) { public void setHeader(String header) {

1
src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/StatisticWidget.ui.xml
View File

@ -7,6 +7,7 @@
vertical-align: top; vertical-align: top;
height: 60px; height: 60px;
width: auto; width: auto;
margin-right: 5%;
} }
.statistic-header { .statistic-header {

4
src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java
View File

@ -118,7 +118,7 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U
*/ */
public String getDevelopmentUser() { public String getDevelopmentUser() {
String user = userid; String user = userid;
// user = "massimiliano.assante"; // user = "massimiliano.assante";
return user; return user;
} }
@ -249,7 +249,7 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U
return new UserInformation(isInfrastructure, thumbnailURL, userName, actualVre); 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") @SuppressWarnings("deprecation")

13
src/main/webapp/Statistics.css
View File

@ -7,18 +7,7 @@
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin-left: 10px; margin-left: 10px;
} margin-right: 5%;
.user-image-margin-right-vre {
margin-right: 5px;
}
.user-image-margin-right-root {
margin-right: 10px;
}
.user-image-editable:hover {
cursor: pointer;
} }
.error-msg { .error-msg {