From 9f16c479903b5c197795426b4149e718e3ac1d58 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 26 Sep 2016 15:07:44 +0000 Subject: [PATCH] revised like and comments number icons git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@131810 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 16 ++++-- .project | 1 + .settings/org.eclipse.wst.common.component | 10 +++- pom.xml | 29 ++++++++++- .../newsfeed/client/panels/NewsFeedPanel.java | 41 ++++++---------- .../newsfeed/client/ui/TweetTemplate.java | 49 +++++++++++-------- .../newsfeed/client/ui/TweetTemplate.ui.xml | 12 +++-- .../user/newsfeed/server/NewsServiceImpl.java | 4 +- src/main/webapp/NewsFeed.css | 14 ------ 9 files changed, 103 insertions(+), 73 deletions(-) diff --git a/.classpath b/.classpath index b409829..ac1b581 100644 --- a/.classpath +++ b/.classpath @@ -1,19 +1,27 @@ - + - + + + + + - + + + + + @@ -31,5 +39,5 @@ - + diff --git a/.project b/.project index 9b84900..2a10994 100644 --- a/.project +++ b/.project @@ -55,5 +55,6 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature com.google.gwt.eclipse.core.gwtNature + com.liferay.ide.core.liferayNature diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index e21c042..9e38c8b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,7 +5,15 @@ - + + uses + + + uses + + + uses + diff --git a/pom.xml b/pom.xml index 515e55c..3203d51 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,32 @@ social-networking-library provided + + com.netflix.astyanax + astyanax + provided + + + org.apache.cassandra + cassandra-all + provided + + + org.apache.cassandra + cassandra-thrift + provided + + + org.apache.thrift + libthrift + + + commons-logging + commons-logging + + + provided + org.gcube.socialnetworking social-util-library @@ -146,7 +172,8 @@ guava compile - + com.ning compress-lzf diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java index 49c9c89..f6df59c 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java @@ -1291,34 +1291,25 @@ public class NewsFeedPanel extends Composite { } private void doShowLikes(final String feedId) { - GWT.runAsync(UserSelectionDialog.class, new RunAsyncCallback() { + final UserSelectionDialog dlg = new UserSelectionDialog("People who set this as Favorite", eventBus); + dlg.center(); + dlg.show(); + + newsService.getAllLikesByFeed(feedId, new AsyncCallback>() { @Override - public void onSuccess() { - final UserSelectionDialog dlg = new UserSelectionDialog("People who set this as Favorite", eventBus); - dlg.center(); - dlg.show(); - - newsService.getAllLikesByFeed(feedId, new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - Window.alert("People who liked this could not be retrieved: " + caught.getMessage()); - } - - @Override - public void onSuccess(ArrayList result) { - ArrayList toShow = new ArrayList(); - for (Like like : result) { - toShow.add(new ItemSelectableBean(like.getUserid(), like.getFullName(), like.getThumbnailURL())); - } - eventBus.fireEvent(new UsersFetchedEvent(toShow)); - } - }); + public void onFailure(Throwable caught) { + Window.alert("People who liked this could not be retrieved: " + caught.getMessage()); } - public void onFailure(Throwable reason) { - Window.alert("Could not load this component: " + reason.getMessage()); - } - }); + @Override + public void onSuccess(ArrayList result) { + ArrayList toShow = new ArrayList(); + for (Like like : result) { + toShow.add(new ItemSelectableBean(like.getUserid(), like.getFullName(), like.getThumbnailURL())); + } + eventBus.fireEvent(new UsersFetchedEvent(toShow)); + } + }); } private void doAddComment(final TweetTemplate owner, String text, HashSet mentionedUsers) { 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 0b4ef7d..76de8e4 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 @@ -27,8 +27,10 @@ import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel; import org.gcube.portlets.widgets.imagepreviewerwidget.client.EnhancedImage; import org.gcube.portlets.widgets.imagepreviewerwidget.client.ui.Carousel; +import com.github.gwtbootstrap.client.ui.Button; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.MouseOutEvent; @@ -64,7 +66,7 @@ public class TweetTemplate extends Composite { public static final String loading = GWT.getModuleBaseURL() + "../images/loading-comments.gif"; - + private static final int MAX_SHOWTEXT_LENGTH = 256; private EnhancedFeed myFeed; @@ -107,9 +109,9 @@ public class TweetTemplate extends Composite { @UiField HTMLPanel mainHTML; @UiField - HTML likesNo; + Button likesNo; @UiField - HTML commentsNo; + Button commentsNo; @UiField VerticalPanel commentsPanel; @UiField @@ -134,6 +136,8 @@ public class TweetTemplate extends Composite { */ public TweetTemplate(boolean displaySingle, boolean showTimelineSource, UserInfo myUserInfo, EnhancedFeed myFeed, HandlerManager eventBus) { initWidget(uiBinder.createAndBindUi(this)); + commentsNo.getElement().getStyle().setPaddingTop(0, Unit.PX); + likesNo.getElement().getStyle().setPaddingTop(0, Unit.PX); myInstance = this; this.myUserInfo = myUserInfo; this.vreSource.setVisible(false); @@ -369,14 +373,14 @@ public class TweetTemplate extends Composite { timeArea.setHTML(formattedTime); String formattedTimeWithYear = DateTimeFormat.getFormat("dd MMMM yyyy h:mm a ").format(feed.getTime()); timeArea.setTitle(formattedTimeWithYear); - if (! feed.getCommentsNo().equals("0")) { - commentsNo.setHTML(feed.getCommentsNo()); - commentsNo.setStyleName("comments-number"); - commentsNo.setTitle("People commented this."); + if (! feed.getCommentsNo().equals("0")) { + commentsNo.setVisible(true); + commentsNo.setText(feed.getCommentsNo()); + commentsNo.setTitle(feed.getCommentsNo() + " people commented this."); } if (! feed.getLikesNo().equals("0")) { - likesNo.setHTML(feed.getLikesNo()); - likesNo.setStyleName("likes-number"); + likesNo.setVisible(true); + likesNo.setText(feed.getLikesNo()); likesNo.setTitle("Show People who have " + NewsFeedPanel.LIKED_LABEL + " this."); } totalComments = Integer.parseInt(feed.getCommentsNo()); @@ -392,8 +396,7 @@ public class TweetTemplate extends Composite { if (totalComments > 2 && !displaySingle) { showAllComments = getShowAllCommentsLink(totalComments); commentsPanel.add(showAllComments); - commentsNo.setStyleName("show-comments-number"); - commentsNo.setTitle("Show all Comments"); + commentsNo.setVisible(true); } for (Comment comment : myFeed.getComments()) { addComment(new SingleComment(comment, this, (comment.getUserid().equals(myUserInfo.getUsername())))); @@ -487,12 +490,13 @@ public class TweetTemplate extends Composite { cur++; if (cur == 1) { myFeed.getFeed().setLikesNo("1"); - likesNo.setHTML("1"); - likesNo.setStyleName("likes-number"); + likesNo.setText("1"); likesNo.setTitle("People who have " + NewsFeedPanel.LIKED_LABEL + " this"); + likesNo.setVisible(true); } else { myFeed.getFeed().setLikesNo(""+cur); - likesNo.setHTML(""+cur); + likesNo.setText(""+cur); + likesNo.setVisible(true); } eventBus.fireEvent(new AddLikeEvent(this, myFeed.getFeed().getKey())); setFavoritedUI(true); @@ -506,12 +510,13 @@ public class TweetTemplate extends Composite { cur--; if (cur == 0) { myFeed.getFeed().setLikesNo("0"); - likesNo.setHTML(""); - likesNo.removeStyleName("likes-number"); + likesNo.setText(""); + likesNo.setVisible(false); likesNo.setTitle(""); } else { myFeed.getFeed().setLikesNo(""+cur); - likesNo.setHTML(""+cur); + likesNo.setText(""+cur); + likesNo.setVisible(true); } eventBus.fireEvent(new UnLikeEvent(this, myFeed.getFeed().getKey())); setFavoritedUI(false); @@ -585,10 +590,11 @@ public class TweetTemplate extends Composite { void onSeeLikes(ClickEvent e) { eventBus.fireEvent(new SeeLikesEvent(myFeed.getFeed().getKey())); } + @UiHandler("commentsNo") void onSeeComments(ClickEvent e) { fireSeeComments(false); - } + } public void setcontentAreaStyle(String cssclass) { contentArea.getElement().getParentElement().getParentElement().setClassName("div-table-col content visible"); @@ -662,10 +668,11 @@ public class TweetTemplate extends Composite { } public void updateCommentsNumberCount() { if (myComments.size() == 1) { - commentsNo.setStyleName("comments-number"); + //commentsNo.setStyleName("show-comments-number"); commentsNo.setTitle("Persons who have commented this."); } - commentsNo.setHTML(""+myComments.size()); + //commentsNo.setHTML(commentIcon.getElement().toString()+" "+myComments.size()); + commentsNo.setText(""+myComments.size()); } public UserInfo getMyUserInfo() { return myUserInfo; @@ -709,7 +716,7 @@ public class TweetTemplate extends Composite { try{ - ret = Integer.parseInt(likesNo.getHTML()); + ret = Integer.parseInt(likesNo.getText()); }catch(NumberFormatException e){ diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml index cc6897c..d87b3e7 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml @@ -1,6 +1,8 @@ + xmlns:g="urn:import:com.google.gwt.user.client.ui" + xmlns:b="urn:import:com.github.gwtbootstrap.client.ui" + xmlns:m="urn:import:org.gcube.portlets.user.newsfeed.client.ui">
@@ -40,11 +42,11 @@ - - + + - - + + diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java index 78f3ac5..76dca5b 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java @@ -91,7 +91,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService private static final String SESSION_ADMIN_ATTR = "SESSION_ADMIN_ATTR"; private static final String USER_SETTINGS_ATTR = "USER_SETTINGS_ATTR"; - public static final String TEST_SCOPE = "/gcube/devsec/devVRE"; + public static final String TEST_SCOPE = "/gcube/devNext/NextNext"; private String APP_ID; @@ -146,7 +146,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService */ public String getDevelopmentUser() { String user = NewsConstants.TEST_USER; - // user = "costantino.perciante"; +// user = "costantino.perciante"; return user; } /** diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css index 0e6d619..2bcc184 100644 --- a/src/main/webapp/NewsFeed.css +++ b/src/main/webapp/NewsFeed.css @@ -442,20 +442,6 @@ a.person-link { white-space: nowrap; } -.tweet-actions .likes-number { - color: #3B5998; - width: 20px; - padding-left: 25px; - background: url("images/star_blue.png") no-repeat left; -} - -.tweet-actions .comments-number, .show-comments-number { - color: #3B5998; - width: 20px; - padding-left: 25px; - background: url("images/comment_edit.png") no-repeat left; -} - .tweet-actions div { color: #666; }