From f0f2523e79e10fc6bf8c734c8c6866843ac3b9a8 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Fri, 22 Sep 2017 12:52:03 +0000 Subject: [PATCH] limited height of bootstrap modal git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/message-conversations@154423 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/message_conversations/client/Utils.java | 1 + .../client/ui/AttachmentMenu.java | 13 +++++++------ .../client/ui/WriteMessage.java | 2 +- src/main/webapp/MessageConversations.css | 4 ++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/Utils.java b/src/main/java/org/gcube/portets/user/message_conversations/client/Utils.java index e8db66c..6745f94 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/Utils.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/Utils.java @@ -12,6 +12,7 @@ import gwt.material.design.client.constants.Color; public class Utils { public static DateTimeFormat fmCurrentYear = DateTimeFormat.getFormat("MMM d H:mm"); public static DateTimeFormat fmPastYears = DateTimeFormat.getFormat("MMM d H:mm ''yy"); + public static String ID_MODALBOOTSTRAP = "wpTreepopup"; public static String getServiceEntryPoint() { return "/delegate/"+MessageConversations.ARTIFACT_ID; diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/AttachmentMenu.java b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/AttachmentMenu.java index e5e39eb..f8a56ee 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/AttachmentMenu.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/AttachmentMenu.java @@ -1,6 +1,7 @@ package org.gcube.portets.user.message_conversations.client.ui; import org.gcube.portets.user.message_conversations.client.MessageServiceAsync; +import org.gcube.portets.user.message_conversations.client.Utils; import org.gcube.portets.user.message_conversations.shared.FileModel; import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSaveNotification.WorskpaceExplorerSaveNotificationListener; import org.gcube.portlets.widgets.wsexplorer.client.save.WorkspaceExplorerSaveDialog; @@ -93,15 +94,15 @@ public class AttachmentMenu extends Composite { @UiHandler("saveWSButton") void onSave2WS(ClickEvent e) { - final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog(item.getName(), true); - navigator.addStyleName("BS-Navigator");; - navigator.getElement().getStyle().setLeft(50, Unit.PCT); + final WorkspaceExplorerSaveDialog wpTreepopup = new WorkspaceExplorerSaveDialog(item.getName(), true); + wpTreepopup.setId(Utils.ID_MODALBOOTSTRAP); + wpTreepopup.getElement().getStyle().setLeft(50, Unit.PCT); WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){ @Override public void onSaving(Item parent, String fileName) { GWT.log("onSaving parent: "+parent +", fileName" +fileName); - navigator.hide(); + wpTreepopup.hide(); MaterialLoader.showProgress(true, parentButton); convService.saveAttachmentToWorkspaceFolder(item.getIdentifier(), parent.getId(), new AsyncCallback() { @Override @@ -128,7 +129,7 @@ public class AttachmentMenu extends Composite { } }; - navigator.addWorkspaceExplorerSaveNotificationListener(listener); - navigator.show(); + wpTreepopup.addWorkspaceExplorerSaveNotificationListener(listener); + wpTreepopup.show(); } } diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java index 8cd3664..1b83dca 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java @@ -54,7 +54,6 @@ public class WriteMessage extends Composite { @UiField MaterialPanel mainPanel; @UiField MaterialTextBox txtBoxSubject; - // @UiField MaterialWindow modal; @UiField MaterialAutoComplete acModal; @UiField MaterialButton btnSendModal, btnCloseModal; @UiField MaterialPanel modalContent, sendingLoader; @@ -199,6 +198,7 @@ public class WriteMessage extends Composite { } FilterCriteria criteria = null; final WorkspaceExplorerSelectDialog wpTreepopup = new WorkspaceExplorerSelectDialog("Select an item", criteria, types); + wpTreepopup.setId(Utils.ID_MODALBOOTSTRAP); wpTreepopup.getElement().getStyle().setLeft(50, Unit.PCT); wpTreepopup.setZIndex(10010); WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { diff --git a/src/main/webapp/MessageConversations.css b/src/main/webapp/MessageConversations.css index 20f90fd..affa918 100644 --- a/src/main/webapp/MessageConversations.css +++ b/src/main/webapp/MessageConversations.css @@ -1,3 +1,7 @@ +#wpTreepopup > div.modal-body { + height: 350px; +} + .unread-message { border-left: 3px solid #2196f3; }