links redirects correctly to user profiles
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@79414 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
224c71c22b
commit
df31e460c1
|
@ -1,6 +1,7 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
<Changeset component="org.gcube.portlets.user.NewsFeed.1-1-0" date="2013-07-08">
|
<Changeset component="org.gcube.portlets.user.NewsFeed.1-1-0" date="2013-07-08">
|
||||||
<Change>Open single feed separately enhancement implemeented #1818</Change>
|
<Change>Open single feed separately enhancement implemeented #1818</Change>
|
||||||
|
<Change>links redirects correctly to user profiles</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets.user.NewsFeed.1-0-0"
|
<Changeset component="org.gcube.portlets.user.NewsFeed.1-0-0"
|
||||||
date="2013-04-19">
|
date="2013-04-19">
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.portlets.user.newsfeed.client.templates;
|
package org.gcube.portlets.user.newsfeed.client.templates;
|
||||||
|
|
||||||
import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
||||||
|
import org.gcube.portal.databook.client.util.Encoder;
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
import org.gcube.portal.databook.shared.Comment;
|
||||||
import org.gcube.portlets.user.newsfeed.client.event.DeleteCommentEvent;
|
import org.gcube.portlets.user.newsfeed.client.event.DeleteCommentEvent;
|
||||||
import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
|
import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
|
||||||
|
@ -56,7 +57,10 @@ public class SingleComment extends Composite {
|
||||||
seeMore.setHTML("<a class=\"seemore\"> See More </a>");
|
seeMore.setHTML("<a class=\"seemore\"> See More </a>");
|
||||||
}
|
}
|
||||||
|
|
||||||
commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+toShow.getFullName()+"</a> " + commentToShow);
|
commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
|
||||||
|
Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
|
||||||
|
Encoder.encode(toShow.getUserid())+"\">"+toShow.getFullName()+
|
||||||
|
"</a> " + commentToShow);
|
||||||
timeArea.setHTML(DateTimeFormat.getFormat("MMMM dd, h:mm a").format(toShow.getTime()));
|
timeArea.setHTML(DateTimeFormat.getFormat("MMMM dd, h:mm a").format(toShow.getTime()));
|
||||||
if (isUsers) {
|
if (isUsers) {
|
||||||
closeImage.setStyleName("closeImage");
|
closeImage.setStyleName("closeImage");
|
||||||
|
@ -68,7 +72,10 @@ public class SingleComment extends Composite {
|
||||||
|
|
||||||
@UiHandler("seeMore")
|
@UiHandler("seeMore")
|
||||||
void onSeeMoreClick(ClickEvent e) {
|
void onSeeMoreClick(ClickEvent e) {
|
||||||
commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+myComment.getFullName()+"</a> " + myComment.getText());
|
commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
|
||||||
|
Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
|
||||||
|
Encoder.encode(myComment.getUserid())+"\">"+
|
||||||
|
myComment.getFullName()+"</a> " + myComment.getText());
|
||||||
seeMore.setHTML("");
|
seeMore.setHTML("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
||||||
|
import org.gcube.portal.databook.client.util.Encoder;
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
import org.gcube.portal.databook.shared.Comment;
|
||||||
import org.gcube.portal.databook.shared.Feed;
|
import org.gcube.portal.databook.shared.Feed;
|
||||||
import org.gcube.portal.databook.shared.UserInfo;
|
import org.gcube.portal.databook.shared.UserInfo;
|
||||||
|
@ -150,7 +151,10 @@ public class TweetTemplate extends Composite {
|
||||||
|
|
||||||
if (! isAppFeed) {
|
if (! isAppFeed) {
|
||||||
messageArea.setHTML("<a>" + NewsFeedPanel.MESSAGE_LABEL + "</a>");
|
messageArea.setHTML("<a>" + NewsFeedPanel.MESSAGE_LABEL + "</a>");
|
||||||
contentArea.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+feed.getFullName()+"</a> " + feedText);
|
contentArea.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK
|
||||||
|
+"?"+
|
||||||
|
Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
|
||||||
|
Encoder.encode(feed.getEntityId())+"\">"+feed.getFullName()+"</a> " + feedText);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// messageSeparator.setVisible(false);
|
// messageSeparator.setVisible(false);
|
||||||
|
@ -245,7 +249,11 @@ public class TweetTemplate extends Composite {
|
||||||
|
|
||||||
@UiHandler("seeMore")
|
@UiHandler("seeMore")
|
||||||
void onSeeMoreClick(ClickEvent e) {
|
void onSeeMoreClick(ClickEvent e) {
|
||||||
contentArea.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+myFeed.getFeed().getFullName()+"</a> " + myFeed.getFeed().getDescription());
|
contentArea.setHTML("<a class=\"link\"href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
|
||||||
|
Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
|
||||||
|
Encoder.encode(myFeed.getFeed().getEntityId())+"\">"+
|
||||||
|
myFeed.getFeed().getFullName()+"</a> " + myFeed.getFeed().getDescription());
|
||||||
|
|
||||||
seeMore.setHTML("");
|
seeMore.setHTML("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue