From 9920698d758417bab23b5bebeaa72036e17e5557 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 18 Nov 2020 15:35:24 +0100 Subject: [PATCH] improved the css --- .../client/GeoportalDataViewer.java | 38 ++++++++++++++----- .../client/ui/GeonaDataViewMainPanel.java | 14 +++++-- .../client/ui/GeonaDataViewMainPanel.ui.xml | 30 +++++++-------- .../products/concessioni/ConcessioneView.java | 1 - src/main/webapp/GeoportalDataViewer.css | 24 ++++++++++-- 5 files changed, 74 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java index c86f2a4..254b3f7 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java @@ -14,6 +14,8 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.event.logical.shared.ResizeEvent; +import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -66,7 +68,7 @@ public class GeoportalDataViewer implements EntryPoint { */ public void onModuleLoad() { - mainPanel = new GeonaDataViewMainPanel(eventBus, 600); + mainPanel = new GeonaDataViewMainPanel(eventBus, getClientHeight()); RootPanel.get(APP_DIV).add(mainPanel); @@ -78,17 +80,16 @@ public class GeoportalDataViewer implements EntryPoint { olMapMng = new OLMapManager(mainPanel.getMapPanel().getElement().getId(),layerManager.getEventBus()); layerManager.setOlMap(olMapMng.getOLOSMMap()); mainPanel.setMap(olMapMng.getOLOSMMap()); - + updateSize(); } }); -// Window.addResizeHandler(new ResizeHandler() { -// @Override -// public void onResize(ResizeEvent event) { -// GWT.log("onWindowResized width: " + event.getWidth() + " height: " + event.getHeight()); -// mainPanel.setMapHeight(event.getHeight() - 200); -// } -// }); + Window.addResizeHandler(new ResizeHandler() { + @Override + public void onResize(ResizeEvent event) { + updateSize(); + } + }); paramWmsRequest = Window.Location.getParameter(GeoportalDataViewerConstants.GET_WMS_PARAMETER); paramGeonaItemType = Window.Location.getParameter(GeoportalDataViewerConstants.GET_GEONA_ITEM_TYPE); @@ -160,6 +161,25 @@ public class GeoportalDataViewer implements EntryPoint { bindEvents(); } + /** + * Update window size. + */ + public void updateSize() { + + int rootHeight = getClientHeight(); + int height = rootHeight; + mainPanel.setPanelsHeight(height); + GWT.log("Set height: "+height); + + } + + public int getClientHeight() { + RootPanel principalDiv = RootPanel.get(APP_DIV); + int topBorder = principalDiv.getAbsoluteTop(); + int rootHeight = Window.getClientHeight() - topBorder; + return rootHeight; + } + /** * Bind events. */ diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java index 70f45c1..079cf1b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java @@ -34,7 +34,11 @@ public class GeonaDataViewMainPanel extends Composite { // Tab mapTabPanel; @UiField - HTMLPanel mainTabPanel; + HTMLPanel mainContainerPanel; + + @UiField + HTMLPanel mainToolBar; + @UiField NavLink dataPointSelection; @@ -66,7 +70,7 @@ public class GeonaDataViewMainPanel extends Composite { this.eventBus = eventBus; mapPanel = new MapPanel(mapHeight+"px"); detailsPanel.setHeight(mapHeight+"px"); - mainTabPanel.add(mapPanel); + mainContainerPanel.add(mapPanel); bindHandlers(); dataPointSelection.setIcon(IconType.SCREENSHOT); dataBoxSelection.setIcon(IconType.BOOKMARK); @@ -74,8 +78,10 @@ public class GeonaDataViewMainPanel extends Composite { removeQuery.setIcon(IconType.REMOVE); } - public void setMapHeight(int height) { - mapPanel.setHeight(height + "px"); + public void setPanelsHeight(int height) { + String toH = height + "px"; + mapPanel.setMapHeight(height); + detailsPanel.setHeight(toH); } public MapPanel getMapPanel() { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml index 184b7e1..418294f 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml @@ -9,23 +9,21 @@ } - - - - - - Data Point - Selection - Data Box - Selection - - - + + + + + Data Point + Selection + Data Box + Selection + + + + - - diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java index 4693c3e..3daace4 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.java @@ -16,7 +16,6 @@ import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.Relazio import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.NavLink; import com.github.gwtbootstrap.client.ui.PageHeader; import com.github.gwtbootstrap.client.ui.Paragraph; import com.github.gwtbootstrap.client.ui.Thumbnails; diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css index 3ba1ae8..3ea05c8 100644 --- a/src/main/webapp/GeoportalDataViewer.css +++ b/src/main/webapp/GeoportalDataViewer.css @@ -1,8 +1,7 @@ /** Add css rules here for your application. */ /** Most GWT widgets already have a style name defined */ - body { - padding-top: 0px !important; + padding-top: 0px !important; } .gwt-DialogBox { @@ -169,13 +168,32 @@ body { right: 0px; background: #FFF; width: 725px; - margin-top: 30px; + /*margin-top: 30px;*/ padding-left: 5px; overflow-y: auto; transition: width 0.2s; + z-index: 1000; } .overlay { z-index: 1000; opacity: 0.9; +} + +.inner-toolbar { + position: absolute; + z-index: 500; + top: 8px; + left: 50px; +} + +.inner-toolbar .btn-link { + border: 1px solid #eee; + background-color: #fcfcfc; + text-align: center; + margin: 1px; +} +.inner-toolbar .btn-link:hover, .inner-toolbar .btn-link:focus { + background-color: #f3f3f3 !important; + text-decoration: none; } \ No newline at end of file