From 80861705d0c4c0c28b61cf32e18dc21cf759b5fa Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Tue, 27 Sep 2016 09:16:04 +0000 Subject: [PATCH] icons for posts, likes and comments changed (bootstrap's ones are now used) git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/user-statistics@131824 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/StatisticsPanel.java | 36 +---------------- .../client/ui/ActivityWidget.java | 37 +++++++++--------- .../client/ui/ActivityWidget.ui.xml | 16 ++------ .../server/ServerUtils.java | 2 +- src/main/webapp/Statistics.css | 5 +++ src/main/webapp/images/comment_edit.png | Bin 3511 -> 0 bytes src/main/webapp/images/share-blue.png | Bin 1160 -> 0 bytes src/main/webapp/images/star_blue.png | Bin 3294 -> 0 bytes 8 files changed, 30 insertions(+), 66 deletions(-) delete mode 100644 src/main/webapp/images/comment_edit.png delete mode 100644 src/main/webapp/images/share-blue.png delete mode 100644 src/main/webapp/images/star_blue.png diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java index c8bcead..16f2a56 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java @@ -61,7 +61,7 @@ public class StatisticsPanel extends Composite { /** * tooltip for the above image */ - private static final String ALERT_MESSAGE = "Information not available at the moment."; + private static final String ALERT_MESSAGE = "Information not available at the moment"; /** * Title of the page @@ -458,11 +458,8 @@ public class StatisticsPanel extends Composite { if(!isProfilePage || getUserToShowId() == null) activityDone.setEventBus(eventBus); - String urlPostsIcon = GWT.getModuleBaseURL() + "../images/share-blue.png"; - if(isRoot || isProfilePage) activityDone.setPosts( - urlPostsIcon, formattedNumbers(postsBean.getFeedsNumber()), TOOLTIP_POSTS_DONE, TOOLTIP_POSTS_DONE + " (" + postsBean.getFeedsNumber() + ")", @@ -470,7 +467,6 @@ public class StatisticsPanel extends Composite { information.getCurrentPageLanding()); else activityDone.setPosts( - urlPostsIcon, formattedNumbers(postsBean.getFeedsNumber()), TOOLTIP_POSTS_DONE, TOOLTIP_POSTS_DONE_VRE + " (" + postsBean.getFeedsNumber() + ")", @@ -480,10 +476,8 @@ public class StatisticsPanel extends Composite { numberOfWrittenFeeds = postsBean.getFeedsNumber(); activityDoneWidgetContainer.appendToPanel(activityDone); - String urlLikesIcon = GWT.getModuleBaseURL() + "../images/star_blue.png"; if(isRoot || isProfilePage) activityDone.setLikes( - urlLikesIcon, formattedNumbers(postsBean.getLikesMade()), TOOLTIP_LIKES_DONE, TOOLTIP_LIKES_DONE + " (" + postsBean.getLikesMade() + ")", @@ -491,17 +485,14 @@ public class StatisticsPanel extends Composite { information.getCurrentPageLanding()); else activityDone.setLikes( - urlLikesIcon, formattedNumbers(postsBean.getLikesMade()), TOOLTIP_LIKES_DONE_VRE, TOOLTIP_LIKES_DONE_VRE + " (" + postsBean.getLikesMade() + ")", ShowUserStatisticAction.LIKES_MADE_BY_USER, information.getCurrentPageLanding()); - String urlCommentsIcon = GWT.getModuleBaseURL() + "../images/comment_edit.png"; if(isRoot || isProfilePage) activityDone.setComments( - urlCommentsIcon, formattedNumbers(postsBean.getCommentsMade()), TOOLTIP_REPLIES_DONE, TOOLTIP_REPLIES_DONE + " (" + postsBean.getCommentsMade() + ")", @@ -509,7 +500,6 @@ public class StatisticsPanel extends Composite { information.getCurrentPageLanding()); else activityDone.setComments( - urlCommentsIcon, formattedNumbers(postsBean.getCommentsMade()), TOOLTIP_REPLIES_DONE_VRE, TOOLTIP_REPLIES_DONE_VRE +" (" + postsBean.getCommentsMade() + ")", @@ -527,7 +517,6 @@ public class StatisticsPanel extends Composite { if(isRoot || isProfilePage) activityGot.setLikes( - urlLikesIcon, formattedNumbers(postsBean.getLikesReceived()), TOOLTIP_LIKES_GOT, TOOLTIP_LIKES_GOT+ " (" + postsBean.getLikesReceived() + ")", @@ -535,7 +524,6 @@ public class StatisticsPanel extends Composite { information.getCurrentPageLanding()); else activityGot.setLikes( - urlLikesIcon, formattedNumbers(postsBean.getLikesReceived()), TOOLTIP_LIKES_GOT_VRE, TOOLTIP_LIKES_GOT_VRE + " (" + postsBean.getLikesReceived() + ")", @@ -546,7 +534,6 @@ public class StatisticsPanel extends Composite { if(isRoot || isProfilePage) activityGot.setComments( - urlCommentsIcon, formattedNumbers(postsBean.getCommentsReceived()), TOOLTIP_REPLIES_GOT, TOOLTIP_REPLIES_GOT + " (" + postsBean.getCommentsReceived() + ")", @@ -554,7 +541,6 @@ public class StatisticsPanel extends Composite { information.getCurrentPageLanding()); else activityGot.setComments( - urlCommentsIcon, formattedNumbers(postsBean.getCommentsReceived()), TOOLTIP_REPLIES_GOT_VRE, TOOLTIP_REPLIES_GOT_VRE + " (" + postsBean.getCommentsReceived() + ")", @@ -653,11 +639,9 @@ public class StatisticsPanel extends Composite { GWT.log("Increment number of post message received"); numberOfWrittenFeeds ++; - String urlPostsIcon = GWT.getModuleBaseURL() + "../images/share-blue.png"; if(isRoot) activityDone.setPosts( - urlPostsIcon, formattedNumbers(numberOfWrittenFeeds), TOOLTIP_POSTS_DONE, TOOLTIP_POSTS_DONE + " (" + numberOfWrittenFeeds + ")", @@ -665,7 +649,6 @@ public class StatisticsPanel extends Composite { informationBeanRetrieved.getCurrentPageLanding()); else activityDone.setPosts( - urlPostsIcon, formattedNumbers(numberOfWrittenFeeds), TOOLTIP_POSTS_DONE, TOOLTIP_POSTS_DONE_VRE + " (" + numberOfWrittenFeeds + ")", @@ -696,11 +679,9 @@ public class StatisticsPanel extends Composite { // they can't be less than zero... numberOfWrittenFeeds --; numberOfWrittenFeeds = numberOfWrittenFeeds < 0 ? 0: numberOfWrittenFeeds; - String urlPostsIcon = GWT.getModuleBaseURL() + "../images/share-blue.png"; if(isRoot) activityDone.setPosts( - urlPostsIcon, formattedNumbers(numberOfWrittenFeeds), TOOLTIP_POSTS_DONE, TOOLTIP_POSTS_DONE + " (" + numberOfWrittenFeeds + ")", @@ -708,7 +689,6 @@ public class StatisticsPanel extends Composite { informationBeanRetrieved.getCurrentPageLanding()); else activityDone.setPosts( - urlPostsIcon, formattedNumbers(numberOfWrittenFeeds), TOOLTIP_POSTS_DONE, TOOLTIP_POSTS_DONE_VRE + " (" + numberOfWrittenFeeds + ")", @@ -737,11 +717,9 @@ public class StatisticsPanel extends Composite { GWT.log("Increment number of likes received"); numberOfLikesGot ++; - String urlLikesIcon = GWT.getModuleBaseURL() + "../images/star_blue.png"; if(isRoot) activityGot.setLikes( - urlLikesIcon, formattedNumbers(numberOfLikesGot), TOOLTIP_LIKES_GOT, TOOLTIP_LIKES_GOT + " (" + numberOfLikesGot + ")", @@ -749,7 +727,6 @@ public class StatisticsPanel extends Composite { informationBeanRetrieved.getCurrentPageLanding()); else activityGot.setLikes( - urlLikesIcon, formattedNumbers(numberOfLikesGot), TOOLTIP_LIKES_GOT_VRE, TOOLTIP_LIKES_GOT_VRE + " (" + numberOfLikesGot + ")", @@ -781,11 +758,9 @@ public class StatisticsPanel extends Composite { // they can't be less than zero... numberOfLikesGot --; numberOfLikesGot = numberOfLikesGot < 0 ? 0: numberOfLikesGot; - String urlLikesIcon = GWT.getModuleBaseURL() + "../images/star_blue.png"; if(isRoot) activityGot.setLikes( - urlLikesIcon, formattedNumbers(numberOfLikesGot), TOOLTIP_LIKES_GOT, TOOLTIP_LIKES_GOT + " (" + numberOfLikesGot + ")", @@ -793,7 +768,6 @@ public class StatisticsPanel extends Composite { informationBeanRetrieved.getCurrentPageLanding()); else activityGot.setLikes( - urlLikesIcon, formattedNumbers(numberOfLikesGot), TOOLTIP_LIKES_GOT_VRE, TOOLTIP_LIKES_GOT_VRE + " (" + numberOfLikesGot + ")", @@ -824,19 +798,16 @@ public class StatisticsPanel extends Composite { numberOfCommentsGot ++; - String urlCommentsIcon = GWT.getModuleBaseURL() + "../images/comment_edit.png"; if(isRoot) activityGot.setComments( - urlCommentsIcon, formattedNumbers(numberOfCommentsGot), TOOLTIP_REPLIES_GOT, TOOLTIP_REPLIES_GOT + " (" + numberOfCommentsGot + ")", ShowUserStatisticAction.COMMENTS_GOT_BY_USER, informationBeanRetrieved.getCurrentPageLanding()); else - activityGot.setComments( - urlCommentsIcon, + activityGot.setComments( formattedNumbers(numberOfCommentsGot), TOOLTIP_REPLIES_GOT_VRE, TOOLTIP_REPLIES_GOT_VRE + " (" + numberOfCommentsGot + ")", @@ -868,10 +839,8 @@ public class StatisticsPanel extends Composite { // they can't be less than zero... numberOfCommentsGot --; numberOfCommentsGot = numberOfCommentsGot < 0 ? 0: numberOfCommentsGot; - String urlCommentsIcon = GWT.getModuleBaseURL() + "../images/comment_edit.png"; if(isRoot) activityGot.setComments( - urlCommentsIcon, formattedNumbers(numberOfCommentsGot), TOOLTIP_REPLIES_GOT, TOOLTIP_REPLIES_GOT + " (" + numberOfCommentsGot + ")", @@ -879,7 +848,6 @@ public class StatisticsPanel extends Composite { informationBeanRetrieved.getCurrentPageLanding()); else activityGot.setComments( - urlCommentsIcon, formattedNumbers(numberOfCommentsGot), TOOLTIP_REPLIES_GOT_VRE, TOOLTIP_REPLIES_GOT_VRE + " (" + numberOfCommentsGot + ")", diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java index adc1f50..ff19942 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java @@ -3,6 +3,7 @@ package org.gcube.portlet.user.userstatisticsportlet.client.ui; import org.gcube.portal.databook.shared.ShowUserStatisticAction; import org.gcube.portlet.user.userstatisticsportlet.client.events.ShowFeedsRelatedToUserStatisticsEvent; +import com.github.gwtbootstrap.client.ui.Button; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style.Cursor; import com.google.gwt.event.dom.client.ClickEvent; @@ -11,7 +12,6 @@ import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; @@ -25,13 +25,13 @@ public class ActivityWidget extends Composite { } @UiField - Image likesImage; + Button likesButton; @UiField - Image commentsImage; + Button commentsButton; @UiField - Image postsImage; + Button postsButton; @UiField Label likesValue; @@ -46,21 +46,24 @@ public class ActivityWidget extends Composite { public ActivityWidget() { initWidget(uiBinder.createAndBindUi(this)); + + // set styles + commentsButton.addStyleName("buttons-statistics-style"); + likesButton.addStyleName("buttons-statistics-style"); + postsButton.addStyleName("buttons-statistics-style"); } /** * Set comments information - * @param url * @param value * @param tipIcon * @param tipValue * @param actionToTakeOnClick * @param landingPage */ - public void setComments(String url, String value, String tipIcon, String tipValue, final ShowUserStatisticAction actionToTakeOnClick, final String landingPage){ + public void setComments(String value, String tipIcon, String tipValue, final ShowUserStatisticAction actionToTakeOnClick, final String landingPage){ - commentsImage.setUrl(url); - commentsImage.setTitle(tipIcon); + commentsButton.setTitle(tipIcon); commentsValue.setText(value); commentsValue.setTitle(tipValue); @@ -82,22 +85,20 @@ public class ActivityWidget extends Composite { // set to visible commentsValue.setVisible(true); - commentsImage.setVisible(true); + commentsButton.setVisible(true); } /** * Set likes information - * @param url * @param value * @param tipIcon * @param tipValue * @param actionToTakeOnClick * @param landingPage */ - public void setLikes(String url, String value, String tipIcon, String tipValue, final ShowUserStatisticAction actionToTakeOnClick, final String landingPage){ + public void setLikes(String value, String tipIcon, String tipValue, final ShowUserStatisticAction actionToTakeOnClick, final String landingPage){ - likesImage.setUrl(url); - likesImage.setTitle(tipIcon); + likesButton.setTitle(tipIcon); likesValue.setText(value); likesValue.setTitle(tipValue); @@ -119,22 +120,20 @@ public class ActivityWidget extends Composite { // set to visible likesValue.setVisible(true); - likesImage.setVisible(true); + likesButton.setVisible(true); } /** * Set posts information - * @param url * @param value * @param tipIcon * @param tipValue * @param actionToTakeOnClick * @param landingPage */ - public void setPosts(String url, String value, String tipIcon, String tipValue, final ShowUserStatisticAction actionToTakeOnClick, final String landingPage){ + public void setPosts(String value, String tipIcon, String tipValue, final ShowUserStatisticAction actionToTakeOnClick, final String landingPage){ - postsImage.setUrl(url); - postsImage.setTitle(tipIcon); + postsButton.setTitle(tipIcon); postsValue.setText(value); postsValue.setTitle(tipValue); @@ -156,7 +155,7 @@ public class ActivityWidget extends Composite { // set to visible postsValue.setVisible(true); - postsImage.setVisible(true); + postsButton.setVisible(true); } /** diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.ui.xml b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.ui.xml index ffdd2ef..70ebdce 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.ui.xml +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.ui.xml @@ -1,12 +1,7 @@ + xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"> - .statistic-icon { - display: inline-block; - vertical-align: text-bottom; - } - .statistic-value { color: #0084B4 !important; font-size: 14px; @@ -15,16 +10,13 @@ } - + - + - + diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/ServerUtils.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/ServerUtils.java index a58055f..0ed8e27 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/ServerUtils.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/ServerUtils.java @@ -61,7 +61,7 @@ public class ServerUtils { */ public static String getDevelopmentUser() { String user = UserStatisticsServiceImpl.defaultUserId; - // user = "costantino.perciante"; + // user = "costantino.perciante"; return user; } diff --git a/src/main/webapp/Statistics.css b/src/main/webapp/Statistics.css index c9c0701..f980056 100644 --- a/src/main/webapp/Statistics.css +++ b/src/main/webapp/Statistics.css @@ -75,4 +75,9 @@ .improve-profile-hint-message { margin-top: 15px !important; padding: 25px !important; +} + +.buttons-statistics-style { + pointer-events: none; + padding: 2px 3px !important; } \ No newline at end of file diff --git a/src/main/webapp/images/comment_edit.png b/src/main/webapp/images/comment_edit.png deleted file mode 100644 index d31e68afd46127033e13d31fe84317a56e66c564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3511 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 Xgr~mQ-@DNrR5p0J`njxgN@xNAYVV63 diff --git a/src/main/webapp/images/star_blue.png b/src/main/webapp/images/star_blue.png deleted file mode 100644 index e475c89282a9f86bd7650a2a698e96dd8ae1b4b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3294 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