diff --git a/.classpath b/.classpath index 2c9ef6d..536272d 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -32,9 +32,8 @@ - - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index 18acf6c..24ea67a 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-1.1.0-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-1.1.0 warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/CHANGELOG.md b/CHANGELOG.md index 13d7560..c90180a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [v1.2.0-SNAPSHOT] - 2020-12-21 + +#### Enhancements + +[#20357] Improvements feedback-driven + ## [v1.1.0] - 2020-12-21 #### Enhancements diff --git a/pom.xml b/pom.xml index a93b5a9..aee356c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user geoportal-data-viewer-app war - 1.1.0 + 1.2.0-SNAPSHOT GeoPortal Data Viewer App The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface @@ -70,6 +70,10 @@ com.google.gwt gwt-dev + + com.github.gwtbootstrap + gwt-bootstrap + @@ -115,10 +119,16 @@ 8.0.0-gwt2_9 - com.github.gwtbootstrap - gwt-bootstrap - 2.3.2.0 - compile + org.gwtbootstrap3 + gwtbootstrap3 + 1.0.1 + provided + + + org.gwtbootstrap3 + gwtbootstrap3-extras + 1.0.2 + provided org.gcube.spatial.data diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml index 6a5dd72..6e17ad2 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml @@ -10,9 +10,12 @@ - - - + + + + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java index 2ad56da..cdfca7f 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java @@ -30,9 +30,9 @@ import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.GeoInformation import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.ZAxis; import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; +import org.gwtbootstrap3.client.ui.Button; +import org.gwtbootstrap3.client.ui.constants.ButtonType; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.constants.ButtonType; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java index 3b0f9d6..13640c5 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.java @@ -5,11 +5,11 @@ import org.gcube.portlets.user.geoportaldataviewer.client.events.ClosedViewDetai import org.gcube.portlets.user.geoportaldataviewer.client.ui.products.concessioni.ConcessioneView; import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV; +import org.gwtbootstrap3.client.ui.Button; +import org.gwtbootstrap3.client.ui.constants.ButtonType; +import org.gwtbootstrap3.client.ui.constants.IconSize; +import org.gwtbootstrap3.client.ui.constants.IconType; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.constants.ButtonType; -import com.github.gwtbootstrap.client.ui.constants.IconSize; -import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.ui.xml index 3bdc067..833f9f1 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/DetailsPanel.ui.xml @@ -1,7 +1,7 @@ + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> .important { font-weight: bold; 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 913d5ae..765836f 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 @@ -4,10 +4,10 @@ import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerOSM; import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV; +import org.gwtbootstrap3.client.ui.AnchorListItem; +import org.gwtbootstrap3.client.ui.Button; +import org.gwtbootstrap3.client.ui.constants.IconType; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.NavLink; -import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -46,10 +46,10 @@ public class GeonaDataViewMainPanel extends Composite { HTMLPanel mainToolBar; @UiField - NavLink dataPointSelection; + AnchorListItem dataPointSelection; @UiField - NavLink dataBoxSelection; + AnchorListItem dataBoxSelection; @UiField Button removeQuery; @@ -78,7 +78,7 @@ public class GeonaDataViewMainPanel extends Composite { detailsPanel.setApplicationBus(applicationBus); mainContainerPanel.add(mapPanel); bindHandlers(); - dataPointSelection.setIcon(IconType.SCREENSHOT); + dataPointSelection.setIcon(IconType.HAND_POINTER_O); dataBoxSelection.setIcon(IconType.BOOKMARK); removeQuery.setIcon(IconType.REMOVE); 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 bf1b0d5..c664cc5 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 @@ -1,7 +1,7 @@ .margin-right-10 { @@ -26,11 +26,11 @@ - Data Point - Selection - Data Box - Selection + Selection + Data Box + Selection + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> .back-color-info { background-color: #fafaff !important; @@ -63,11 +63,11 @@ - - @@ -88,9 +88,9 @@ type="LINK" addStyleNames="{style.margin-left-25}">Show as Long URL - + - @@ -105,9 +105,9 @@ - + - + @@ -124,8 +124,8 @@ - - + @@ -143,9 +143,9 @@ Show as Long URL - + - @@ -160,8 +160,8 @@ - - + + 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 bccd700..696be96 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 @@ -5,13 +5,13 @@ import org.gcube.portlets.user.geoportaldataviewer.client.util.NewBrowserWindow; import org.gcube.portlets.user.geoportaldataviewer.client.util.StringUtil; import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; +import org.gwtbootstrap3.client.ui.Button; +import org.gwtbootstrap3.client.ui.Heading; +import org.gwtbootstrap3.client.ui.Image; +import org.gwtbootstrap3.client.ui.constants.ButtonType; +import org.gwtbootstrap3.client.ui.constants.IconType; +import org.gwtbootstrap3.client.ui.html.Paragraph; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.Heading; -import com.github.gwtbootstrap.client.ui.Image; -import com.github.gwtbootstrap.client.ui.Paragraph; -import com.github.gwtbootstrap.client.ui.constants.ButtonType; -import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style.TextAlign; import com.google.gwt.event.dom.client.ClickEvent; 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 a28f0c2..80ce8ca 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 @@ -1,7 +1,7 @@ + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> .max-width-400 { max-width: 400px; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ThumbnailImageView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ThumbnailImageView.ui.xml index 5e5cd07..6eb9e81 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ThumbnailImageView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ThumbnailImageView.ui.xml @@ -1,7 +1,7 @@ .max-width-400 { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml index 01f5816..ef80fbd 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml @@ -1,7 +1,7 @@ + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> 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 19fa3f9..82b1df4 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 @@ -15,13 +15,14 @@ import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.AbstractRelazioneScavoDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.LayerConcessioneDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; +import org.gwtbootstrap3.client.ui.Button; +import org.gwtbootstrap3.client.ui.PageHeader; +import org.gwtbootstrap3.client.ui.constants.ButtonType; +import org.gwtbootstrap3.client.ui.constants.IconType; +import org.gwtbootstrap3.client.ui.html.Paragraph; +import org.gwtbootstrap3.extras.gallery.client.ui.Gallery; +import org.gwtbootstrap3.extras.gallery.client.ui.GalleryImage; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.PageHeader; -import com.github.gwtbootstrap.client.ui.Paragraph; -import com.github.gwtbootstrap.client.ui.Thumbnails; -import com.github.gwtbootstrap.client.ui.constants.ButtonType; -import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -83,7 +84,7 @@ public class ConcessioneView extends Composite { private ConcessioneDV concessioneDV; - private Thumbnails thumbNails = new Thumbnails(); + //private Thumbnails thumbNails = new Thumbnails(); private CustomFlexTable customTable = new CustomFlexTable(); @@ -318,28 +319,55 @@ public class ConcessioneView extends Composite { } private void addUploadedImages() { +// List immagini = concessioneDV.getImmaginiRappresentative(); +// if (immagini != null && immagini.size() > 0) { +// imagesPanel.setVisible(true); +// boolean addedImage = false; +// imagesPanel.add(thumbNails); +// for (UploadedImageDV uploadedImageDV : immagini) { +// +// if(uploadedImageDV.getPolicy()==null || uploadedImageDV.getPolicy().equalsIgnoreCase("OPEN")) { +// thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible)); +// addedImage = true; +// }else { +// if(myLogin!=null) { +// thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible)); +// addedImage = true; +// } +// } +// +// } +// +// if(!addedImage) { +// imagesPanel.remove(thumbNails); +// } +// } + List immagini = concessioneDV.getImmaginiRappresentative(); if (immagini != null && immagini.size() > 0) { imagesPanel.setVisible(true); boolean addedImage = false; - imagesPanel.add(thumbNails); + Gallery gallery = new Gallery(); + gallery.setThumbnailWidth("150px"); + gallery.setThumbnailHeight("150px"); + imagesPanel.add(gallery); for (UploadedImageDV uploadedImageDV : immagini) { - - if(uploadedImageDV.getPolicy()==null || uploadedImageDV.getPolicy().equalsIgnoreCase("OPEN")) { - thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible)); - addedImage = true; - }else { - if(myLogin!=null) { - thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible)); - addedImage = true; - } - } - + GalleryImage gI = new GalleryImage(uploadedImageDV.getListWsContent().get(0).getLink()); +// if(uploadedImageDV.getPolicy()==null || uploadedImageDV.getPolicy().equalsIgnoreCase("OPEN")) { +// thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible)); +// addedImage = true; +// }else { +// if(myLogin!=null) { +// thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible)); +// addedImage = true; +// } +// } + gallery.add(gI); } - if(!addedImage) { - imagesPanel.remove(thumbNails); - } +// if(!addedImage) { +// imagesPanel.remove(thumbNails); +// } } } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml index 947c31f..bd43e6a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/ConcessioneView.ui.xml @@ -1,7 +1,7 @@ + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> .margin-left-10 { 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 d9edf50..7811a1d 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 @@ -1,7 +1,7 @@ + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> .important { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.java index 1f59b35..dbcd1b2 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.java @@ -7,9 +7,9 @@ import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.CustomFlexTabl import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.AbstractRelazioneScavoDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RelazioneScavoDV; +import org.gwtbootstrap3.client.ui.Button; +import org.gwtbootstrap3.client.ui.html.Paragraph; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.Paragraph; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml index 027a4a9..d19c5d5 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/concessioni/RelazioneScavoView.ui.xml @@ -1,7 +1,7 @@ + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> .description>p { diff --git a/src/main/resources/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml b/src/main/resources/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml index 6a5dd72..6e17ad2 100644 --- a/src/main/resources/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/geoportaldataviewer/GeoportalDataViewer.gwt.xml @@ -10,9 +10,12 @@ - - - + + + + +