From aaed3cf9f45278a993723f6a06d6fcc4e8433f82 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 31 Jan 2023 11:04:15 +0100
Subject: [PATCH] Improved Icons and Layers Panel. Moved to GWT 2.9

---
 CHANGELOG.md                                  |   1 -
 README.md                                     |   2 +-
 pom.xml                                       |   2 +-
 .../client/resources/locate_none.png          | Bin 1617 -> 1488 bytes
 .../client/ui/dandd/DragDropLayer.java        |  21 +++++++++++++-----
 src/main/webapp/GeoportalDataViewer.css       |   1 +
 6 files changed, 18 insertions(+), 9 deletions(-)

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 @@
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwt.version>2.10.0</gwt.version>
+		<gwt.version>2.9.0</gwt.version>
 		<gwt.compiler.style>PRETTY</gwt.compiler.style>
 		<gson.version>2.6.2</gson.version>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
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 0874ff15ca1d8a11316f38d314f4194ea4889df6..99fc09ae36baacce5525d8c945b3043b49a7b2d1 100644
GIT binary patch
delta 1424
zcmV;B1#kM%4A2XZ7YZB*1^@s6cK8peks%rjlO+HElO+Lkf;i5RMks$xNkl<ZNQtGE
zX>3$g6vzMPzV~M73~gsCI8=xwtfDLlR1l#kH7Ha+5YURo53+<MASoqf2|@^|AT0vM
z$P$f4s3`^v21N`+sS!}DEUC&;HjzR*Ev20|o%J3+6s9xnblU3w+dJpn|L>i<ymtv*
ziJ5GLHTjBadIJ(;g=T-U$dIm*W)U0-gu&bbh^s6EW#(}8j$2#Dw{+<VfI7|0ELR+l
zP5Od_X$BcAo!7-mhQJ~HqVP9Os@;}#x5r?|+t-JZ*>;XJi`Fe*J8{Gh8Ez_Q*yJwl
ztVVQz7F-(wi>vCtLIHpj6BNx};#_`rU2NRr<Ls&`Hgp6t6O4cMb3!q8Z)%fCs33Ft
zJFo7peWuROgMPg!zj||@Jf&seV}L0RU@xqFUoqR4{%<IN3@flaN8m{}M~aUzeyoN9
z0GVmPk@-rY8uyZlHYcf@41q)569@*%m?JvWlw8sb`J`E*K2{^JaJ;~@p}_W^7)6I!
zk=&X~Hv<dC(<OgZ;AUIL^Ui3ljNw5DwF55-)o+jSY#neWE<TeL=fLI$gE1vFe-vTv
zQv&5@C3c-+1j4N)1_hWsn(7O4#5SiDn}{eFrMOgwqf;mV4tOg%KmlMsMOGYbTKeJ>
z;*;Z7fN6UoX!1XpK?0@^BdmCq?$|+tT)n9I;jk!4%AkMJVT;FtS!qZVuWRO<ifeLX
z{^t^Rn%m+Nvk0rF5H8dJuk60}-Pu)+=GbvjaDAUaHO`<8QcVfLWH3y3Ev&NEefYQ+
z0BV|f*sVq`nemyN`sZDa){W{*STluiuLYR@rNs3HAmr5#bnuIPaIL643zL0BXI;Bf
z{GsAJZGV41n`T+{Ex&y7MjJ3Q9a#CSK!z3A@IB*vO>2%ry7UyMssM4USKOj<(Dwov
zQg63kYnvHZJV795K#I1lf?qpSC8Ife3b5#Dfk^{^?G=neRdN2{ux}@j79VWiF#tGM
z)csB-+eiQ~Yrvdr!mJU5-KQD*DjDGi%oGFg)>wbS%n^h=rx|-I84(%p#bIyQbNQ$V
z`)5Vkb2@BeYpr*j&u!52Mp(u29KzRs0J*y){GryorU3b)2y?Ru<>wf=J7x6P#8V@X
zzJ~ln(1aZ`GhMEW965P|o`3f^!=pbaBp`1XVcA5&@hiag3W@vvM3$|RE%jCP@AV$u
zSw4TRV~>xsk6pr+qHi$a#=W*>8S^M%O)lY9BhdcXBoc@8aJ?mCbg~*10P31}@XbbS
zp7p7G=|W8#aIgy~oGg%T28s?dVvkLyk|7|hXQMbRm=x^M`Ga}oazVv4j($Hf(}49;
z#mV6rd~nf$z@{_*Xx;o<G1%9%)>G=P?5clKCBj}sU>*QrGXq7>DSzb+!v?1XWkiDQ
z1vk$tDZP(?l&-OQ!wFAm?+x8~MFN1@W?o!YDOb-PBQ`qB_=t$&_NlX=W<6P)Ym?oS
z*nj_yXS2f%pd0HE<HXEHA_{a?=va33km%JfFCjFjdp)K~8`e!ubg+_xyCdhy`@esX
zW*HM3lcAQN8q)1|xAf6_;??6Tj<cw-nhe$~0FaTEu-4>t-`Vj<T~B>_ez#&K*D7xf
zG=nRo`?4BKY&UxBkqn$U^JlZKuX`lJI9jOM5GbO*0H;AQrn2NdP(&(+1Jwe2pGom@
z*nb5=y-5DXDuWieaJyu%r$=Dhk}GV(6|>_vGFS|tWLJaa;-HTa^ltT(x(m7m1_0NR
z>Va&uzRp4&N2K;cB;1=-B}Hf!h5d~LKtM5oK}?X6ScEwe2tqM>!NI>7I87n%K~HJ_
eAKL$iAL?JH+9x5xp+W=z0000<MNUMnLSTZNK%y-G

delta 1554
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
Eg4wGe!~g&Q

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 {