From c0514941fcda6ae86325da7f043a73ed4b6ff668 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 10 Oct 2014 12:41:38 +0000 Subject: [PATCH] set to always show the source vre of the post git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@100603 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/newsfeed/client/ui/TweetTemplate.java | 5 ++++- src/main/webapp/conf/settings.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java index 1cf6ecf..8c4baff 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java @@ -166,12 +166,15 @@ public class TweetTemplate extends Composite { Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+ Encoder.encode(feed.getEntityId())+"\">"+feed.getFullName()+" " + feedText); + this.vreSource.setVisible(true); //show the vreid iff the info is present if (showTimelineSource && feed.getVreid() != null && feed.getVreid().compareTo("") != 0) { - this.vreSource.setVisible(true); String vreName = feed.getVreid().substring(feed.getVreid().lastIndexOf("/")+1); vreSource.setHTML("[" +vreName + "]"); + } else { + vreSource.setHTML("[multiple]"); } + //check if the user has his own avatar if (feed.getThumbnailURL().endsWith("img_id=0") || !feed.getThumbnailURL().contains("?")) { //it means no avatar is set avatarImage.setVisible(false); diff --git a/src/main/webapp/conf/settings.properties b/src/main/webapp/conf/settings.properties index 3e9cb8b..d5e7c81 100644 --- a/src/main/webapp/conf/settings.properties +++ b/src/main/webapp/conf/settings.properties @@ -1,4 +1,4 @@ # Defines the News Feed refreshing time in minutes REFRESH_TIME = 3 VRE_LABEL = Virtual Research Environment -SHOW_TIMELINE_SOURCE=false \ No newline at end of file +SHOW_TIMELINE_SOURCE=true \ No newline at end of file