" +
+ add(new HTML("
" +
"Sorry, looks like something is broken with the server connection
" +
"Please check your connection and try refresh this page.
"));
}
});
- initWidget(mainPanel);
-
- }
-
-
- private void showLoader() {
- mainPanel.clear();
- mainPanel.setWidth("100%");
- mainPanel.setHeight("300px");
- mainPanel.setHorizontalAlignment(HasAlignment.ALIGN_CENTER);
- mainPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
- mainPanel.add(loadingImage);
}
}
diff --git a/src/main/java/org/gcube/portlets/user/vremembers/client/ui/DisplayBadge.java b/src/main/java/org/gcube/portlets/user/vremembers/client/ui/DisplayBadge.java
index b0cdd90..c86adfc 100644
--- a/src/main/java/org/gcube/portlets/user/vremembers/client/ui/DisplayBadge.java
+++ b/src/main/java/org/gcube/portlets/user/vremembers/client/ui/DisplayBadge.java
@@ -4,12 +4,9 @@ import org.gcube.portlets.user.vremembers.shared.BelongingUser;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.AnchorElement;
-import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.Window.Location;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLPanel;
diff --git a/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java b/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java
index 1955399..5a6a8ac 100644
--- a/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/vremembers/server/MembersServiceImpl.java
@@ -9,16 +9,15 @@ 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.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portal.databook.client.GCubeSocialNetworking;
import org.gcube.portlets.user.vremembers.client.MembersService;
import org.gcube.portlets.user.vremembers.shared.BelongingUser;
import org.gcube.vomanagement.usermanagement.GroupManager;
import org.gcube.vomanagement.usermanagement.UserManager;
-import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayGroupManager;
-import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager;
-import org.gcube.vomanagement.usermanagement.model.UserModel;
+import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
+import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager;
+import org.gcube.vomanagement.usermanagement.model.GCubeUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,10 +85,10 @@ public class MembersServiceImpl extends RemoteServiceServlet implements MembersS
UserManager um = new LiferayUserManager();
GroupManager gm = new LiferayGroupManager();
ScopeBean sb = new ScopeBean(scope);
- List
users = null;
+ List users = null;
if (sb.is(Type.INFRASTRUCTURE)) {
- users = new ArrayList();
+ users = new ArrayList();
return new ArrayList();
}
else if (sb.is(Type.VRE)) { //must be in VRE
@@ -102,12 +101,15 @@ public class MembersServiceImpl extends RemoteServiceServlet implements MembersS
_log.error("Error, you must be in SCOPE VRE OR INFRASTURCTURE, you are in VO SCOPE returning no users");
return portalUsers;
}
- for (UserModel user : users) {
- if (user.getScreenName().compareTo("test.user") != 0) { //skip test.user
- String thumbnailURL = "";
- com.liferay.portal.model.User lifeUser = UserLocalServiceUtil.getUserByScreenName(OrganizationsUtil.getCompany().getCompanyId(), user.getScreenName());
- thumbnailURL = lifeUser.isMale() ? "/image/user_male_portrait?img_id="+lifeUser.getPortraitId() : "/image/user_female_portrait?img_id="+lifeUser.getPortraitId();
- portalUsers.add(new BelongingUser(user.getScreenName(), user.getFullname(), thumbnailURL, lifeUser.getJobTitle(), lifeUser.getOpenId(), getUserProfileLink(user.getScreenName() ),lifeUser.getPortraitId() != 0));
+ for (GCubeUser user : users) {
+ if (user.getUsername().compareTo("test.user") != 0) { //skip test.user
+ portalUsers.add(
+ new BelongingUser(
+ user.getUsername(),
+ user.getFullname(),
+ user.getUserAvatarURL(),
+ user.getJobTitle(),
+ user.getLocation_industry(), getUserProfileLink(user.getUsername() ), true));
}
}
diff --git a/src/main/resources/org/gcube/portlets/user/vremembers/VreMembers.gwt.xml b/src/main/resources/org/gcube/portlets/user/vremembers/VreMembers.gwt.xml
index 21b714d..42fbdca 100644
--- a/src/main/resources/org/gcube/portlets/user/vremembers/VreMembers.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/vremembers/VreMembers.gwt.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/src/main/webapp/VreMembers.css b/src/main/webapp/VreMembers.css
index ae3f270..996c5ae 100644
--- a/src/main/webapp/VreMembers.css
+++ b/src/main/webapp/VreMembers.css
@@ -1,13 +1,14 @@
.framed {
+ display: inline-block;
font-family: 'Helvetica Neue', Arial, sans-serif;
width: 200px;
height: 290px;
padding: 10px;
margin: 10px;
background: #FFF;
- border-radius: 6px !important;
- -moz-border-radius: 6px !important;
- -webkit-border-radius: 6px !important;
+ border-radius: 6px;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
border: 1px solid #DBDBDB;
}
@@ -16,13 +17,13 @@
padding: 10px;
margin: 10px;
background: #FFF;
- border-radius: 6px !important;
- -moz-border-radius: 6px !important;
- -webkit-border-radius: 6px !important;
+ border-radius: 6px;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
border: 1px solid #DBDBDB;
}
-.user-photo {
+img.user-photo {
padding: 5px;
border: 1px solid #E6E6E6;
width: 180px;
@@ -31,6 +32,7 @@
.user-details {
padding: 5px;
+ float: left;
}
.photo-details {
@@ -38,29 +40,27 @@
text-align: center;
}
-
a.person-link {
color: #444444;
- font-size: 15px;
- font-weight: bold;
+ font-size: 15px !important;
+ font-weight: bold !important;
line-height: 18px;
}
-a.person-link,a.person-link:visited {
+a.person-link, a.person-link:visited {
cursor: pointer;
cursor: hand;
- font-size: 16x;
+ font-size: 16px !important;
text-decoration: none;
- color: #3B5998;
+ color: #3B5998 !important;
}
a.person-link:hover {
opacity: 0.8;
- font-size: 16x;
+ font-size: 16x !important;
text-decoration: underline;
}
-
.headline {
font-size: 13px;
color: #444444;
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index 01ea2ae..e6fa833 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-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 6263ab8..a51a6fe 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -4,6 +4,6 @@ module-incremental-version=1
tags=
short-description=
change-log=
-page-url=http://www.d4science.org
-author=D4Science.org
+page-url=http://www.gcube-system.org
+author=Massimiliano Assante
licenses=EUPL
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index ac028cd..f4a17ce 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 7a098ab..43186f9 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
-
-
-
+