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

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
This commit is contained in:
Costantino Perciante 2016-04-04 08:17:42 +00:00
parent e6dff90c23
commit 210aea809f
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.wst.common.component
View File

@ -4,9 +4,6 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <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/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <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="java-output-path" value="/user-statistics/target/user-statistics-portlet-0.0.1-SNAPSHOT/WEB-INF/classes"/>
<property name="context-root" value="user-statistics"/> <property name="context-root" value="user-statistics"/>
</wb-module> </wb-module>

5
pom.xml
View File

@ -145,6 +145,11 @@
<version>${liferay.version}</version> <version>${liferay.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>
<artifactId>usermanagement-core</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

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

@ -173,7 +173,7 @@ public class StatisticsPanel extends Composite {
final HTML name = new HTML(nameToShow); final HTML name = new HTML(nameToShow);
name.setTitle(DISPLAY_NAME + " in " + information.getActualVre()); name.setTitle(DISPLAY_NAME + " in " + information.getActualVre());
name.setStyleName("user-stats-title"); name.setStyleName("user-stats-title");
//mainPanel.add(name); mainPanel.add(name);
} }

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

@ -21,13 +21,11 @@ import org.gcube.portlet.user.userstatisticsportlet.shared.UserInformation;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.gwt.user.server.rpc.RemoteServiceServlet; 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.Contact;
import com.liferay.portal.model.User; import com.liferay.portal.model.User;
import com.liferay.portal.model.Website; import com.liferay.portal.model.Website;
import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil;
import com.liferay.portal.service.WebsiteLocalServiceUtil; import com.liferay.portal.service.WebsiteLocalServiceUtil;
import com.liferay.portal.theme.ThemeDisplay;
/** /**
* The server side implementation of the RPC service. * 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 // url account to change the avatar
String accountURL = null; 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); _log.debug("Account url for " + userName + " is " + accountURL);
return new UserInformation(isInfrastructure, thumbnailURL, userName, actualVre, accountURL); return new UserInformation(isInfrastructure, thumbnailURL, userName, actualVre, accountURL);

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

@ -1,12 +1,12 @@
.user-image { .user-image {
height: 70px; height: 70px !important;
width: auto; width: auto;
border-radius: 6px; border-radius: 6px;
padding: 2px; padding: 2px;
color: #FFF; color: #FFF;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin-left: 10px;
} }
.user-image-margin-right-vre { .user-image-margin-right-vre {
@ -17,7 +17,6 @@
margin-right: 10px; margin-right: 10px;
} }
.user-image-editable:hover { .user-image-editable:hover {
cursor: pointer; cursor: pointer;
} }
@ -44,7 +43,7 @@
color: #0084B4 !important; color: #0084B4 !important;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
vertical-align: bottom; vertical-align: middle;
display: inline-block; display: inline-block;
} }
@ -66,10 +65,10 @@
} }
.button-improve-profile { .button-improve-profile {
margin: 0 0 0 20px; margin: 0 0 0 20px !important;
font-family: Tahoma, Helvetica, Arial, sans-serif; font-family: Tahoma, Helvetica, Arial, sans-serif !important;
line-height: 12px; line-height: 12px !important;
font-size: 12px; font-size: 12px !important;
padding: 5px 15px; padding: 5px 15px !important;
font-weight: normal; font-weight: normal !important;
} }