From fd855668cf133ddb0a2f24fcfb7b485c70864a79 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Mon, 28 Oct 2019 11:18:26 +0000 Subject: [PATCH] removed the set unread option and visibility for sent messages, fixed some graphic issues related to the updated gwt material version git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/message-conversations@182151 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ui/ApplicationView.ui.xml | 2 +- .../message_conversations/client/ui/DisplayMessage.ui.xml | 2 +- .../user/message_conversations/client/ui/MessageItem.java | 8 +++++--- src/main/webapp/MessageConversations.css | 7 +++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.ui.xml b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.ui.xml index 1c7cf8f..a9fb246 100755 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.ui.xml +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.ui.xml @@ -22,7 +22,7 @@ .marginTop { margin-top: 0px; - min-height: 600px; + min-height: 850px; } .overflowXHidden { diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/DisplayMessage.ui.xml b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/DisplayMessage.ui.xml index cd8d5f9..ddfac3b 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/DisplayMessage.ui.xml +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/DisplayMessage.ui.xml @@ -22,7 +22,7 @@ textColor="BLUE" paddingLeft="0" /> - + diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/MessageItem.java b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/MessageItem.java index 30d410a..7478eb0 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/MessageItem.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/MessageItem.java @@ -21,7 +21,6 @@ import com.google.gwt.user.client.Random; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; -import gwt.material.design.client.base.TransitionConfig; import gwt.material.design.client.constants.Color; import gwt.material.design.client.ui.MaterialCollection; import gwt.material.design.client.ui.MaterialCollectionItem; @@ -57,7 +56,7 @@ public class MessageItem extends Composite { @UiField MaterialLabel timeLabel; @UiField MaterialIcon attachmentsIcon; @UiField MaterialIcon messageActionIcon; - + @UiField MaterialLink setUnreadButton; @UiField MaterialLink deleteButton; @UiField MaterialDropDown dd; @@ -73,8 +72,11 @@ public class MessageItem extends Composite { this.parentCollection = parentCollection; if (m.hasAttachments()) attachmentsIcon.setVisibility(Visibility.VISIBLE); - if (!m.isRead()) + if (!sent && !m.isRead()) item.addStyleName("unread-message"); + if (sent) + dd.remove(0); //remove the option to set unread if the message is sent + if (m.getOwner().getAvatarURL() == null || m.getOwner().getAvatarURL().compareTo("")== 0) { if (sent) avatarImage.setResource( diff --git a/src/main/webapp/MessageConversations.css b/src/main/webapp/MessageConversations.css index 8a80078..e803ba0 100644 --- a/src/main/webapp/MessageConversations.css +++ b/src/main/webapp/MessageConversations.css @@ -53,13 +53,20 @@ .message-metadata>div.message-sender h4 { font-size: 2.2em; font-weight: 500 !important; + margin-top: 20px !important; } +.message-metadata>div.message-subject h4 { + margin-top: 20px !important; +} + + .message-metadata>div.message-recipients h4 { font-size: 1.6em; color: #555; padding-bottom: 5px; border-bottom: 1px solid grey; + margin-top: 20px !important; } .gwt-SuggestBoxPopup .item-selected {