diff --git a/.classpath b/.classpath
index db32000..053acfd 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -25,10 +25,10 @@
-
+
-
+
-
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 3bd2961..9eaf71a 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-1.0.1-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-1.1.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 69c31cd..443e085 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index d215cd0..c24712e 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 7f5e143..9395d1c 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ Notification Settings button more evident
+
Ported to GWT 251
diff --git a/pom.xml b/pom.xml
index 0d9519d..da1a781 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.user
notifications
war
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
gCube Notifications Portlet
@@ -87,6 +87,10 @@
common-scope-maps
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+
+ org.gcube.applicationsupportlayer
+ accesslogger
+
com.liferay.portal
portal-service
@@ -161,8 +165,8 @@
maven-compiler-plugin
2.3.2
- 1.6
- 1.6
+ 1.7
+ 1.7
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
index b0fd931..bfc3d29 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
@@ -59,7 +59,7 @@ public class NotificationsPanel extends Composite {
private VerticalPanel mainPanel;
- private HTML notificationSettings = new HTML("Notification Settings");
+ private HTML notificationSettings = new HTML("Notification Settings");
public NotificationsPanel() {
notificationSettings.setVisible(false);
diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
index 65843ee..2dcc47a 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
@@ -5,6 +5,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -35,8 +36,6 @@ import com.liferay.portal.model.UserModel;
import com.liferay.portal.service.UserLocalServiceUtil;
import com.liferay.portal.theme.ThemeDisplay;
-import edu.emory.mathcs.backport.java.util.Collections;
-
/**
* The server side implementation of the RPC service.
*/
@@ -75,7 +74,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
if (user == null) {
user = "test.user";
- //user = "massimiliano.assante";
+// user = "massimiliano.assante";
_log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL");
withinPortal = false;
diff --git a/src/main/webapp/Notifications.css b/src/main/webapp/Notifications.css
index 99077b1..328912a 100644
--- a/src/main/webapp/Notifications.css
+++ b/src/main/webapp/Notifications.css
@@ -3,6 +3,42 @@
border-collapse: separate !important;
border-spacing: 0;
}
+div.portlet-content {
+ padding-top: 0px;
+}
+
+.notification-btn {
+ font: 16px "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: inline-block;
+ width: 175px;
+ text-decoration: none;
+ margin-bottom: 0;
+ font-weight: 400;
+ text-align: center;
+ vertical-align: middle;
+ cursor: pointer;
+ background-image: none;
+ border: 1px solid transparent;
+ white-space: nowrap;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ color: #3B5998;
+ background-color: transparent;
+ border-color: #3B5998;
+ padding: 8px 12px;
+ line-height: 1.33;
+ border-radius: 6px;
+ margin: 0 10px -20px 0;
+}
+
+.notification-btn:hover {
+ border-color: #6E8CCC;
+ background-color: #6E8CCC;
+ color: #FFF;
+}
a.link,a.link:active,a.link:visited {
font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial,