From 276b3827dcf3fed3e7205ff6b5f42511b4427a9f Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 31 Jul 2015 12:24:26 +0000 Subject: [PATCH] 256: Workspace explorer Task-Url: https://support.d4science.org/issues/256 Added adjust size git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@117605 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/widgets/wsexplorer/client/Util.java | 16 ++++++++++++++++ .../client/save/WorkspaceExplorerSavePanel.java | 11 +++-------- .../select/WorkspaceExplorerSelectPanel.java | 14 +++----------- .../wsexplorer/resources/css/bootstrap.min.css | 4 ++-- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/Util.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/Util.java index ed38080..5029d6e 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/Util.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/Util.java @@ -7,7 +7,10 @@ import org.gcube.portlets.widgets.wsexplorer.client.resources.old.WorkspaceLight import org.gcube.portlets.widgets.wsexplorer.shared.Item; import org.gcube.portlets.widgets.wsexplorer.shared.ItemType; +import com.google.gwt.core.shared.GWT; +import com.google.gwt.dom.client.Element; import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.SimplePanel; /** * The Class Util. @@ -112,4 +115,17 @@ public class Util { return ""; } + public static void adjustSize(Element el, SimplePanel panel){ + if(el!=null){ + int heigth = el.getClientHeight(); + GWT.log("getClientHeight adjustSize el: "+heigth); + int offset = 85; + heigth = (heigth-offset>100)?heigth-offset:0; + if(heigth>0){ + GWT.log("set new Explorer size: "+heigth); + panel.setHeight(heigth+"px"); + } + } + } + } 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 ae4d982..97a2603 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 @@ -6,6 +6,7 @@ package org.gcube.portlets.widgets.wsexplorer.client.save; import java.util.ArrayList; import java.util.List; +import org.gcube.portlets.widgets.wsexplorer.client.Util; import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerController; import org.gcube.portlets.widgets.wsexplorer.client.event.ClickItemEvent; @@ -129,14 +130,8 @@ public class WorkspaceExplorerSavePanel extends ScrollPanel implements HasWorskp } private void adjustSize(){ - int heigth = this.getParent().getElement().getClientHeight(); - GWT.log("getClientHeight Resize Panel: "+heigth); - int offset = 80; - heigth = (heigth-offset>100)?heigth-offset:0; - if(heigth>0){ - GWT.log("set new Explorer size: "+heigth); - controller.getWsExplorer().getPanel().setHeight(heigth+"px"); - } + if(this.getParent()!=null && this.getParent().getElement()!=null) + Util.adjustSize(this.getParent().getElement(), controller.getWsExplorer().getPanel()); } /** diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java index cc309e1..e396b6d 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java @@ -6,6 +6,7 @@ package org.gcube.portlets.widgets.wsexplorer.client.select; import java.util.ArrayList; import java.util.List; +import org.gcube.portlets.widgets.wsexplorer.client.Util; import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerController; import org.gcube.portlets.widgets.wsexplorer.client.event.ClickItemEvent; @@ -81,9 +82,6 @@ public class WorkspaceExplorerSelectPanel extends ScrollPanel implements HasWors }); } - /* (non-Javadoc) - * @see com.google.gwt.user.client.ui.ScrollPanel#onResize() - */ @Override public void onResize() { super.onResize(); @@ -103,14 +101,8 @@ public class WorkspaceExplorerSelectPanel extends ScrollPanel implements HasWors } private void adjustSize(){ - int heigth = this.getParent().getElement().getClientHeight(); - GWT.log("getClientHeight Resize Panel: "+heigth); - int offset = 80; - heigth = (heigth-offset>100)?heigth-offset:0; - if(heigth>0){ - GWT.log("set new Explorer size: "+heigth); - controller.getWsExplorer().getPanel().setHeight(heigth+"px"); - } + if(this.getParent()!=null && this.getParent().getElement()!=null) + Util.adjustSize(this.getParent().getElement(), controller.getWsExplorer().getPanel()); } /** diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/resources/css/bootstrap.min.css b/src/main/java/org/gcube/portlets/widgets/wsexplorer/resources/css/bootstrap.min.css index 62fe772..9f4a947 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/resources/css/bootstrap.min.css +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/resources/css/bootstrap.min.css @@ -1239,9 +1239,9 @@ a:hover, a:focus { } .alert-custom { - margin-top: 10px; + margin-top: 5px; margin-bottom: 0 !important; - padding: 4px !important; + padding: 3px !important; } .fileNameTextBox{