diff --git a/pom.xml b/pom.xml index 6f1d0d4..be79183 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user notifications war - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT gCube Notifications Portlet 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 9e4f24b..b5a61ff 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 @@ -100,6 +100,7 @@ public class SingleNotificationView extends Composite { goApp.setHTML(" See Users Activity."); break; case WP_FOLDER_SHARE: + case WP_FOLDER_UNSHARE: case WP_FOLDER_ADDEDUSER: case WP_FOLDER_REMOVEDUSER: case WP_FOLDER_RENAMED: @@ -128,17 +129,14 @@ public class SingleNotificationView extends Composite { case MESSAGE: return images.message(); case WP_FOLDER_ADDEDUSER: - return images.share(); case WP_FOLDER_REMOVEDUSER: - return images.share(); case WP_FOLDER_SHARE: - return images.share(); case WP_ITEM_NEW: - return images.share(); case WP_ITEM_DELETE: - return images.share(); case WP_ITEM_UPDATED: return images.share(); + case WP_FOLDER_UNSHARE: + return images.unshare(); case OWN_COMMENT: return images.comment(); case REQUEST_CONNECTION: 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 05351c7..dc77208 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 @@ -31,6 +31,9 @@ public interface NotificationImages extends ClientBundle { @Source("share_blue.png") ImageResource share(); + @Source("unshare_blue.png") + ImageResource unshare(); + @Source("connection_new.png") ImageResource connectionRequest(); diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/unshare_blue.png b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/unshare_blue.png new file mode 100644 index 0000000..d669d7a Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/unshare_blue.png differ diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties index 3a8e7d8..ebdfe63 100644 --- a/src/main/webapp/conf/categorybytype.properties +++ b/src/main/webapp/conf/categorybytype.properties @@ -6,6 +6,7 @@ DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Document Workflow DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Document Workflow DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Document Workflow WP_FOLDER_SHARE=Workspace Sharing +WP_FOLDER_UNSHARE=Workspace Sharing WP_FOLDER_ADDEDUSER=Workspace Sharing WP_FOLDER_REMOVEDUSER=Workspace Sharing WP_FOLDER_RENAMED=Workspace Sharing diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties index ddfe221..a2e19fa 100644 --- a/src/main/webapp/conf/descbytype.properties +++ b/src/main/webapp/conf/descbytype.properties @@ -1,4 +1,5 @@ WP_FOLDER_SHARE=Sharing of workspace folders with you +WP_FOLDER_UNSHARE=Someone unshared a folder of yours form his workspace WP_FOLDER_ADDEDUSER=Someone added users one to one of your workspace shared folder WP_FOLDER_REMOVEDUSER=Someone removed users from one of your workspace shared folder WP_FOLDER_RENAMED=Someone renamed one of your workspace shared folder diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties index 32006c9..4505e1b 100644 --- a/src/main/webapp/conf/labelbytype.properties +++ b/src/main/webapp/conf/labelbytype.properties @@ -1,4 +1,5 @@ WP_FOLDER_SHARE=Shared folder +WP_FOLDER_UNSHARE=Unshared folder WP_FOLDER_ADDEDUSER=User added to shared folder WP_FOLDER_REMOVEDUSER=User removed from shared folder WP_FOLDER_RENAMED=Shared folder renamed