diff --git a/.classpath b/.classpath index b00cae2..29d03c3 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/org.eclipse.jst.jsp.core.prefs b/.settings/org.eclipse.jst.jsp.core.prefs new file mode 100644 index 0000000..3a5c98d --- /dev/null +++ b/.settings/org.eclipse.jst.jsp.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +validateFragments=false +validation.use-project-settings=true diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 089ace4..c1f646c 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,13 +1,19 @@ - + + + uses + uses - + + uses + + uses diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index c24712e..afd5d47 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -4,4 +4,5 @@ + diff --git a/.tern-project b/.tern-project new file mode 100644 index 0000000..a185ba0 --- /dev/null +++ b/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file diff --git a/distro/changelog.xml b/distro/changelog.xml index 24b19e1..142d036 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Integrated gwt-bootstrap and revised css + Ported to GWT 2.7.0 + added ClientScopeHandler to help prevent the back button cache problem in Chrome and Firefox diff --git a/pom.xml b/pom.xml index 8e2047a..4cb96d3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user news-feed war - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT gCube News Feed Portlet @@ -26,7 +26,7 @@ - 2.5.1 + 2.7.0 distro 1.7 @@ -51,13 +51,20 @@ com.google.gwt gwt-user + ${gwtVersion} provided com.google.gwt gwt-servlet + ${gwtVersion} provided + + com.github.gwtbootstrap + gwt-bootstrap + 2.3.2.0 + org.gcube.applicationsupportlayer aslcore @@ -140,7 +147,7 @@ commons-codec commons-codec - + com.liferay.portal portal-service @@ -191,7 +198,7 @@ - Messages.html + NewsFeed.html ${webappDirectory} diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java index 114b9a7..411eda8 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java @@ -13,9 +13,6 @@ import org.jsonmaker.gwt.client.Jsonizer; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.logical.shared.ResizeEvent; -import com.google.gwt.event.logical.shared.ResizeHandler; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.Location; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; @@ -45,24 +42,18 @@ public class NewsFeed implements EntryPoint { public void init() { mainPanel = new NewsFeedPanel(); - resize(); + mainPanel.setWidth("620px"); + RootPanel.get(UNIQUE_DIV).add(mainPanel); - Window.addResizeHandler(new ResizeHandler() { - public void onResize(ResizeEvent event) { - int width = RootPanel.get(UNIQUE_DIV).getOffsetWidth(); - mainPanel.setWidth(""+width); - } - }); + ClientFeed notification = new ClientFeed(); //Subscribe to message and associate subsequent receptions with custom subscriber data - try - { + try { pageBusAdapter.PageBusSubscribe("org.gcube.portal.databook.shared", null, null, notification, (Jsonizer)GWT.create(ClientFeedJsonizer.class)); } - catch (PageBusAdapterException e1) - { + catch (PageBusAdapterException e1) { e1.printStackTrace(); } @@ -80,14 +71,7 @@ public class NewsFeed implements EntryPoint { public String getName() { return null; } - }); - - - } - - private void resize() { - int width = RootPanel.get(UNIQUE_DIV).getOffsetWidth(); - mainPanel.setWidth(""+width); + }); } } diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java index 03fc5b0..e73feba 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java @@ -118,7 +118,7 @@ public class AddCommentTemplate extends Composite { return; } if (userComment.equals(COMMENT_TEXT) || userComment.equals(ERROR_UPDATE_TEXT) || userComment.equals("")) { - commentTextArea.addStyleName("error"); + commentTextArea.addStyleName("nwfeed-error"); commentTextArea.setText(ERROR_UPDATE_TEXT); return; } @@ -168,7 +168,7 @@ public class AddCommentTemplate extends Composite { if (commentTextArea.getText().equals(COMMENT_TEXT) || commentTextArea.getText().equals(ERROR_UPDATE_TEXT) ) { commentTextArea.setText(""); commentTextArea.addStyleName("comment-dark-color"); - commentTextArea.removeStyleName("error"); + commentTextArea.removeStyleName("nwfeed-error"); } submitButton.setVisible(true); } @@ -178,7 +178,7 @@ public class AddCommentTemplate extends Composite { if (commentTextArea.getText().equals(COMMENT_TEXT) || commentTextArea.getText().equals(ERROR_UPDATE_TEXT) ) { commentTextArea.setText(""); commentTextArea.addStyleName("comment-dark-color"); - commentTextArea.removeStyleName("error"); + commentTextArea.removeStyleName("nwfeed-error"); } } /** diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml index 680214c..bf2c7b9 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml @@ -11,17 +11,15 @@ -
+ + width="30px" height="30px" />
- -
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 8c15aec..f3c0e4d 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,13 +9,13 @@ - -
+ + width="30px" height="30px" /> +
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java index e56770f..8cee8d5 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java @@ -104,7 +104,7 @@ public class SuperPosedTextArea extends TextArea { if (getText().equals(AddCommentTemplate.COMMENT_TEXT) || getText().equals(AddCommentTemplate.ERROR_UPDATE_TEXT) ) { setText(""); addStyleName("dark-color"); - removeStyleName("error"); + removeStyleName("nwfeed-error"); } break; } @@ -134,7 +134,7 @@ public class SuperPosedTextArea extends TextArea { if (getText().equals(AddCommentTemplate.COMMENT_TEXT) || getText().equals(AddCommentTemplate.ERROR_UPDATE_TEXT) ) { setText(""); addStyleName("darker-color"); - removeStyleName("error"); + removeStyleName("nwfeed-error"); } } protected void cleanHighlighterDiv() { 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 259ca64..0ce6ace 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 @@ -53,7 +53,7 @@
-
+
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 c6140ad..ed8beb7 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 @@ -76,6 +76,8 @@ 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"; private static final String TEST_USER = "test.user"; + private static final String TEST_SCOPE = "/gcube/devsec/devVRE"; + /** * @@ -102,7 +104,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService if (user == null) { _log.warn("USER IS NULL setting testing user and Running OUTSIDE PORTAL"); user = getDevelopmentUser(); - SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/USTORE_VRE"); + SessionManager.getInstance().getASLSession(sessionID, user).setScope(TEST_SCOPE); } return SessionManager.getInstance().getASLSession(sessionID, user); } @@ -112,7 +114,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService */ public String getDevelopmentUser() { String user = TEST_USER; - //user = "massimiliano.assante"; +// user = "massimiliano.assante"; return user; } /** @@ -479,7 +481,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService ArrayList toMerge = new ArrayList(); HashMap feedsMap = new HashMap(); - ArrayList OrganizationFeeds = (ArrayList) store.getRecentFeedsByVRE(getASLSession().getScope(), feedsNoPerCategory*3); + ArrayList OrganizationFeeds = (ArrayList) store.getRecentFeedsByVRE(TEST_SCOPE, feedsNoPerCategory*3); for (Feed feed : OrganizationFeeds) { feedsMap.put(feed.getKey(), feed); _log.trace("Reading desc: " + feed.getDescription()); diff --git a/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml b/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml index 14361ac..589f789 100644 --- a/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml @@ -11,6 +11,7 @@ + diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css index f7affaa..da453d0 100644 --- a/src/main/webapp/NewsFeed.css +++ b/src/main/webapp/NewsFeed.css @@ -12,7 +12,7 @@ table { /* Superpose TextArea and Highlight DIV trick starts here */ #comment-supercontainer { position: relative; - background-color: #FFFFFF; + background-color: #EFF3F5; } #comment-highlighterContainer { @@ -40,8 +40,8 @@ table { line-height: normal; border: 1px solid transparent; - - width: 460px; + margin-left: 5px; + width: 430px; min-height: 30px; word-wrap: break-word; /* this is very important when usere paste long links*/ @@ -60,8 +60,8 @@ table { line-height: normal; border: 1px solid #C3CDE7; - - width: 460px; + margin-left: 5px; + width: 430px; min-height: 30px; } @@ -74,8 +74,8 @@ table { .framed { margin: 0 0 10px; padding: 10px; - margin: 0px 5px; - background: #FFF url(images/vre_bg_gray.png) repeat-x left bottom; + margin: 0 5px; + background: #FFF; border-radius: 6px !important; -moz-border-radius: 6px !important; -webkit-border-radius: 6px !important; @@ -196,6 +196,7 @@ table { /* Other */ .linkpreview-image { margin: 3px; + width: 80px; } .link-preview { @@ -206,7 +207,7 @@ table { background-image: none; border: 1px solid #DDD; border-radius: 4px; - width: 500px; + width: 485px; margin-top: 5px; margin-left: 5px; } @@ -232,6 +233,7 @@ table { padding-top: 5px; color: #333; font-size: 10px; + line-height: 14px; } .member-photo { @@ -241,10 +243,11 @@ table { } .commentsPanel { - width: 430px !important; + width: 410px !important; padding-left: 5px; } + .comment-hidden { opacity: 0; } @@ -256,6 +259,7 @@ table { -moz-transition: opacity .45s ease-in-out; -webkit-transition: opacity .45s ease-in-out; -ms-transition: opacity .45s ease-in-out; + width:494px; } .commentsPanel { @@ -280,6 +284,7 @@ table { border-bottom-width: 1px; border-left: 2px solid #DDD; padding-left: 3px; + width: 494px; } .comment-bgcolor { @@ -540,7 +545,7 @@ a.link:hover { width: 15px; } -.div-table-col.close { +.div-table-col.nf-post-remove { padding-left: 5px; vertical-align: top; width: 30px; @@ -569,7 +574,7 @@ a.link:hover { background-color: #fdffcc; } -.error { +.nwfeed-error { color: #FFF; background-color: pink; transition: background .45s ease-in-out; diff --git a/src/main/webapp/NewsFeed.html b/src/main/webapp/NewsFeed.html index 235bf2e..e0b7f9b 100644 --- a/src/main/webapp/NewsFeed.html +++ b/src/main/webapp/NewsFeed.html @@ -30,11 +30,7 @@ window.PageBus = window.parent.PageBus; } - - - - - + @@ -44,7 +40,6 @@ -