From 6b32f6bcc5199ce9d8108ac4218630818ac46be9 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 8 Jul 2015 13:17:06 +0000 Subject: [PATCH] 256: Workspace explorer Task-Url: https://support.d4science.org/issues/256 Fixed Css git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@117084 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../save/WorkspaceExplorerSaveDialog.java | 19 ++++++++++++++++--- .../save/WorkspaceExplorerSavePanel.java | 15 +++++++++++++-- .../wsexplorer/public/workspace-explorer.css | 8 ++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java index 88dc866..5f1dd7d 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java @@ -26,6 +26,7 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.ValueBoxBase.TextAlignment; @@ -39,7 +40,6 @@ public class WorkspaceExplorerSaveDialog extends Modal implements HasWorskpaceEx private Button saveButton; private boolean isSave = false; - private WorkspaceExplorerSaveDialog INSTANCE = this; private String captionTxt; private ModalFooter footer = new ModalFooter(); private WorkspaceExplorerController controller = new WorkspaceExplorerController(); @@ -153,7 +153,6 @@ public class WorkspaceExplorerSaveDialog extends Modal implements HasWorskpaceEx Window.alert("Destination folder "+WorkspaceExplorerConstants.WORKSPACE_MY_SPECIAL_FOLDERS_PATH+" is not valid!"); return; } - INSTANCE.hide(); notifySaving(itemB, getFileName()); isSave = true; }else @@ -161,11 +160,18 @@ public class WorkspaceExplorerSaveDialog extends Modal implements HasWorskpaceEx } } }); + +// HorizontalPanel hpFileName = new HorizontalPanel(); +// hpFileName.add(new Label("Name:")); +// hpFileName.add(fileNameTextBox); + fileNameTextBox.addStyleName("fileNameTextBox"); fileNameTextBox.setAlignment(TextAlignment.LEFT); setFileName(fileName); + HTML name = new HTML("Name:"); + name.addStyleName("htmlSaveName"); + footer.add(name); footer.add(fileNameTextBox); - footer.add(saveButton); add(footer); @@ -295,6 +301,13 @@ public class WorkspaceExplorerSaveDialog extends Modal implements HasWorskpaceEx super.show(); isSave = false; } + + /** + * @return the saveButton + */ + public Button getSaveButton() { + return saveButton; + } /** * Set which items are selectable. diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSavePanel.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSavePanel.java index d5f71a6..c77991d 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSavePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSavePanel.java @@ -24,6 +24,7 @@ import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.ValueBoxBase.TextAlignment; @@ -41,7 +42,6 @@ public class WorkspaceExplorerSavePanel extends ScrollPanel implements HasWorskp private Button saveButton; @SuppressWarnings("unused") private boolean isSave = false; - private WorkspaceExplorerSavePanel INSTANCE = this; private WorkspaceExplorerController controller = new WorkspaceExplorerController(); private List listeners = new ArrayList(); private TextBox fileNameTextBox = new TextBox(); @@ -146,10 +146,14 @@ public class WorkspaceExplorerSavePanel extends ScrollPanel implements HasWorskp fileNameTextBox.getElement().getStyle().setMarginRight(10.0, Unit.PX); setFileName(fileName); + HTML name = new HTML("Name:"); + name.addStyleName("htmlSaveName"); + name.getElement().getStyle().setPaddingTop(7.0, Unit.PX); + footerHP.add(name); footerHP.add(fileNameTextBox); footerHP.add(saveButton); footerHP.addStyleName("footerHP"); - + mainVP.add(controller.getWorkspaceExplorerPanel()); mainVP.add(footerHP); @@ -277,6 +281,13 @@ public class WorkspaceExplorerSavePanel extends ScrollPanel implements HasWorskp private void setShowableTypes(ItemType... showableTypes) { controller.setShowableTypes(showableTypes); } + + /** + * @return the saveButton + */ + public Button getSaveButton() { + return saveButton; + } /* (non-Javadoc) * @see org.gcube.portlets.widgets.wsexplorer.client.notification.WorskpaceExplorerSaveNotification.HasWorskpaceExplorerSaveNotificationListener#addWorkspaceExplorerSaveNotificationListener(org.gcube.portlets.widgets.wsexplorer.client.notification.WorskpaceExplorerSaveNotification.WorskpaceExplorerSaveNotificationListener) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/public/workspace-explorer.css b/src/main/java/org/gcube/portlets/widgets/wsexplorer/public/workspace-explorer.css index 3a79d69..46931be 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/public/workspace-explorer.css +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/public/workspace-explorer.css @@ -28,6 +28,7 @@ .fileNameTextBox{ vertical-align: top !important; margin-right: 10px; + margin-left: 5px; } .footerHP{ @@ -35,6 +36,13 @@ float: right; } +.htmlSaveName { + display: inline; + font-size: 14px; + margin-right: 5px; + vertical-align: middle; +} + .savePanel{ border: 1px solid; padding-left: 15px;