gCubeSystem
/
notifications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made notification settings more evident 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@92623 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2014-03-04 15:01:04 +00:00
parent a3f12c7131
commit 562f3c9eeb
9 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/notifications-1.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/notifications-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -25,10 +25,10 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/notifications-1.0.1-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/notifications-1.1.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -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

6
.settings/org.eclipse.jdt.core.prefs
View File

@ -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

2
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -3,5 +3,5 @@
<fixed facet="wst.jsdt.web"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="java" version="1.6"/>
<installed facet="java" version="1.7"/>
</faceted-project>

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlet.user.notifications.1-1-0"
date="2014-3-03">
<Change>Notification Settings button more evident</Change>
</Changeset>
<Changeset component="org.gcube.portlet.user.notifications.1-0-0"
date="2013-10-21">
<Change>Ported to GWT 251</Change>

10
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>notifications</artifactId>
<packaging>war</packaging>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<name>gCube Notifications Portlet</name>
<properties>
@ -87,6 +87,10 @@
<artifactId>common-scope-maps</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>accesslogger</artifactId>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
@ -161,8 +165,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<!-- SA Plugin -->

2
src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
View File

@ -59,7 +59,7 @@ public class NotificationsPanel extends Composite {
private VerticalPanel mainPanel;
private HTML notificationSettings = new HTML("<a style=\"padding-right: 15px;\" class=\"link\">Notification Settings</a>");
private HTML notificationSettings = new HTML("<a style=\"padding-right: 15px;\" class=\"notification-btn\">Notification Settings</a>");
public NotificationsPanel() {
notificationSettings.setVisible(false);

5
src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
View File

@ -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;

36
src/main/webapp/Notifications.css
View File

@ -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,