diff --git a/CHANGELOG.md b/CHANGELOG.md index d482602..1576d21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm #### Enhancements - [#24506] Added Locate/Highlight the Layer facility on the Map -- Moved to gwt 2.10 ## [v3.1.0] - 2023-01-12 diff --git a/README.md b/README.md index c9c2979..af49df6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The GeoPortal Data Viewer App is an application to access, discovery and navigat **Uses** -* GWT v.2.10.0. [GWT](http://www.gwtproject.org) is licensed under [Apache License 2.0](http://www.gwtproject.org/terms.html) +* GWT v.2.9.0. [GWT](http://www.gwtproject.org) is licensed under [Apache License 2.0](http://www.gwtproject.org/terms.html) * GWT-Bootstrap v.2.3.2.0. [GWT-Bootstrap](https://github.com/gwtbootstrap) is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) * GWT-OpenLayers 3+ v.8.1.0-gwt2_9. [GWT-OL3](https://github.com/TDesjardins/gwt-ol) * OpenLayers v.6.x [OpenLayers](https://openlayers.org/) is licensed under [BSD 2-Clause "Simplified"](https://github.com/openlayers/openlayers/blob/main/LICENSE.md) diff --git a/pom.xml b/pom.xml index d4dda5d..5f58c1d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ - 2.10.0 + 2.9.0 PRETTY 2.6.2 ${project.build.directory}/${project.build.finalName} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/locate_none.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/locate_none.png index 0874ff1..99fc09a 100644 Binary files a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/locate_none.png and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/locate_none.png differ diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java index f03581d..2952cc6 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java @@ -20,6 +20,7 @@ import com.github.gwtbootstrap.client.ui.constants.IconType; import com.github.gwtbootstrap.client.ui.constants.LabelType; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; +import com.google.gwt.dom.client.Style.FontWeight; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -168,13 +169,16 @@ public class DragDropLayer extends FlowPanel { VerticalPanel vp = new VerticalPanel(); VerticalPanel vpInner = new VerticalPanel(); - HorizontalPanel hp1 = new HorizontalPanel(); + HorizontalPanel hp0 = new HorizontalPanel(); + HorizontalPanel hpFunct = new HorizontalPanel(); vpInner.getElement().getStyle().setMarginLeft(47, Unit.PX); - hp1.add(draggableButton); - hp1.add(buttonLayerVisibility); - hp1.add(buttonLocate); - vpInner.add(labelProject); + hp0.add(draggableButton); + labelProject.getElement().getStyle().setMarginLeft(10, Unit.PX); + labelProject.getElement().getStyle().setFontWeight(FontWeight.BOLD); + hp0.add(labelProject); + hpFunct.add(buttonLayerVisibility); + hpFunct.add(buttonLocate); if (layerObject.getProjectDV().getTemporalReference() != null) { TemporalReferenceDV tempRef = layerObject.getProjectDV().getTemporalReference(); @@ -183,9 +187,14 @@ public class DragDropLayer extends FlowPanel { } vpInner.add(labelLayerName); + //vpInner.add(new SimplePanel(rs)); + + vp.add(hp0); + hpFunct.getElement().getStyle().setMarginTop(5, Unit.PX); + vpInner.add(hpFunct); vpInner.add(new SimplePanel(rs)); - vp.add(hp1); vp.add(vpInner); + add(vp); // add(ft); diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css index 6c4ecd9..b0aa313 100644 --- a/src/main/webapp/GeoportalDataViewer.css +++ b/src/main/webapp/GeoportalDataViewer.css @@ -365,6 +365,7 @@ body { width: 400px; border: 1px solid #ccc !important; padding: 5px 0px; + border-radius: 5px; } .range-slider {