Compare commits
2 Commits
master
...
gwt-bootst
Author | SHA1 | Date |
---|---|---|
Francesco Mangiacrapa | eec95aaf10 | |
Francesco Mangiacrapa | 5ed9c89d72 |
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/geoportal-data-viewer-app-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/geoportal-data-viewer-app-1.1.0/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-1.1.0/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -32,9 +32,8 @@
|
||||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="lib" path="/home/francescomangiacrapa/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar"/>
|
<classpathentry kind="lib" path="/home/francescomangiacrapa/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar"/>
|
||||||
<classpathentry kind="output" path="target/geoportal-data-viewer-app-1.1.0-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/geoportal-data-viewer-app-1.1.0/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
eclipse.preferences.version=1
|
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
|
warSrcDir=src/main/webapp
|
||||||
warSrcDirIsOutput=false
|
warSrcDirIsOutput=false
|
||||||
|
|
|
@ -4,6 +4,13 @@
|
||||||
All notable changes to this project will be documented in this file.
|
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).
|
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
|
## [v1.1.0] - 2020-12-21
|
||||||
|
|
||||||
#### Enhancements
|
#### Enhancements
|
||||||
|
|
20
pom.xml
20
pom.xml
|
@ -14,7 +14,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>geoportal-data-viewer-app</artifactId>
|
<artifactId>geoportal-data-viewer-app</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>1.1.0</version>
|
<version>1.2.0-SNAPSHOT</version>
|
||||||
<name>GeoPortal Data Viewer App</name>
|
<name>GeoPortal Data Viewer App</name>
|
||||||
<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
|
<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
|
||||||
|
|
||||||
|
@ -70,6 +70,10 @@
|
||||||
<groupId>com.google.gwt</groupId>
|
<groupId>com.google.gwt</groupId>
|
||||||
<artifactId>gwt-dev</artifactId>
|
<artifactId>gwt-dev</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.github.gwtbootstrap</groupId>
|
||||||
|
<artifactId>gwt-bootstrap</artifactId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -115,10 +119,16 @@
|
||||||
<version>8.0.0-gwt2_9</version>
|
<version>8.0.0-gwt2_9</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.gwtbootstrap</groupId>
|
<groupId>org.gwtbootstrap3</groupId>
|
||||||
<artifactId>gwt-bootstrap</artifactId>
|
<artifactId>gwtbootstrap3</artifactId>
|
||||||
<version>2.3.2.0</version>
|
<version>1.0.1</version>
|
||||||
<scope>compile</scope>
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gwtbootstrap3</groupId>
|
||||||
|
<artifactId>gwtbootstrap3-extras</artifactId>
|
||||||
|
<version>1.0.2</version>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.spatial.data</groupId>
|
<groupId>org.gcube.spatial.data</groupId>
|
||||||
|
|
|
@ -10,9 +10,12 @@
|
||||||
|
|
||||||
<inherits name='ol.GwtOL' />
|
<inherits name='ol.GwtOL' />
|
||||||
|
|
||||||
<inherits name="com.github.gwtbootstrap.Bootstrap" />
|
<inherits name="org.gwtbootstrap3.GwtBootstrap3" />
|
||||||
|
<!-- <inherits name="org.gwtbootstrap3.GwtBootstrap3Theme" /> -->
|
||||||
<inherits name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
|
<inherits name="org.gwtbootstrap3.extras.gallery.Gallery"/>
|
||||||
|
|
||||||
|
<inherits
|
||||||
|
name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
|
||||||
|
|
||||||
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
|
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
|
||||||
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
|
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
|
||||||
|
|
|
@ -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.gis.wms.ZAxis;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV;
|
import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV;
|
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.GWT;
|
||||||
import com.google.gwt.core.client.Scheduler;
|
import com.google.gwt.core.client.Scheduler;
|
||||||
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
|
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
|
||||||
|
|
|
@ -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.client.ui.products.concessioni.ConcessioneView;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
|
import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV;
|
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.core.client.GWT;
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
import com.google.gwt.event.dom.client.ClickHandler;
|
import com.google.gwt.event.dom.client.ClickHandler;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.important {
|
.important {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
|
@ -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.client.gis.OpenLayerOSM;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
|
import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV;
|
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.core.client.GWT;
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
import com.google.gwt.event.dom.client.ClickHandler;
|
import com.google.gwt.event.dom.client.ClickHandler;
|
||||||
|
@ -46,10 +46,10 @@ public class GeonaDataViewMainPanel extends Composite {
|
||||||
HTMLPanel mainToolBar;
|
HTMLPanel mainToolBar;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
NavLink dataPointSelection;
|
AnchorListItem dataPointSelection;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
NavLink dataBoxSelection;
|
AnchorListItem dataBoxSelection;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
Button removeQuery;
|
Button removeQuery;
|
||||||
|
@ -78,7 +78,7 @@ public class GeonaDataViewMainPanel extends Composite {
|
||||||
detailsPanel.setApplicationBus(applicationBus);
|
detailsPanel.setApplicationBus(applicationBus);
|
||||||
mainContainerPanel.add(mapPanel);
|
mainContainerPanel.add(mapPanel);
|
||||||
bindHandlers();
|
bindHandlers();
|
||||||
dataPointSelection.setIcon(IconType.SCREENSHOT);
|
dataPointSelection.setIcon(IconType.HAND_POINTER_O);
|
||||||
dataBoxSelection.setIcon(IconType.BOOKMARK);
|
dataBoxSelection.setIcon(IconType.BOOKMARK);
|
||||||
|
|
||||||
removeQuery.setIcon(IconType.REMOVE);
|
removeQuery.setIcon(IconType.REMOVE);
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui"
|
||||||
|
xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
|
||||||
xmlns:c="urn:import:org.gcube.portlets.user.geoportaldataviewer.client.ui">
|
xmlns:c="urn:import:org.gcube.portlets.user.geoportaldataviewer.client.ui">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.margin-right-10 {
|
.margin-right-10 {
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.font-weight-bold {
|
.font-weight-bold {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
@ -15,24 +17,38 @@
|
||||||
<g:HTMLPanel ui:field="mainContainerPanel">
|
<g:HTMLPanel ui:field="mainContainerPanel">
|
||||||
<g:HTMLPanel ui:field="mainToolBar"
|
<g:HTMLPanel ui:field="mainToolBar"
|
||||||
addStyleNames="inner-toolbar">
|
addStyleNames="inner-toolbar">
|
||||||
<b:DropdownButton type="LINK" text=" " icon="INFO">
|
<b:ButtonGroup>
|
||||||
<g:HTMLPanel ui:field="panelMI"
|
<b:Button type="LINK" text=" " icon="INFO" />
|
||||||
addStyleNames="info-interaction">
|
<b:DropDownMenu>
|
||||||
<g:Label>Map Interactions</g:Label>
|
<g:HTMLPanel ui:field="panelMI"
|
||||||
<b:Paragraph><b:Icon type="CHECK_EMPTY"/> Use <code>Shift+Drag</code> to draw an extent for zoom in the Map</b:Paragraph>
|
addStyleNames="info-interaction">
|
||||||
<b:Paragraph><b:Icon type="HAND_UP"/> Click on the Points shown on the Map to view their features</b:Paragraph>
|
<g:Label>Map Interactions</g:Label>
|
||||||
|
<h:Span>
|
||||||
|
<b:Icon type="SQUARE_O" />
|
||||||
|
Use
|
||||||
|
<code>Shift+Drag</code>
|
||||||
|
to draw an extent for zoom in the Map
|
||||||
|
</h:Span>
|
||||||
|
<h:Span>
|
||||||
|
<b:Icon type="HAND_O_UP" />
|
||||||
|
Click on the Points shown on the Map to view their features
|
||||||
|
</h:Span>
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
</b:DropdownButton>
|
</b:DropDownMenu>
|
||||||
<b:DropdownButton type="LINK" text="Query"
|
</b:ButtonGroup>
|
||||||
visible="false">
|
<b:ButtonGroup visible="false">
|
||||||
<!-- <b:ButtonGroup toggle="checkbox" ui:field="buttonGroup"> -->
|
<b:Button type="LINK" text="Query" icon="INFO" />
|
||||||
<b:NavLink ui:field="dataPointSelection"
|
<b:DropDownMenu>
|
||||||
addStyleNames="{style.margin-right-10}">Data Point
|
<!-- <b:ButtonGroup toggle="checkbox" ui:field="buttonGroup"> -->
|
||||||
Selection</b:NavLink>
|
<b:AnchorListItem ui:field="dataPointSelection"
|
||||||
<b:NavLink ui:field="dataBoxSelection" visible="false">Data Box
|
addStyleNames="{style.margin-right-10}">Data Point
|
||||||
Selection</b:NavLink>
|
Selection</b:AnchorListItem>
|
||||||
<!-- </b:ButtonGroup> -->
|
<b:AnchorListItem ui:field="dataBoxSelection"
|
||||||
</b:DropdownButton>
|
visible="false">Data Box
|
||||||
|
Selection</b:AnchorListItem>
|
||||||
|
<!-- </b:ButtonGroup> -->
|
||||||
|
</b:DropDownMenu>
|
||||||
|
</b:ButtonGroup>
|
||||||
<b:Button type="LINK" ui:field="removeQuery"
|
<b:Button type="LINK" ui:field="removeQuery"
|
||||||
text="Remove Query" visible="false"></b:Button>
|
text="Remove Query" visible="false"></b:Button>
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
package org.gcube.portlets.user.geoportaldataviewer.client.ui;
|
package org.gcube.portlets.user.geoportaldataviewer.client.ui;
|
||||||
|
|
||||||
import com.github.gwtbootstrap.client.ui.Button;
|
|
||||||
import com.github.gwtbootstrap.client.ui.Modal;
|
import org.gwtbootstrap3.client.ui.Button;
|
||||||
import com.github.gwtbootstrap.client.ui.ModalFooter;
|
import org.gwtbootstrap3.client.ui.Modal;
|
||||||
|
import org.gwtbootstrap3.client.ui.ModalFooter;
|
||||||
|
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
import com.google.gwt.event.dom.client.ClickHandler;
|
import com.google.gwt.event.dom.client.ClickHandler;
|
||||||
import com.google.gwt.user.client.ui.Widget;
|
import com.google.gwt.user.client.ui.Widget;
|
||||||
|
@ -29,12 +31,12 @@ public class ModalWindow {
|
||||||
*/
|
*/
|
||||||
public ModalWindow(String title, int width, int maxHeight) {
|
public ModalWindow(String title, int width, int maxHeight) {
|
||||||
|
|
||||||
modal = new Modal(false);
|
modal = new Modal();
|
||||||
modal.hide(false);
|
//modal.hide(false);
|
||||||
modal.setTitle(title);
|
modal.setTitle(title);
|
||||||
modal.setCloseVisible(true);
|
modal.setClosable(true);
|
||||||
modal.setWidth(width);
|
modal.setWidth(width+"px");
|
||||||
modal.setMaxHeigth(maxHeight+"px");
|
modal.getElement().getStyle().setProperty("maxHeight",maxHeight+"px");
|
||||||
|
|
||||||
ModalFooter modalFooter = new ModalFooter();
|
ModalFooter modalFooter = new ModalFooter();
|
||||||
final Button buttClose = new Button("Close");
|
final Button buttClose = new Button("Close");
|
||||||
|
@ -64,7 +66,7 @@ public class ModalWindow {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setWidth(int width) {
|
public void setWidth(int width) {
|
||||||
modal.setWidth(width);
|
modal.setWidth(width+"px");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,16 +4,14 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui.dialogs;
|
||||||
import org.gcube.application.geoportalcommon.shared.GeoNaItemRef;
|
import org.gcube.application.geoportalcommon.shared.GeoNaItemRef;
|
||||||
import org.gcube.application.geoportalcommon.shared.PublicLink;
|
import org.gcube.application.geoportalcommon.shared.PublicLink;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerServiceAsync;
|
import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerServiceAsync;
|
||||||
|
import org.gwtbootstrap3.client.ui.Alert;
|
||||||
|
import org.gwtbootstrap3.client.ui.Button;
|
||||||
|
import org.gwtbootstrap3.client.ui.FieldSet;
|
||||||
|
import org.gwtbootstrap3.client.ui.FormGroup;
|
||||||
|
import org.gwtbootstrap3.client.ui.Modal;
|
||||||
|
import org.gwtbootstrap3.client.ui.ModalFooter;
|
||||||
|
import org.gwtbootstrap3.client.ui.TextBox;
|
||||||
|
|
||||||
import com.github.gwtbootstrap.client.ui.Alert;
|
|
||||||
import com.github.gwtbootstrap.client.ui.Button;
|
|
||||||
import com.github.gwtbootstrap.client.ui.ControlGroup;
|
|
||||||
import com.github.gwtbootstrap.client.ui.Fieldset;
|
|
||||||
import com.github.gwtbootstrap.client.ui.Modal;
|
|
||||||
import com.github.gwtbootstrap.client.ui.ModalFooter;
|
|
||||||
import com.github.gwtbootstrap.client.ui.TextBox;
|
|
||||||
import com.github.gwtbootstrap.client.ui.Tooltip;
|
|
||||||
import com.github.gwtbootstrap.client.ui.constants.VisibilityChange;
|
|
||||||
import com.google.gwt.core.client.GWT;
|
import com.google.gwt.core.client.GWT;
|
||||||
import com.google.gwt.dom.client.Element;
|
import com.google.gwt.dom.client.Element;
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
|
@ -23,7 +21,6 @@ import com.google.gwt.event.dom.client.MouseOverHandler;
|
||||||
import com.google.gwt.uibinder.client.UiBinder;
|
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.Random;
|
import com.google.gwt.user.client.Random;
|
||||||
import com.google.gwt.user.client.Timer;
|
|
||||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||||
import com.google.gwt.user.client.ui.Composite;
|
import com.google.gwt.user.client.ui.Composite;
|
||||||
import com.google.gwt.user.client.ui.Label;
|
import com.google.gwt.user.client.ui.Label;
|
||||||
|
@ -44,13 +41,13 @@ public class DialogShareableLink extends Composite {
|
||||||
private Modal modalBox = new Modal();
|
private Modal modalBox = new Modal();
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
ControlGroup cgPublicLink;
|
FormGroup cgPublicLink;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
ControlGroup cgPrivateLongLink;
|
FormGroup cgPrivateLongLink;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
ControlGroup cgPublicLongLink;
|
FormGroup cgPublicLongLink;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
TextBox textPublicLink;
|
TextBox textPublicLink;
|
||||||
|
@ -74,10 +71,10 @@ public class DialogShareableLink extends Composite {
|
||||||
// Well alertFilePublicLink;
|
// Well alertFilePublicLink;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
Fieldset fieldSetPrivate;
|
FieldSet fieldSetPrivate;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
Fieldset fieldSetPublic;
|
FieldSet fieldSetPublic;
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
VerticalPanel fieldPrivateSharing;
|
VerticalPanel fieldPrivateSharing;
|
||||||
|
@ -148,7 +145,7 @@ public class DialogShareableLink extends Composite {
|
||||||
|
|
||||||
this.geonItemRef = item;
|
this.geonItemRef = item;
|
||||||
this.fileVersion = version;
|
this.fileVersion = version;
|
||||||
this.actionAlert.setAnimation(true);
|
//this.actionAlert.setAnimation(true);
|
||||||
|
|
||||||
//cgRemovePublicLink.setVisible(false);
|
//cgRemovePublicLink.setVisible(false);
|
||||||
// fieldSetPrivate.setVisible(false);
|
// fieldSetPrivate.setVisible(false);
|
||||||
|
@ -246,18 +243,19 @@ public class DialogShareableLink extends Composite {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
|
|
||||||
final Element elem = event.getRelativeElement();
|
//TODO
|
||||||
elem.setTitle("Copied to clipboard");
|
// final Element elem = event.getRelativeElement();
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
// elem.setTitle("Copied to clipboard");
|
||||||
Timer timer = new Timer() {
|
// Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
||||||
|
// Timer timer = new Timer() {
|
||||||
@Override
|
//
|
||||||
public void run() {
|
// @Override
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
// public void run() {
|
||||||
}
|
// Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
||||||
};
|
// }
|
||||||
|
// };
|
||||||
timer.schedule(1000);
|
//
|
||||||
|
// timer.schedule(1000);
|
||||||
copyToClipboard(textPrivateLink.getId());
|
copyToClipboard(textPrivateLink.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -276,17 +274,19 @@ public class DialogShareableLink extends Composite {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
final Element elem = event.getRelativeElement();
|
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
|
||||||
Timer timer = new Timer() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
timer.schedule(1000);
|
//TODO
|
||||||
|
// final Element elem = event.getRelativeElement();
|
||||||
|
// Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
||||||
|
// Timer timer = new Timer() {
|
||||||
|
//
|
||||||
|
// @Override
|
||||||
|
// public void run() {
|
||||||
|
// Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
||||||
|
// }
|
||||||
|
// };
|
||||||
|
//
|
||||||
|
// timer.schedule(1000);
|
||||||
copyToClipboard(textPrivateLongLink.getId());
|
copyToClipboard(textPrivateLongLink.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -304,17 +304,19 @@ public class DialogShareableLink extends Composite {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
final Element elem = event.getRelativeElement();
|
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
|
||||||
Timer timer = new Timer() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
timer.schedule(1000);
|
//TODO
|
||||||
|
// final Element elem = event.getRelativeElement();
|
||||||
|
// Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
||||||
|
// Timer timer = new Timer() {
|
||||||
|
//
|
||||||
|
// @Override
|
||||||
|
// public void run() {
|
||||||
|
// Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
||||||
|
// }
|
||||||
|
// };
|
||||||
|
//
|
||||||
|
// timer.schedule(1000);
|
||||||
copyToClipboard(textPublicLink.getId());
|
copyToClipboard(textPublicLink.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -332,17 +334,19 @@ public class DialogShareableLink extends Composite {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
final Element elem = event.getRelativeElement();
|
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
|
||||||
Timer timer = new Timer() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
timer.schedule(1000);
|
//TODO
|
||||||
|
// final Element elem = event.getRelativeElement();
|
||||||
|
// Tooltip.changeVisibility(elem, VisibilityChange.TOGGLE.get());
|
||||||
|
// Timer timer = new Timer() {
|
||||||
|
//
|
||||||
|
// @Override
|
||||||
|
// public void run() {
|
||||||
|
// Tooltip.changeVisibility(elem, VisibilityChange.HIDE.get());
|
||||||
|
// }
|
||||||
|
// };
|
||||||
|
//
|
||||||
|
// timer.schedule(1000);
|
||||||
copyToClipboard(textPublicLongLink.getId());
|
copyToClipboard(textPublicLongLink.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.back-color-info {
|
.back-color-info {
|
||||||
background-color: #fafaff !important;
|
background-color: #fafaff !important;
|
||||||
|
@ -45,8 +45,8 @@
|
||||||
</ui:style>
|
</ui:style>
|
||||||
<g:HTMLPanel>
|
<g:HTMLPanel>
|
||||||
<b:Form type="HORIZONTAL">
|
<b:Form type="HORIZONTAL">
|
||||||
<b:Alert ui:field="actionAlert" close="false" type="INFO"
|
<b:Alert ui:field="actionAlert" dismissable="false"
|
||||||
visible="false">
|
type="INFO" visible="false">
|
||||||
<b:Icon type="ROTATE_RIGHT" spin="true" />
|
<b:Icon type="ROTATE_RIGHT" spin="true" />
|
||||||
</b:Alert>
|
</b:Alert>
|
||||||
|
|
||||||
|
@ -63,51 +63,53 @@
|
||||||
</g:VerticalPanel>
|
</g:VerticalPanel>
|
||||||
</g:VerticalPanel>
|
</g:VerticalPanel>
|
||||||
|
|
||||||
<b:Fieldset ui:field="fieldSetPrivate"
|
<b:FieldSet ui:field="fieldSetPrivate"
|
||||||
styleName="{style.noBorder}">
|
styleName="{style.noBorder}">
|
||||||
<g:HTMLPanel>
|
<g:HTMLPanel>
|
||||||
<!-- <b:Legend>sharing....</b:Legend> -->
|
<!-- <b:Legend>sharing....</b:Legend> -->
|
||||||
<b:ControlGroup ui:field="cgPrivateLink"
|
<b:FormGroup ui:field="cgPrivateLink"
|
||||||
addStyleNames="my-control-group">
|
addStyleNames="my-control-group">
|
||||||
|
|
||||||
<!-- <b:Well ui:field="wellPrivateLinkDescription"> -->
|
<!-- <b:Well ui:field="wellPrivateLinkDescription"> -->
|
||||||
<!-- The following Restricted Link for this product -->
|
<!-- The following Restricted Link for this product -->
|
||||||
<!-- is accessible by the users of the VRE. Login required</b:Well> -->
|
<!-- is accessible by the users of the VRE. Login required</b:Well> -->
|
||||||
<b:ControlLabel>Restricted Link</b:ControlLabel>
|
<b:FormLabel>Restricted Link</b:FormLabel>
|
||||||
<b:Controls>
|
<!-- <b:Controls> -->
|
||||||
<b:InputAddOn prependIcon="LINK"
|
<b:InputGroup>
|
||||||
|
<b:InputGroupAddon icon="LINK"
|
||||||
addStyleNames="my-prepend-width">
|
addStyleNames="my-prepend-width">
|
||||||
<b:TextBox ui:field="textPrivateLink" readOnly="true">
|
</b:InputGroupAddon>
|
||||||
</b:TextBox>
|
<b:TextBox ui:field="textPrivateLink" readOnly="true" />
|
||||||
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
||||||
<b:Button icon="COPY" ui:field="privateLinkCopyButton"
|
<b:Button icon="COPY" ui:field="privateLinkCopyButton"
|
||||||
type="PRIMARY"></b:Button>
|
type="PRIMARY"></b:Button>
|
||||||
</b:Tooltip>
|
</b:Tooltip>
|
||||||
</b:InputAddOn>
|
</b:InputGroup>
|
||||||
<b:Button ui:field="showPrivateLongLinkButton"
|
<b:Button ui:field="showPrivateLongLinkButton"
|
||||||
type="LINK" addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
|
type="LINK" addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
|
||||||
</b:Controls>
|
<!-- </b:Controls> -->
|
||||||
|
|
||||||
</b:ControlGroup>
|
</b:FormGroup>
|
||||||
|
|
||||||
<b:ControlGroup addStyleNames="my-control-group"
|
<b:FormGroup addStyleNames="my-control-group"
|
||||||
ui:field="cgPrivateLongLink" visible="false">
|
ui:field="cgPrivateLongLink" visible="false">
|
||||||
<b:ControlLabel></b:ControlLabel>
|
<b:FormLabel></b:FormLabel>
|
||||||
<b:Controls>
|
<!-- <b:Controls> -->
|
||||||
<b:InputAddOn prependIcon="LINK"
|
<b:InputGroup>
|
||||||
|
<b:InputGroupAddon icon="LINK"
|
||||||
addStyleNames="my-prepend-width">
|
addStyleNames="my-prepend-width">
|
||||||
<b:TextBox ui:field="textPrivateLongLink"
|
</b:InputGroupAddon>
|
||||||
readOnly="true">
|
<b:TextBox ui:field="textPrivateLongLink"
|
||||||
</b:TextBox>
|
readOnly="true" />
|
||||||
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
||||||
<b:Button icon="COPY"
|
<b:Button icon="COPY"
|
||||||
ui:field="privateLongLinkCopyButton" type="PRIMARY"></b:Button>
|
ui:field="privateLongLinkCopyButton" type="PRIMARY"></b:Button>
|
||||||
</b:Tooltip>
|
</b:Tooltip>
|
||||||
</b:InputAddOn>
|
</b:InputGroup>
|
||||||
</b:Controls>
|
<!-- </b:Controls> -->
|
||||||
</b:ControlGroup>
|
</b:FormGroup>
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
</b:Fieldset>
|
</b:FieldSet>
|
||||||
|
|
||||||
<g:VerticalPanel ui:field="filedEnableDisableSharing"
|
<g:VerticalPanel ui:field="filedEnableDisableSharing"
|
||||||
addStyleNames="{style.margin-bottom-20}">
|
addStyleNames="{style.margin-bottom-20}">
|
||||||
|
@ -124,45 +126,45 @@
|
||||||
</g:VerticalPanel>
|
</g:VerticalPanel>
|
||||||
|
|
||||||
|
|
||||||
<b:Fieldset ui:field="fieldSetPublic">
|
<b:FieldSet ui:field="fieldSetPublic">
|
||||||
<b:ControlGroup ui:field="cgPublicLink"
|
<b:FormGroup ui:field="cgPublicLink"
|
||||||
addStyleNames="my-control-group">
|
addStyleNames="my-control-group">
|
||||||
<!-- <b:Well ui:field="alertFilePublicLink" visible="true">Anyone with -->
|
<!-- <b:Well ui:field="alertFilePublicLink" visible="true">Anyone with -->
|
||||||
<!-- this link can access it, no login is required.</b:Well> -->
|
<!-- this link can access it, no login is required.</b:Well> -->
|
||||||
<b:ControlLabel>Open Link</b:ControlLabel>
|
<b:FormLabel>Open Link</b:FormLabel>
|
||||||
<b:Controls>
|
<!-- <b:Controls> -->
|
||||||
<b:InputAddOn prependIcon="GLOBE"
|
<b:InputGroup>
|
||||||
|
<b:InputGroupAddon icon="GLOBE"
|
||||||
addStyleNames="my-prepend-width">
|
addStyleNames="my-prepend-width">
|
||||||
<b:TextBox ui:field="textPublicLink" readOnly="true">
|
</b:InputGroupAddon>
|
||||||
</b:TextBox>
|
<b:TextBox ui:field="textPublicLink" readOnly="true" />
|
||||||
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
||||||
<b:Button icon="COPY" ui:field="publicLinkCopyButton"
|
<b:Button icon="COPY" ui:field="publicLinkCopyButton"
|
||||||
type="PRIMARY"></b:Button>
|
type="PRIMARY"></b:Button>
|
||||||
</b:Tooltip>
|
</b:Tooltip>
|
||||||
</b:InputAddOn>
|
</b:InputGroup>
|
||||||
<b:Button ui:field="showPublicLongLinkButton" type="LINK"
|
<b:Button ui:field="showPublicLongLinkButton" type="LINK"
|
||||||
addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
|
addStyleNames="{style.margin-left-25}">Show as Long URL</b:Button>
|
||||||
</b:Controls>
|
<!-- </b:Controls> -->
|
||||||
</b:ControlGroup>
|
</b:FormGroup>
|
||||||
|
|
||||||
<b:ControlGroup addStyleNames="my-control-group"
|
<b:FormGroup addStyleNames="my-control-group"
|
||||||
ui:field="cgPublicLongLink" visible="false">
|
ui:field="cgPublicLongLink" visible="false">
|
||||||
<b:ControlLabel></b:ControlLabel>
|
<b:FormLabel></b:FormLabel>
|
||||||
<b:Controls>
|
<!-- <b:Controls> -->
|
||||||
<b:InputAddOn prependIcon="GLOBE"
|
<b:InputGroup>
|
||||||
addStyleNames="my-prepend-width">
|
<b:InputGroupAddon icon="GLOBE"
|
||||||
<b:TextBox ui:field="textPublicLongLink"
|
addStyleNames="my-prepend-width"></b:InputGroupAddon>
|
||||||
readOnly="true">
|
<b:TextBox ui:field="textPublicLongLink" readOnly="true" />
|
||||||
</b:TextBox>
|
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
||||||
<b:Tooltip text='Copied to clipboard' trigger="MANUAL">
|
<b:Button icon="COPY"
|
||||||
<b:Button icon="COPY"
|
ui:field="publicLongLinkCopyButton" type="PRIMARY"></b:Button>
|
||||||
ui:field="publicLongLinkCopyButton" type="PRIMARY"></b:Button>
|
</b:Tooltip>
|
||||||
</b:Tooltip>
|
</b:InputGroup>
|
||||||
</b:InputAddOn>
|
<!-- </b:Controls> -->
|
||||||
</b:Controls>
|
</b:FormGroup>
|
||||||
</b:ControlGroup>
|
</b:FieldSet>
|
||||||
</b:Fieldset>
|
<b:Alert dismissable="false" ui:field="errorAlert" type="DANGER"
|
||||||
<b:Alert close="false" ui:field="errorAlert" type="ERROR"
|
|
||||||
visible="false"></b:Alert>
|
visible="false"></b:Alert>
|
||||||
</b:Form>
|
</b:Form>
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
|
|
|
@ -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.client.util.StringUtil;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV;
|
import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV;
|
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.core.client.GWT;
|
||||||
import com.google.gwt.dom.client.Style.TextAlign;
|
import com.google.gwt.dom.client.Style.TextAlign;
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.max-width-400 {
|
.max-width-400 {
|
||||||
max-width: 400px;
|
max-width: 400px;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui"
|
||||||
xmlns:citem="urn:import:org.gcube.portlets.user.geoportaldataviewer.client.ui.images">
|
xmlns:citem="urn:import:org.gcube.portlets.user.geoportaldataviewer.client.ui.images">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.max-width-400 {
|
.max-width-400 {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
</ui:style>
|
</ui:style>
|
||||||
<g:HTMLPanel ui:field="recordDVPanel">
|
<g:HTMLPanel ui:field="recordDVPanel">
|
||||||
|
|
|
@ -8,20 +8,20 @@ import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerSer
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils;
|
import org.gcube.portlets.user.geoportaldataviewer.client.gis.MapUtils;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.ui.ModalWindow;
|
import org.gcube.portlets.user.geoportaldataviewer.client.ui.ModalWindow;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.ui.dialogs.DialogShareableLink;
|
import org.gcube.portlets.user.geoportaldataviewer.client.ui.dialogs.DialogShareableLink;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.ui.images.ThumbnailImageView;
|
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.MapView;
|
import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.MapView;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.CustomFlexTable;
|
import org.gcube.portlets.user.geoportaldataviewer.client.ui.util.CustomFlexTable;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
|
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.AbstractRelazioneScavoDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.LayerConcessioneDV;
|
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.LayerConcessioneDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV;
|
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.core.client.GWT;
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
import com.google.gwt.event.dom.client.ClickHandler;
|
import com.google.gwt.event.dom.client.ClickHandler;
|
||||||
|
@ -83,7 +83,7 @@ public class ConcessioneView extends Composite {
|
||||||
|
|
||||||
private ConcessioneDV concessioneDV;
|
private ConcessioneDV concessioneDV;
|
||||||
|
|
||||||
private Thumbnails thumbNails = new Thumbnails();
|
//private Thumbnails thumbNails = new Thumbnails();
|
||||||
|
|
||||||
private CustomFlexTable customTable = new CustomFlexTable();
|
private CustomFlexTable customTable = new CustomFlexTable();
|
||||||
|
|
||||||
|
@ -318,28 +318,55 @@ public class ConcessioneView extends Composite {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addUploadedImages() {
|
private void addUploadedImages() {
|
||||||
|
// List<UploadedImageDV> 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<UploadedImageDV> immagini = concessioneDV.getImmaginiRappresentative();
|
List<UploadedImageDV> immagini = concessioneDV.getImmaginiRappresentative();
|
||||||
if (immagini != null && immagini.size() > 0) {
|
if (immagini != null && immagini.size() > 0) {
|
||||||
imagesPanel.setVisible(true);
|
imagesPanel.setVisible(true);
|
||||||
boolean addedImage = false;
|
boolean addedImage = false;
|
||||||
imagesPanel.add(thumbNails);
|
Gallery gallery = new Gallery();
|
||||||
|
gallery.setThumbnailWidth("150px");
|
||||||
|
gallery.setThumbnailHeight("150px");
|
||||||
|
imagesPanel.add(gallery);
|
||||||
for (UploadedImageDV uploadedImageDV : immagini) {
|
for (UploadedImageDV uploadedImageDV : immagini) {
|
||||||
|
GalleryImage gI = new GalleryImage(uploadedImageDV.getListWsContent().get(0).getLink());
|
||||||
if(uploadedImageDV.getPolicy()==null || uploadedImageDV.getPolicy().equalsIgnoreCase("OPEN")) {
|
// if(uploadedImageDV.getPolicy()==null || uploadedImageDV.getPolicy().equalsIgnoreCase("OPEN")) {
|
||||||
thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible));
|
// thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible));
|
||||||
addedImage = true;
|
// addedImage = true;
|
||||||
}else {
|
// }else {
|
||||||
if(myLogin!=null) {
|
// if(myLogin!=null) {
|
||||||
thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible));
|
// thumbNails.add(new ThumbnailImageView(uploadedImageDV, viewImageButtonVisible, openImageButtonVisible));
|
||||||
addedImage = true;
|
// addedImage = true;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
gallery.add(gI);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!addedImage) {
|
// if(!addedImage) {
|
||||||
imagesPanel.remove(thumbNails);
|
// imagesPanel.remove(thumbNails);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
|
||||||
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
|
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.margin-left-10 {
|
.margin-left-10 {
|
||||||
|
@ -40,7 +41,7 @@
|
||||||
<b:Button ui:field="shareButton">Share</b:Button>
|
<b:Button ui:field="shareButton">Share</b:Button>
|
||||||
<b:Button ui:field="viewButton">View</b:Button>
|
<b:Button ui:field="viewButton">View</b:Button>
|
||||||
</g:HorizontalPanel>
|
</g:HorizontalPanel>
|
||||||
<b:Paragraph ui:field="introduzione"></b:Paragraph>
|
<h:Paragraph ui:field="introduzione"></h:Paragraph>
|
||||||
<g:VerticalPanel addStyleNames="{style.width-100}">
|
<g:VerticalPanel addStyleNames="{style.width-100}">
|
||||||
<g:HTMLPanel ui:field="mapViewPanel">
|
<g:HTMLPanel ui:field="mapViewPanel">
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
|
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.important {
|
.important {
|
||||||
|
|
|
@ -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.content.WorkspaceContentDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.AbstractRelazioneScavoDV;
|
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.AbstractRelazioneScavoDV;
|
||||||
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RelazioneScavoDV;
|
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.core.client.GWT;
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
import com.google.gwt.event.dom.client.ClickHandler;
|
import com.google.gwt.event.dom.client.ClickHandler;
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
|
xmlns:h="urn:import:org.gwtbootstrap3.client.ui.html"
|
||||||
|
xmlns:b="urn:import:org.gwtbootstrap3.client.ui">
|
||||||
|
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.description>p {
|
.description>p {
|
||||||
|
@ -14,8 +15,8 @@
|
||||||
addStyleNames="{style.description}">
|
addStyleNames="{style.description}">
|
||||||
<b:Button ui:field="linkAbstractLanguage" visible="false"
|
<b:Button ui:field="linkAbstractLanguage" visible="false"
|
||||||
type="LINK"></b:Button>
|
type="LINK"></b:Button>
|
||||||
<b:Paragraph ui:field="abstractParagraphIta"></b:Paragraph>
|
<h:Paragraph ui:field="abstractParagraphIta"></h:Paragraph>
|
||||||
<b:Paragraph ui:field="abstractParagraphEng"
|
<h:Paragraph ui:field="abstractParagraphEng"
|
||||||
visible="false"></b:Paragraph>
|
visible="false"></h:Paragraph>
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
</ui:UiBinder>
|
</ui:UiBinder>
|
|
@ -10,9 +10,12 @@
|
||||||
|
|
||||||
<inherits name='ol.GwtOL' />
|
<inherits name='ol.GwtOL' />
|
||||||
|
|
||||||
<inherits name="com.github.gwtbootstrap.Bootstrap" />
|
<inherits name="org.gwtbootstrap3.GwtBootstrap3" />
|
||||||
|
<!-- <inherits name="org.gwtbootstrap3.GwtBootstrap3Theme" /> -->
|
||||||
<inherits name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
|
<inherits name="org.gwtbootstrap3.extras.gallery.Gallery"/>
|
||||||
|
|
||||||
|
<inherits
|
||||||
|
name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
|
||||||
|
|
||||||
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
|
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
|
||||||
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
|
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
|
||||||
|
|
Loading…
Reference in New Issue