gCubeSystem
/
geoportal-data-viewer-app
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

task_25066 #15

Merged
francesco.mangiacrapa merged 18 commits from task_25066 into master 2023-06-09 10:37:46 +02:00
Conversation 0 Commits 18 Files Changed 44 +32 -3
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f86988f8c7 - Show all commits

7
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java
View File

@ -56,6 +56,7 @@ import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Label;
@ -644,6 +645,12 @@ public class GeonaDataViewMainPanel extends Composite {
: gCustomLayerDV.getName(); : gCustomLayerDV.getName();
labelGroup.setTitle(descr); labelGroup.setTitle(descr);
panelCustomOverlayLayers.add(labelGroup); panelCustomOverlayLayers.add(labelGroup);
if(descr.compareTo(gCustomLayerDV.getName())!=0) {
HTML overlayGroupDescr = new HTML();
overlayGroupDescr.getElement().setClassName("overlay-panel-style-description");
overlayGroupDescr.setHTML(descr);
panelCustomOverlayLayers.add(overlayGroupDescr);
}
for (CustomLayerDV customLayer : gCustomLayerDV.getListCustomLayers()) { for (CustomLayerDV customLayer : gCustomLayerDV.getListCustomLayers()) {
if(customLayer.isDisplay()) { if(customLayer.isDisplay()) {

4
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml
View File

@ -61,8 +61,8 @@
</g:HTMLPanel> </g:HTMLPanel>
</b:DropdownButton> </b:DropdownButton>
<b:DropdownButton type="LINK" visible="false" <b:DropdownButton type="LINK" visible="false"
title="Custom overlay layers.." text="Overlays" ui:field="linkCustomOverlayLayers" icon="REORDER"> title="Custom overlay layers.." text="Overlay" ui:field="linkCustomOverlayLayers" icon="REORDER">
<g:HTMLPanel ui:field="panelCustomOverlayLayers" addStyleNames="open-collection-style"> <g:HTMLPanel ui:field="panelCustomOverlayLayers" addStyleNames="overlay-panel-style">
</g:HTMLPanel> </g:HTMLPanel>
</b:DropdownButton> </b:DropdownButton>
<b:DropdownButton type="LINK" text="Search" <b:DropdownButton type="LINK" text="Search"

22
src/main/webapp/GeoportalDataViewer.css
View File

@ -825,3 +825,25 @@ RESPONSIVE
.layer-style-panel-table-legend table td { .layer-style-panel-table-legend table td {
padding-left: 5px; padding-left: 5px;
} }
/* CUSTOM OVERLAY UI */
.overlay-panel-style {
padding-left: 10px;
padding-right: 10px;
max-width: 350px;
}
.overlay-panel-style-description {
border: none !important;
white-space: pre-line;
}
.overlay-panel-style > div {
border: 1px solid #ccc;
border-radius: 5px;
padding: 10px;
margin-bottom: 10px;
margin-top: 5px;
}