gCubeSystem
/
Messages
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below 

Incident #17778 direct download attachment does not work<

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/message-conversations@182129 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2019-10-25 12:04:12 +00:00
parent 22a56928fb
commit 9146f45207
6 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distro/changelog.xml
View File

@ -1,4 +1,9 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-user.messages.2-4-0"
date="2019-10-25">
<Change>Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below</Change>
<Change>Incident #17778 direct download attachment does not work</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.messages.2-3-0" <Changeset component="org.gcube.portlets-user.messages.2-3-0"
date="2019-02-28"> date="2019-02-28">
<Change>Feature #10068, Request for enhancement: new Messages is error prone and challenging to use</Change> <Change>Feature #10068, Request for enhancement: new Messages is error prone and challenging to use</Change>

8
pom.xml
View File

@ -25,12 +25,12 @@
<properties> <properties>
<!-- Convenience property to set the GWT version --> <!-- Convenience property to set the GWT version -->
<gwt.version>2.8.1</gwt.version> <gwt.version>2.8.2</gwt.version>
<distroDirectory>distro</distroDirectory> <distroDirectory>distro</distroDirectory>
<!-- GWT 2.8 requires 1.8 --> <!-- GWT 2.8 requires 1.8 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<gwt-material.version>2.0-rc6</gwt-material.version> <gwt-material.version>2.0.1</gwt-material.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@ -246,7 +246,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId> <artifactId>gwt-maven-plugin</artifactId>
<version>2.8.1</version> <version>${gwt.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -278,7 +278,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version> <version>3.2.3</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

7
src/main/java/org/gcube/portets/user/message_conversations/client/autocomplete/MaterialAutoComplete.java
View File

@ -18,6 +18,7 @@ import gwt.material.design.client.constants.IconType;
import gwt.material.design.client.constants.ProgressType; import gwt.material.design.client.constants.ProgressType;
import gwt.material.design.client.ui.MaterialChip; import gwt.material.design.client.ui.MaterialChip;
import gwt.material.design.client.ui.MaterialLabel; import gwt.material.design.client.ui.MaterialLabel;
import gwt.material.design.client.ui.MaterialProgress;
import gwt.material.design.client.ui.html.Label; import gwt.material.design.client.ui.html.Label;
import gwt.material.design.client.ui.html.ListItem; import gwt.material.design.client.ui.html.ListItem;
import gwt.material.design.client.ui.html.UnorderedList; import gwt.material.design.client.ui.html.UnorderedList;
@ -703,4 +704,10 @@ public class MaterialAutoComplete extends AbstractValueWidget<List<? extends Sug
public SuggestBox getSuggestBox() { public SuggestBox getSuggestBox() {
return suggestBox; return suggestBox;
} }
@Override
public MaterialProgress getProgress() {
// TODO Auto-generated method stub
return null;
}
} }

1
src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.ui.xml
View File

@ -22,6 +22,7 @@
.marginTop { .marginTop {
margin-top: 0px; margin-top: 0px;
min-height: 800px;
} }
.overflowXHidden { .overflowXHidden {

6
src/main/java/org/gcube/portets/user/message_conversations/client/ui/AttachmentMenu.java
View File

@ -103,16 +103,16 @@ public class AttachmentMenu extends Composite {
public void onSaving(Item parent, String fileName) { public void onSaving(Item parent, String fileName) {
GWT.log("onSaving parent: "+parent +", fileName" +fileName); GWT.log("onSaving parent: "+parent +", fileName" +fileName);
wpTreepopup.hide(); wpTreepopup.hide();
MaterialLoader.showProgress(true, parentButton); MaterialLoader.progress(true, parentButton);
convService.saveAttachmentToWorkspaceFolder(item.getIdentifier(), parent.getId(), new AsyncCallback<Boolean>() { convService.saveAttachmentToWorkspaceFolder(item.getIdentifier(), parent.getId(), new AsyncCallback<Boolean>() {
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
MaterialLoader.showProgress(false, parentButton); MaterialLoader.progress(false, parentButton);
MaterialToast.fireToast("Warning: could not save this file to the selected Workspace folder, please retry", "rounded"); MaterialToast.fireToast("Warning: could not save this file to the selected Workspace folder, please retry", "rounded");
} }
@Override @Override
public void onSuccess(Boolean result) { public void onSuccess(Boolean result) {
MaterialLoader.showProgress(false, parentButton); MaterialLoader.progress(false, parentButton);
MaterialToast.fireToast("File " +fileName+" Saved succesfully"); MaterialToast.fireToast("File " +fileName+" Saved succesfully");
} }
}); });

27
src/main/webapp/MessageConversations.css
View File

@ -1,34 +1,36 @@
/* Customisation to avoid bootstrap and material clashes for modal*/ /* Customisation to avoid bootstrap and material clashes for modal*/
#wpTreepopup > div.modal-header > h3 { #wpTreepopup>div.modal-header>h3 {
font-size: 1.5em; font-size: 1.5em;
line-height: 20px; line-height: 20px;
} }
#wpTreepopup > div.modal-body { #wpTreepopup>div.modal-body {
height: 280px; height: 280px;
padding: 3px; padding: 3px;
} }
#wpTreepopup > div.modal-body > table > tbody > tr:nth-child(1) > td { #wpTreepopup>div.modal-body>table>tbody>tr:nth-child (1) >td {
padding: 0px; padding: 0px;
} }
#wpTreepopup > div.modal-body div.breadcrumbs-navigator > div > ul{ #wpTreepopup>div.modal-body div.breadcrumbs-navigator>div>ul {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
#wpTreepopup > div.modal-footer div.htmlSaveName {
#wpTreepopup>div.modal-footer div.htmlSaveName {
display: none; display: none;
} }
#wpTreepopup > div.modal-footer > input { #wpTreepopup>div.modal-footer>input {
margin: 0px; margin: 0px;
height: 20px; height: 20px;
} }
/* END Customisation to avoid bootstrap and material clashes for modal*/ /* END Customisation to avoid bootstrap and material clashes for modal*/
.unread-message { .unread-message {
border-left: 3px solid #2196f3; border-left: 5px solid #2196f3;
} font-weight: 500;
}
.collection .collection-item.active { .collection .collection-item.active {
background-color: #0277bd !important; background-color: #0277bd !important;
@ -42,18 +44,18 @@
color: #ccc !important; color: #ccc !important;
} }
.message-metadata > div:not(.empty-state) h4 { .message-metadata>div:not (.empty-state ) h4 {
font-size: 2em; font-size: 2em;
margin-top: 10px !important; margin-top: 10px !important;
font-weight: 400 !important; font-weight: 400 !important;
} }
.message-metadata > div.message-sender h4 { .message-metadata>div.message-sender h4 {
font-size: 2.2em; font-size: 2.2em;
font-weight: 500 !important; font-weight: 500 !important;
} }
.message-metadata > div.message-recipients h4 { .message-metadata>div.message-recipients h4 {
font-size: 1.6em; font-size: 1.6em;
color: #555; color: #555;
padding-bottom: 5px; padding-bottom: 5px;
@ -62,8 +64,8 @@
.gwt-SuggestBoxPopup .item-selected { .gwt-SuggestBoxPopup .item-selected {
color: #1565c0 !important; color: #1565c0 !important;
} }
.breadcrumb { .breadcrumb {
padding: 2px 10px; padding: 2px 10px;
} }
@ -71,4 +73,3 @@
div.modal.BS-Navigator.in div.modal-body { div.modal.BS-Navigator.in div.modal-body {
height: 300px; height: 300px;
} }