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 0000000..b97b74a Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/post-alert.png differ 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