From b74feb52538ed7a9a4873fb45c6bfcee34c1ea3d Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Mon, 29 Sep 2014 16:48:55 +0000 Subject: [PATCH] added unshare folder handling git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@100268 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../view/templates/SingleNotificationView.java | 8 +++----- .../templates/images/NotificationImages.java | 3 +++ .../view/templates/images/unshare_blue.png | Bin 0 -> 1613 bytes src/main/webapp/conf/categorybytype.properties | 1 + src/main/webapp/conf/descbytype.properties | 1 + src/main/webapp/conf/labelbytype.properties | 1 + 7 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/unshare_blue.png 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 0000000000000000000000000000000000000000..d669d7a30cfc792021f927b3480a21e29536c724 GIT binary patch literal 1613 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=GrHg@yv$LBCFpLciT}_-UT^-#FER76}oGgu8 zjf`P>UGkGlb5rw5V0u&FdV%_J=>;W)+ybD@E~!PCWvMA{Mftf3U@u!`;&zJ*PV=C8 zQ*gS)*%hZ=eV}9XK@p1-(J&!k>H#s~$ri|gC;ZerU}`S{ChJdXN4_&KFdg)CaSW-r zwIn#!Bg9d{*0}op-M#PDt^9d?SJaB#vo^KtW0|Sn8qg$`;^LApAxOY2|DrdiW2%e& zc}IT7F9G~)shN8vTJ$=lG*a2rCe_d0wR`8T@9E2SmiunwsLFUSo4a`b`H3QlDLI0JQxjD z{L|4gKA2l@&gb>aDDKl%x15Cf!YnsVc(B7dtARtose_kzyDWb zJT!4(rEqB-r(th$_W$6J6*A9aM0~p@+$febyxBbYlSoC&q30nYns*ChD+)gEZTp~e z__=7?8CzM4OLsd@o#4@_pB*U@b3O6Zv}T^eZJ+M41%$TqDsZxWRQZr{sNu~9pR-3Y zYSqu#?QYpS`EbLs#_o?1J8R|a?Mh?bZ#*u+*B_v#H{ok@m##D0kr@lQezZI}_GA@{ zvQVpFeEZH-2YoUk)bvgqU3#aE`{{0e5z#sCB|lX1)`w*LFP*w_<>H4AU1ffM&?;TY zanoc@S6iaz&kW`_JZvA0XI0^ZZr&t;ucLK6Up_F@wN literal 0 HcmV?d00001 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