From 536e557e19212d0e54d113dd193e5798a7aca0cb Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 28 Dec 2020 17:55:06 +0100 Subject: [PATCH] implemented the requirements reported in the task #20357 --- .../geoportaldataviewer/client/ui/ModalWindow.java | 10 +++++----- .../client/ui/images/ImageView.java | 6 ++++-- .../client/ui/images/ImageView.ui.xml | 8 ++++++-- .../geoportaldataviewer/client/ui/map/MapView.java | 4 +++- .../geoportaldataviewer/client/ui/map/MapView.ui.xml | 4 ++-- .../ui/products/concessioni/ConcessioneView.java | 7 +++++-- .../ui/products/concessioni/LayerConcessioneView.java | 2 +- .../products/concessioni/LayerConcessioneView.ui.xml | 8 +++----- 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/ModalWindow.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/ModalWindow.java index 9e5e2c6..b8e1896 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/ModalWindow.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/ModalWindow.java @@ -24,17 +24,17 @@ public class ModalWindow { * Instantiates a new modal window. * * @param title the title - * @param toAdd the to add - * @param toReturn the to return + * @param width the width + * @param maxHeight the max height */ - public ModalWindow(String title) { + public ModalWindow(String title, int width, int maxHeight) { modal = new Modal(false); modal.hide(false); modal.setTitle(title); modal.setCloseVisible(true); - modal.setWidth(900); - modal.setMaxHeigth(600+"px"); + modal.setWidth(width); + modal.setMaxHeigth(maxHeight+"px"); ModalFooter modalFooter = new ModalFooter(); final Button buttClose = new Button("Close"); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java index 2b3b6ec..bccd700 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java @@ -56,7 +56,9 @@ public class ImageView extends Composite { public ImageView(UploadedImageDV imageDV, final boolean showView, final boolean showOpen) { initWidget(uiBinder.createAndBindUi(this)); - heading.setText(imageDV.getTitolo()); + if(imageDV.getTitolo()!=null && !imageDV.getTitolo().isEmpty()) { + heading.setText(imageDV.getTitolo()); + } paragraph1.setText(imageDV.getDidascalia()); paragraph1.getElement().getStyle().setTextAlign(TextAlign.LEFT); @@ -103,7 +105,7 @@ public class ImageView extends Composite { if(latest!=null) { - ModalWindow mw = new ModalWindow(StringUtil.ellipsize(imageDV.getTitolo(), 20)); + ModalWindow mw = new ModalWindow(StringUtil.ellipsize(imageDV.getDidascalia(), 50), 900, 600); mw.add(new ImageView(imageDV, false, true)); mw.setCaller(ImageView.this); //mw.setWidth(900); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.ui.xml index a38389e..a28f0c2 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.ui.xml @@ -10,6 +10,10 @@ .float-right { float: right; } + + .margin-top-10 { + margin-top: 10px; + } @@ -17,8 +21,8 @@ Open - - + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.java index d3ad38e..98580ff 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.java @@ -55,10 +55,12 @@ import ol.OLFactory; * @param centerTo the center to * @param zoom the zoom */ - public MapView(Coordinate centerTo, int zoom) { + public MapView(Coordinate centerTo, int zoom, String internalMapWidth, String internalMapHeight) { initWidget(uiBinder.createAndBindUi(this)); String theMapId = "map"+Random.nextInt(); theMap.getElement().setId(theMapId); + theMap.setWidth(internalMapWidth); + theMap.setHeight(internalMapHeight); Scheduler.get().scheduleDeferred(new ScheduledCommand() { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.ui.xml index 379924b..27b1dbe 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/map/MapView.ui.xml @@ -3,8 +3,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui"> .internalMap { - width: 60%; - height: 260px; + height: 280px; display: inline-block; margin: 0 auto; /*float: right;*/ @@ -12,6 +11,7 @@ .map-style { width: 100%; text-align:center; + margin-top: 10px; margin-bottom: 20px; } 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 fb5da81..19fa3f9 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 @@ -27,6 +27,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; @@ -202,7 +203,9 @@ public class ConcessioneView extends Composite { ConcessioneView cv = new ConcessioneView(geonaItemRef, concessioneDV, false, openImageButtonVisible); cv.setViewDetailsButtonVisible(false); - ModalWindow mw = new ModalWindow(concessioneDV.getNome()); + int width = Window.getClientWidth()*75/100; + int height = Window.getClientHeight()*70/100; + ModalWindow mw = new ModalWindow(concessioneDV.getNome(), width, height); mw.add(cv); mw.setCaller(ConcessioneView.this); //mw.setWidth(900); @@ -300,7 +303,7 @@ public class ConcessioneView extends Composite { private void addCentroidMap() { Coordinate centerCoordinate = OLFactory.createCoordinate(GeoportalDataViewerConstants.ITALY_CENTER_LONG, GeoportalDataViewerConstants.ITALY_CENTER_LAT); Coordinate transformedCenterCoordinate = MapUtils.transformCoordiante(centerCoordinate, GeoportalDataViewerConstants.EPSG_4326, GeoportalDataViewerConstants.EPSG_3857); - MapView mapView = new MapView(transformedCenterCoordinate, GeoportalDataViewerConstants.LIGHT_MAP_ITALY_FIT_ZOOM_ON); + MapView mapView = new MapView(transformedCenterCoordinate, GeoportalDataViewerConstants.LIGHT_MAP_ITALY_FIT_ZOOM_ON, "70%", "300px"); if(concessioneDV!=null && concessioneDV.getCentroidLat()!=null && concessioneDV.getCentroidLong()!=null) { Coordinate coord = new Coordinate(concessioneDV.getCentroidLong(), concessioneDV.getCentroidLat()); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.java index 807e963..1ec2934 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.java @@ -46,7 +46,7 @@ public class LayerConcessioneView extends Composite { if(layerDV.getLayerName()!=null && layerDV.getWmsLink()!=null) { Coordinate centerCoordinate = OLFactory.createCoordinate(GeoportalDataViewerConstants.ITALY_CENTER_LONG, GeoportalDataViewerConstants.ITALY_CENTER_LAT); Coordinate transformedCenterCoordinate = MapUtils.transformCoordiante(centerCoordinate, GeoportalDataViewerConstants.EPSG_4326, GeoportalDataViewerConstants.EPSG_3857); - MapView mapView = new MapView(transformedCenterCoordinate, GeoportalDataViewerConstants.LIGHT_MAP_ITALY_FIT_ZOOM_ON); + MapView mapView = new MapView(transformedCenterCoordinate, GeoportalDataViewerConstants.LIGHT_MAP_ITALY_FIT_ZOOM_ON, "70%", "300px"); mapViewPanel.add(mapView); String mapServerHost = layerDV.getWmsLink().contains("?")? layerDV.getWmsLink().substring(0,layerDV.getWmsLink().indexOf("?")):layerDV.getWmsLink(); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.ui.xml index ec9b977..d9edf50 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/LayerConcessioneView.ui.xml @@ -7,13 +7,11 @@ .important { font-weight: bold; } - - + + - - - + \ No newline at end of file