diff --git a/.classpath b/.classpath
index 26fcb3f..b9f84ee 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -30,5 +30,5 @@
-
+
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 4df68f0..cade24b 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,9 +4,6 @@
-
- uses
-
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index b3a52d7..2b231e3 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index d4638e3..657b5a5 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ Moved to Liferay 6.2
+
Minor Restyle
diff --git a/pom.xml b/pom.xml
index 8dbc4f9..d151190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.user
top-topics
war
- 1.1.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
Top Topics Portlet
Top Topics Portle shows the top 10 topics in the scope where is deployed.
@@ -27,6 +27,7 @@
2.5.1
distro
+ 6.2.5
1.7
1.7
@@ -59,7 +60,8 @@
org.gcube.portlets.user
- gcube-widgets
+ gcube-widgets
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
compile
@@ -77,6 +79,7 @@
org.gcube.dvos
usermanagement-core
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
com.google
@@ -95,6 +98,7 @@
com.liferay.portal
portal-service
+ ${liferayVersion}
provided
diff --git a/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java b/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java
index db687c6..78687ec 100644
--- a/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java
+++ b/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java
@@ -50,12 +50,6 @@ public class TopicsPanel extends Composite {
showServError();
}
else {
- if (!result.isInfrastructure() && hashtags != null && !hashtags.isEmpty()) {
- mainPanel.setStyleName("trending-frame");
- HTML name = new HTML(DISPLAY_NAME);
- name.setStyleName("topic-title");
- mainPanel.add(name);
- }
if (hashtags != null) {
for (String hashtag : hashtags) {
HTML toAdd = new HTML(hashtag);
diff --git a/src/main/java/org/gcube/portlets/user/topics/server/TopicServiceImpl.java b/src/main/java/org/gcube/portlets/user/topics/server/TopicServiceImpl.java
index e8532fd..289c8dc 100644
--- a/src/main/java/org/gcube/portlets/user/topics/server/TopicServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/topics/server/TopicServiceImpl.java
@@ -9,7 +9,7 @@ import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.application.framework.core.session.SessionManager;
import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.common.scope.impl.ScopeBean.Type;
-import org.gcube.portal.custom.communitymanager.OrganizationsUtil;
+import org.gcube.portal.custom.communitymanager.SiteManagerUtil;
import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portal.databook.client.GCubeSocialNetworking;
import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl;
@@ -18,7 +18,7 @@ import org.gcube.portlets.user.topics.client.TopicService;
import org.gcube.portlets.user.topics.shared.HashTagAndOccurrence;
import org.gcube.portlets.user.topics.shared.HashtagsWrapper;
import org.gcube.vomanagement.usermanagement.GroupManager;
-import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayGroupManager;
+import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,11 +96,11 @@ public class TopicServiceImpl extends RemoteServiceServlet implements TopicServi
if (isInfrastructure) {
_log.debug("****** retrieving hashtags for user VREs");
- User currUser = OrganizationsUtil.validateUser(userName);
+ User currUser = SiteManagerUtil.validateUser(userName);
GroupManager gm = new LiferayGroupManager();
for (Organization org : currUser.getOrganizations()) {
- if (gm.isVRE(org.getOrganizationId()+"")) {
- String vreid = gm.getScope(""+org.getOrganizationId()); //get the scope
+ if (gm.isVRE(org.getOrganizationId())) {
+ String vreid = gm.getInfrastructureScope(org.getOrganizationId()); //get the scope
Map map = store.getVREHashtagsWithOccurrence(vreid);
for (String hashtag : map.keySet()) {
toSort.add(new HashTagAndOccurrence(hashtag, map.get(hashtag)));
diff --git a/src/main/webapp/TopTopics.css b/src/main/webapp/TopTopics.css
index a857745..6027732 100644
--- a/src/main/webapp/TopTopics.css
+++ b/src/main/webapp/TopTopics.css
@@ -1,28 +1,12 @@
-.topic-title {
- display: block;
- font-size: 16px;
- color: #555;
- font-weight: 400;
- margin-bottom: 10px;
-}
-
-.trending-frame {
- padding: 10px;
- background-color: #FFF;
- border-radius: 6px !important;
- -moz-border-radius: 6px !important;
- -webkit-border-radius: 6px !important;
- border: 1px solid #DBDBDB;
-}
-
-a.topiclink,a.topiclink:active,a.topiclink:visited {
+a.topiclink, a.topiclink:active, a.topiclink:visited {
font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial,
sans-serif;
font-size: 15px;
cursor: pointer;
cursor: hand;
text-decoration: none;
- color: #3B5998;
+ color: #0078b2 !important;
+ font-weight: bold !important;
}
a.topiclink:hover {
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index 869751a..775b80a 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index e67138d..59b162d 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -1,6 +1,5 @@
-
-
+
Topics
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b5d459d..d7bbd7e 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,9 @@
-
-
+