|
- Portal
- Email
+ Portal
+ |
+
+ Email
|
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.java
index 1b976d0..f20490d 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.java
@@ -15,7 +15,7 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.CheckBox;
+import com.github.gwtbootstrap.client.ui.CheckBox;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Widget;
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.ui.xml b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.ui.xml
index 9fda583..c0fb131 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/NotificationPreferenceView.ui.xml
@@ -1,18 +1,23 @@
+ xmlns:w="urn:import:org.gcube.portlets.widgets.switchbutton.client"
+ xmlns:b="urn:import:com.github.gwtbootstrap.client.ui" xmlns:g="urn:import:com.google.gwt.user.client.ui">
|
|
-
- Portal
- Email
-
+ |
+ Portal
+ |
+
+ Email
+ |
+
+
|
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
index 0372c4c..43857c7 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
@@ -117,6 +117,13 @@ public class SingleNotificationView extends Composite {
case CALENDAR_DELETED_EVENT:
goApp.setHTML(" Go to Calendar.");
break;
+ case TDM_TAB_RESOURCE_SHARE:
+ goApp.setHTML(" See this Tabular Resource.");
+ break;
+ case TDM_RULE_SHARE:
+ case TDM_TEMPLATE_SHARE:
+ goApp.setHTML(" Go to Tabular Data Manager.");
+ break;
}
}
@@ -168,7 +175,11 @@ public class SingleNotificationView extends Composite {
case CALENDAR_DELETED_EVENT:
return images.calendarDelete();
case POST_ALERT:
- return images.postAlert();
+ return images.postAlert();
+ case TDM_TAB_RESOURCE_SHARE:
+ case TDM_RULE_SHARE:
+ case TDM_TEMPLATE_SHARE:
+ return images.tableShare();
default:
return images.generic();
}
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
index dc77208..54b948f 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
@@ -57,4 +57,7 @@ public interface NotificationImages extends ClientBundle {
@Source("notification-generic.png")
ImageResource generic();
+
+ @Source("table_share.png")
+ ImageResource tableShare();
}
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/table_share.png b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/table_share.png
new file mode 100644
index 0000000..1d90b45
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/table_share.png differ
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 005c81f..fddc050 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
@@ -90,7 +90,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
*/
public String getDevelopmentUser() {
String user = "test.user";
- //user = "massimiliano.assante";
+ user = "massimiliano.assante";
return user;
}
public UserInfo getUserInfo() {
@@ -256,17 +256,17 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
/**
*
* @param type the type to look for
- * @return the Category if there is correspodance, null otherwise
+ * @return the Category if there is correspondance, null otherwise
*/
private Properties getCategoriesByType() {
Properties props = new Properties();
try {
ServletContext servletContext = getServletContext();
String contextPath = servletContext.getRealPath(File.separator);
- String propertyfile = contextPath + "conf" + File.separator + TYPE_CATEGORIES_FILENAME;
+ String propertyfile = contextPath + File.separator + "conf" + File.separator + TYPE_CATEGORIES_FILENAME;
File propsFile = new File(propertyfile);
FileInputStream fis = new FileInputStream(propsFile);
- props.load( fis);
+ props.load(fis);
return props;
}
//catch exception in case properties file does not exist
@@ -281,10 +281,11 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
*/
private Properties getLabelsByType() {
Properties props = new Properties();
+ String propertyfile = "";
try {
ServletContext servletContext = getServletContext();
String contextPath = servletContext.getRealPath(File.separator);
- String propertyfile = contextPath + "conf" + File.separator + TYPE_LABELS_FILENAME;
+ propertyfile = contextPath + File.separator + "conf" + File.separator + TYPE_LABELS_FILENAME;
File propsFile = new File(propertyfile);
FileInputStream fis = new FileInputStream(propsFile);
props.load( fis);
@@ -292,7 +293,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
}
//catch exception in case properties file does not exist
catch(IOException e) {
- _log.error(TYPE_LABELS_FILENAME + "file not found under conf dir, returning null");
+ _log.error(TYPE_LABELS_FILENAME + "file not found under conf dir, returning null propertyfile -> " + propertyfile);
return null;
}
}
@@ -305,7 +306,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
try {
ServletContext servletContext = getServletContext();
String contextPath = servletContext.getRealPath(File.separator);
- String propertyfile = contextPath + "conf" + File.separator + TYPE_DESCRIPTIONS_FILENAME;
+ String propertyfile = contextPath + File.separator +"conf" + File.separator + TYPE_DESCRIPTIONS_FILENAME;
File propsFile = new File(propertyfile);
FileInputStream fis = new FileInputStream(propsFile);
props.load( fis);
diff --git a/src/main/resources/org/gcube/portlets/user/notifications/Notifications.gwt.xml b/src/main/resources/org/gcube/portlets/user/notifications/Notifications.gwt.xml
index 5471073..01fc0e5 100644
--- a/src/main/resources/org/gcube/portlets/user/notifications/Notifications.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/notifications/Notifications.gwt.xml
@@ -3,11 +3,12 @@
-
+
+
diff --git a/src/main/webapp/Notifications.css b/src/main/webapp/Notifications.css
index 51fd301..c7f348f 100644
--- a/src/main/webapp/Notifications.css
+++ b/src/main/webapp/Notifications.css
@@ -78,9 +78,9 @@ a.link:hover {
}
.single-notification-table {
- width: 100%;
+ width: 920px;
padding: 5px;
- border-top: 1px solid #EFEFEF;
+ border-bottom: 1px solid #EFEFEF;
}
@@ -98,7 +98,7 @@ a.link:hover {
.notification-photo {
display: block;
padding: 2px;
- border: 1px solid #E6E6E6;
+ border: none;
}
.user-notification-time {
diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties
index 3c9d8ec..c5d35c3 100644
--- a/src/main/webapp/conf/categorybytype.properties
+++ b/src/main/webapp/conf/categorybytype.properties
@@ -1,10 +1,13 @@
-DOCUMENT_WORKFLOW_EDIT=Document Workflow
-DOCUMENT_WORKFLOW_VIEW=Document Workflow
-DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Document Workflow
-DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Document Workflow
-DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Document Workflow
-DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Document Workflow
-DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Document Workflow
+DOCUMENT_WORKFLOW_EDIT=Application: Document Workflow
+DOCUMENT_WORKFLOW_VIEW=Application: Document Workflow
+DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Application: Document Workflow
+DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Application: Document Workflow
+DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Application: Document Workflow
+DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Application: Document Workflow
+DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Application: Document Workflow
+TDM_TAB_RESOURCE_SHARE=Application: Tabular Data Manager
+TDM_RULE_SHARE=Application: Tabular Data Manager
+TDM_TEMPLATE_SHARE=Application: Tabular Data Manager
WP_FOLDER_SHARE=Workspace Sharing
WP_FOLDER_UNSHARE=Workspace Sharing
WP_ADMIN_UPGRADE=Workspace Sharing
@@ -24,4 +27,4 @@ MESSAGE=Social Networking
POST_ALERT=Social Networking
CALENDAR_ADDED_EVENT=Shared Calendars
CALENDAR_UPDATED_EVENT=Shared Calendars
-CALENDAR_DELETED_EVENT=Shared Calendars
\ No newline at end of file
+CALENDAR_DELETED_EVENT=Shared Calendars
diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties
index a9dc398..ee69bde 100644
--- a/src/main/webapp/conf/descbytype.properties
+++ b/src/main/webapp/conf/descbytype.properties
@@ -24,4 +24,7 @@ DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=A document workflow you created w
DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Someone completed his task on a document workflow where you still need to do yours
CALENDAR_ADDED_EVENT=Someone added a new event in one of your shared calendars
CALENDAR_UPDATED_EVENT=Someone edited an event in one of your shared calendars
-CALENDAR_DELETED_EVENT=Someone deleted an event in one of your shared calendars
\ No newline at end of file
+CALENDAR_DELETED_EVENT=Someone deleted an event in one of your shared calendars
+TDM_TAB_RESOURCE_SHARE=Sharing of Tabular Resources with you
+TDM_RULE_SHARE=Sharing of Tabular Data Manager Rules with you
+TDM_TEMPLATE_SHARE=Sharing of Tabular Data Manager Templates with you
\ No newline at end of file
diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties
index 0b1a547..f79fe84 100644
--- a/src/main/webapp/conf/labelbytype.properties
+++ b/src/main/webapp/conf/labelbytype.properties
@@ -18,6 +18,9 @@ POST_ALERT=Post Alerts
CALENDAR_ADDED_EVENT=Added events
CALENDAR_UPDATED_EVENT=Edited events
CALENDAR_DELETED_EVENT=Deleted events
+TDM_TAB_RESOURCE_SHARE=Shared Tabular Resource
+TDM_RULE_SHARE=Shared Tabular Data Manager Rule
+TDM_TEMPLATE_SHARE=Shared Tabular Data Manager Template
DOCUMENT_WORKFLOW_EDIT=Edit
DOCUMENT_WORKFLOW_VIEW=View
DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Task request
@@ -25,3 +28,4 @@ DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Involvement request
DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Forward
DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Step completed
DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Forward from peer
+
| |