From f37096fc6e450f021f8295b3bf96c6a44d8a2fea Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 6 Apr 2016 17:11:02 +0000 Subject: [PATCH] consistent links git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@126842 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/newsfeed/client/ui/ResultsFor.java | 4 +- .../newsfeed/client/ui/SingleComment.ui.xml | 8 +-- .../user/newsfeed/server/NewsServiceImpl.java | 3 - src/main/webapp/NewsFeed.css | 66 +++++++------------ 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ResultsFor.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ResultsFor.java index 21862fb..af01118 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ResultsFor.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ResultsFor.java @@ -23,9 +23,9 @@ public class ResultsFor extends Composite { @UiField HTML resultForDiv; public ResultsFor(String prefix, String hashtag) { initWidget(uiBinder.createAndBindUi(this)); - allUpdatesLink.setHTML("All Updates"); + allUpdatesLink.setHTML("All Updates"); allUpdatesLink.getElement().getStyle().setCursor(Cursor.POINTER); - resultForDiv.setHTML(prefix + " " + hashtag+""); + resultForDiv.setHTML(prefix + " " + hashtag+""); resultForDiv.setStyleName("filter-selected"); } diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.ui.xml index 83f2e44..d382cca 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.ui.xml +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.ui.xml @@ -9,9 +9,9 @@ - @@ -22,10 +22,10 @@ - - 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 8f36293..193f5af 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 @@ -26,7 +26,6 @@ import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; -import org.gcube.portal.databook.client.GCubeSocialNetworking; import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl; import org.gcube.portal.databook.server.DatabookStore; import org.gcube.portal.databook.shared.Attachment; @@ -45,7 +44,6 @@ import org.gcube.portal.notifications.bean.GenericItemBean; import org.gcube.portal.notifications.thread.CommentNotificationsThread; import org.gcube.portal.notifications.thread.LikeNotificationsThread; import org.gcube.portal.notifications.thread.MentionNotificationsThread; -import org.gcube.portlets.user.gcubewidgets.client.ClientScopeHelper; import org.gcube.portlets.user.newsfeed.client.NewsService; import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean; import org.gcube.portlets.user.newsfeed.shared.NewsConstants; @@ -65,7 +63,6 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gwt.user.client.Window.Location; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css index a96eeb4..0187e12 100644 --- a/src/main/webapp/NewsFeed.css +++ b/src/main/webapp/NewsFeed.css @@ -5,6 +5,7 @@ table { border-spacing: 0; } + .result-hashtag { color: #555; font-size: 20px; @@ -46,6 +47,7 @@ table { /* this is very important when usere paste long links*/ } + div#comment-inputContainer textarea.post-comment { padding: 4px 2px; color: #999; @@ -142,13 +144,12 @@ div#comment-inputContainer textarea.post-comment.comment-dark-color { } .feed-filters li a { - color: #444; + color: #3B5998; text-decoration: none; } .feed-filters li a:hover { - text-decoration: none; - color: #336699; + text-decoration: underline; transition: color .25s ease-in-out; -moz-transition: color .25s ease-in-out; -webkit-transition: color .25s ease-in-out; @@ -179,12 +180,13 @@ div#comment-inputContainer textarea.post-comment.comment-dark-color { background-image: none; } + .feed-filters li.feed-breadcrumb { background-image: url("images/arrow-right.png"); } .filter-selected a { - color: #336699 !important; + color: #444 !important; font-weight: bold; } @@ -274,7 +276,7 @@ img.member-photo { margin: 4px 0 0 4px; } -.more-comment { +.more-comment, .more-comment:hover { background-color: #EFF3F5; width: 100%; text-align: center; @@ -282,9 +284,10 @@ img.member-photo { border-bottom-color: #FFF; border-bottom-style: solid; border-bottom-width: 1px; + cursor: pointer; } -div>table.single-comment { +div>table.single-comment, .single-comment { background-color: #EFF3F5; border-bottom-color: #FFF; border-bottom-style: solid; @@ -383,32 +386,27 @@ div>table.single-comment { white-space: nowrap; } -a.seemore, a.seemore:visited { - font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial, - sans-serif; +a.seemore, .seemore:hover { + font-size: 9px; cursor: pointer; cursor: hand; - font-size: 9px; - white-space: nowrap; - color: #3B5998; } +.like:hover { + cursor: pointer; + cursor: hand; +} + +.comment:hover { + cursor: pointer; + cursor: hand; +} + + a.person-link { - font-family: 'Helvetica Neue', Arial, sans-serif; font-size: 16x; - line-height: 18px; - color: #3B5998; } -a.person-link, a.person-link:visited { - cursor: pointer; - cursor: hand; - font-size: 16x; - text-decoration: none; - color: #3B5998; -} - - .tweet-content { font-family: 'Helvetica Neue', Arial, sans-serif; font-size: 14px; @@ -464,26 +462,6 @@ a.person-link, a.person-link:visited { color: #666; } -.tweet-actions div a { - color: #3B5998; - cursor: pointer; - cursor: hand; -} - -div.tweet-content a.link, div.tweet-content a.link:active, div.tweet-content a.link:visited, div.user-comment a.link, div.user-comment a.link:active, div.user-comment a.link:visited { - font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial, - sans-serif; - font-size: 12px; - cursor: pointer; - cursor: hand; - text-decoration: none; - color: #3B5998; -} - -a.link:hover { - opacity: 0.8; - text-decoration: underline; -} /* TABLES */ .div-table-400 {
+ + width="32px" height="32px" /> + +