From 210aea809f98b774a584803c0b7a33d0e952e43a Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Mon, 4 Apr 2016 08:17:42 +0000
Subject: [PATCH] Fix for  liferya 6.2.5 plus some minor style changes

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/user-statistics@126687 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  3 ---
 pom.xml                                       |  5 +++++
 .../client/StatisticsPanel.java               |  2 +-
 .../server/UserStatisticsServiceImpl.java     |  4 ----
 src/main/webapp/Statistics.css                | 19 +++++++++----------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a19c352..65eedd1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,9 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="gcube-widgets-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="java-output-path" value="/user-statistics/target/user-statistics-portlet-0.0.1-SNAPSHOT/WEB-INF/classes"/>
         <property name="context-root" value="user-statistics"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index 488238e..3d007bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,11 @@
 			<version>${liferay.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.dvos</groupId>
+			<artifactId>usermanagement-core</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+		</dependency>
 	</dependencies>
 
 	<build>
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 0557a78..67b7c86 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
@@ -173,7 +173,7 @@ public class StatisticsPanel extends Composite {
 					final HTML name = new HTML(nameToShow);	
 					name.setTitle(DISPLAY_NAME + " in " + information.getActualVre());
 					name.setStyleName("user-stats-title");
-					//mainPanel.add(name);
+					mainPanel.add(name);
 
 				}
 
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 a3175b2..6be53ba 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
@@ -21,13 +21,11 @@ import org.gcube.portlet.user.userstatisticsportlet.shared.UserInformation;
 import org.slf4j.LoggerFactory;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.model.Contact;
 import com.liferay.portal.model.User;
 import com.liferay.portal.model.Website;
 import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portal.service.WebsiteLocalServiceUtil;
-import com.liferay.portal.theme.ThemeDisplay;
 
 /**
  * The server side implementation of the RPC service.
@@ -251,8 +249,6 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U
 
 			// url account to change the avatar
 			String accountURL = null;
-			ThemeDisplay themeDisplay = (ThemeDisplay) this.getThreadLocalRequest().getSession().getAttribute(WebKeys.THEME_DISPLAY);
-			accountURL = themeDisplay.getURLMyAccount().toString();
 			_log.debug("Account url for " + userName + " is "  + accountURL);
 
 			return new UserInformation(isInfrastructure, thumbnailURL, userName, actualVre, accountURL);
diff --git a/src/main/webapp/Statistics.css b/src/main/webapp/Statistics.css
index a33c110..5f06c03 100644
--- a/src/main/webapp/Statistics.css
+++ b/src/main/webapp/Statistics.css
@@ -1,12 +1,12 @@
-
 .user-image {
-	height: 70px;
+	height: 70px !important;
 	width: auto;
 	border-radius: 6px;
 	padding: 2px;
 	color: #FFF;
 	display: inline-block;
 	vertical-align: top;
+	margin-left: 10px;
 }
 
 .user-image-margin-right-vre {
@@ -17,7 +17,6 @@
 	margin-right: 10px;
 }
 
-
 .user-image-editable:hover {
 	cursor: pointer;
 }
@@ -44,7 +43,7 @@
 	color: #0084B4 !important;
 	font-size: 14px;
 	text-align: center;
-	vertical-align: bottom;
+	vertical-align: middle;
 	display: inline-block;
 }
 
@@ -66,10 +65,10 @@
 }
 
 .button-improve-profile {
-	margin: 0 0 0 20px;
-	font-family: Tahoma, Helvetica, Arial, sans-serif;
-	line-height: 12px;
-	font-size: 12px;
-	padding: 5px 15px;
-	font-weight: normal;
+	margin: 0 0 0 20px !important;
+	font-family: Tahoma, Helvetica, Arial, sans-serif !important;
+	line-height: 12px !important;
+	font-size: 12px !important;
+	padding: 5px 15px !important;
+	font-weight: normal !important;
 }
\ No newline at end of file