From ec72a5dc7c64ff1a1bc5d895e6f54b17b02b2f90 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Tue, 4 Mar 2014 23:39:11 +0000 Subject: [PATCH] enabled the post alert to users of a VRE when posting in to a VRE and in the settings git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@92659 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../view/templates/SingleNotificationView.java | 3 +++ .../view/templates/images/NotificationImages.java | 3 +++ .../client/view/templates/images/post-alert.png | Bin 0 -> 763 bytes src/main/webapp/Notifications.css | 10 +++------- src/main/webapp/conf/categorybytype.properties | 1 + src/main/webapp/conf/descbytype.properties | 1 + src/main/webapp/conf/labelbytype.properties | 1 + 7 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/post-alert.png 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 2dd40b5..3961d1c 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 @@ -76,6 +76,7 @@ public class SingleNotificationView extends Composite { case LIKE: case COMMENT: case OWN_COMMENT: + case POST_ALERT: goApp.setHTML(" See this Post."); break; case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK: @@ -163,6 +164,8 @@ public class SingleNotificationView extends Composite { return images.calendarEdit(); case CALENDAR_DELETED_EVENT: return images.calendarDelete(); + case POST_ALERT: + return images.postAlert(); 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 6106524..05351c7 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 @@ -4,6 +4,9 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; public interface NotificationImages extends ClientBundle { + @Source("post-alert.png") + ImageResource postAlert(); + @Source("comment.png") ImageResource comment(); diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/post-alert.png b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/post-alert.png new file mode 100644 index 0000000000000000000000000000000000000000..b97b74a61482843875cf6c6285a94e465d7fa913 GIT binary patch literal 763 zcmV&LQBys3I*#Q;G*3W zx^9{j7e*=RQdbRP%%XqcJmgX71cO?{SftF?yCS=l5`)^PWfXUJYDc zy9A5@LvLRNL}o#z9{$lid9Ys{0K0)1;6zK(psT~8$x?)&u$!;4^)jGT3K3)xk+XAC zN8E-$4bEDoO7$O)ak4i`Iu*ey3AvRD?q-M|2(R`+)}Iy8TJIv_%>DVXYt{ysu}qaZ z^=XWFRB?7V*% zITq*Hi-3_ImO(Tk8UxW-CX_2exuPkSb;JMg7dCf)`G}6R;-_ENC={z?+AId01fr`@ z7w`kY_l2^rxo~5HuYX)+;_sILByEEmS27g53J(_c0C0M3kSd@t1;O(|6oRg5#=mJL zX&X$;Y*X+8#z)(6dTlakgPiNZU@JYHv6_H^f#}(M!KYLT7&+a{nSo{oPbL^Y{{eUI zJ#W~_w3%d=UIUQ#!rFoASrgGyK`2AJdzwV-;E@WVtK?Qn^mN536nt`Sfpgauc)DFi zDHD(>1<-$SDGPEU(`GV0+D@|_;rG8b$u8}Yv=tp~7Rzn{L<52{ED%|IG~MUy3tafG z8zd{DQ%JSes2g8ZUl=HqG7;DXaptG{T?1h5)+errc0d*z5fj;m8=zH#Ww8#wlg4`W tonN?w=rNEXMCwsS*pKu4bpJbXegpGrU<(?QRHpy{002ovPDHLkV1k0GURwYF literal 0 HcmV?d00001 diff --git a/src/main/webapp/Notifications.css b/src/main/webapp/Notifications.css index 328912a..e0072d4 100644 --- a/src/main/webapp/Notifications.css +++ b/src/main/webapp/Notifications.css @@ -19,7 +19,6 @@ div.portlet-content { vertical-align: middle; cursor: pointer; background-image: none; - border: 1px solid transparent; white-space: nowrap; -webkit-user-select: none; -moz-user-select: none; @@ -27,17 +26,14 @@ div.portlet-content { 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; + margin: 0 0 -20px 0; } .notification-btn:hover { - border-color: #6E8CCC; - background-color: #6E8CCC; - color: #FFF; + opacity: 0.8; + text-decoration: underline; } a.link,a.link:active,a.link:visited { diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties index a6f4e87..3a8e7d8 100644 --- a/src/main/webapp/conf/categorybytype.properties +++ b/src/main/webapp/conf/categorybytype.properties @@ -18,6 +18,7 @@ COMMENT=Social Networking MENTION=Social Networking LIKE=Social Networking 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 diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties index 57ada80..e8fc5a5 100644 --- a/src/main/webapp/conf/descbytype.properties +++ b/src/main/webapp/conf/descbytype.properties @@ -11,6 +11,7 @@ COMMENT=Someone replied too to a post you replied MENTION=Someone mentioned you in a post LIKE=Someone set favorite your post MESSAGE=Someone sent you a message +POST_ALERT=Someone shared a news and would like everyone to be notified about it DOCUMENT_WORKFLOW_EDIT=A document workflow you created was editeded DOCUMENT_WORKFLOW_VIEW=A document workflow you created was viewed DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Someone requested you to perform a task on his document workflow diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties index 04ac50a..32006c9 100644 --- a/src/main/webapp/conf/labelbytype.properties +++ b/src/main/webapp/conf/labelbytype.properties @@ -11,6 +11,7 @@ COMMENT=Replies MENTION=Mentions LIKE=Favorites MESSAGE=Messages +POST_ALERT=Post Alerts CALENDAR_ADDED_EVENT=Added events CALENDAR_UPDATED_EVENT=Edited events CALENDAR_DELETED_EVENT=Deleted events