merged with Feature #19172

changelog.xml

@@ -4,7 +4,11 @@
 		<Change>[Feature #19111]: init settings configurable via property file
 			and GET parameters
 		</Change>
-		<Change>[Feature #19109] Gis-Viewer: management and access to restricted data
+		<Change>[Feature #19109] Gis-Viewer: management and access to
+			restricted data
+		</Change>
+		<Change>[Feature #19172] Gis-Viewer-App: update the look and feel of
+			Gis-Viewer
 		</Change>
 	</Changeset>
 	<Changeset

src/main/java/org/gcube/portlets/user/gisviewer/client/layerspanel/LayerToolsPanel.java

@@ -215,7 +215,7 @@ public class LayerToolsPanel extends VerticalPanel {
 		}
 
 		// layer export
-		Button btnExportLayer = new Button("", Images.iconExport());
+		Button btnExportLayer = new Button("", Images.iconExportOld());
 		btnExportLayer.setToolTip("Export layer view");
 		Menu menuExportLayer = new Menu();
 		menuExportLayer.setStyleName("gisViewerMenu");
@@ -233,7 +233,7 @@ public class LayerToolsPanel extends VerticalPanel {
 
 		// layer save
 		if (layersPanelHandler.isSaveSupported()) {
-			Button btnSaveLayer = new Button("", Images.iconSave());
+			Button btnSaveLayer = new Button("", Images.iconSaveOld());
 			btnSaveLayer.setToolTip("Save layer view");
 			Menu menuSaveLayer = new Menu();
 			menuSaveLayer.setStyleName("gisViewerMenu");

src/main/java/org/gcube/portlets/user/gisviewer/client/openlayers/OpenLayersMap.java

@@ -805,8 +805,9 @@ public class OpenLayersMap {
 	public void changeSize(String w, String h) {
 		// if together are positives
 		if (Integer.parseInt(w) > 0 && Integer.parseInt(h) > 0) {
+			int height = Integer.parseInt(h) - 10;
 			mapWidget.setWidth(w);
-			mapWidget.setHeight(h);
+			mapWidget.setHeight(height+"");
 			this.updateSize();
 		}
 		// mapWidget.setSize(w, h);
@@ -817,7 +818,7 @@ public class OpenLayersMap {
 	 */
 	public void updateSize() {
 		map.updateSize();
-		Constants.info("Update size", "(" + getMapWidth() + ","	+ getMapHeight() + ")");
+		GWT.log("Updated size: (" + getMapWidth() + ","	+ getMapHeight() + ")");
 	}
 
 	/**

src/main/java/org/gcube/portlets/user/gisviewer/client/openlayers/ToolBarPanel.java

@@ -113,6 +113,7 @@ public class ToolBarPanel extends ToolBar {
 		// layer export
 		exportButton = new Button("", Images.iconExport());
 		exportButton.setToolTip(EXPORT_TOOLTIP);
+		exportButton.setSize(32, 32);
 		Menu menuExport = new Menu();
 		menuExport.setStyleName("gisViewerMenu");
 		int i=0;
@@ -180,7 +181,7 @@ public class ToolBarPanel extends ToolBar {
 		button.setIcon(img);
 //		button.addStyleName("iconOpenlayersToolbar");
 		button.setToolTip(toolTip);
-//		button.setSize(25, 25);
+		button.setSize(32, 32);
 	}
 
 
@@ -198,10 +199,12 @@ public class ToolBarPanel extends ToolBar {
 
 
 	private void setZoomInToggle() {
+		//setUpBotton(zoomInToggle, Images.iconZoomIn(), ZOOM_IN_TOOLTIP);
 		zoomInToggle = new ToggleButton();
 		zoomInToggle.setIcon(Images.iconZoomIn());
 		zoomInToggle.setToolTip(ZOOM_IN_TOOLTIP);
-//TODO
+		zoomInToggle.setSize(32, 32);
+
 		//zoomInToggle.setToggleGroup(TOGGLE_GROUP);
 		zoomInToggle.addSelectionListener(new SelectionListener<ButtonEvent>() {
 			@Override
@@ -228,6 +231,7 @@ public class ToolBarPanel extends ToolBar {
 		setUpBotton(panToggle, Images.iconPan(), PAN_TOOLTIP);
 		panToggle.toggle(true);
 		panToggle.setToggleGroup(TOGGLE_GROUP);
+		//panToggle.setSize(32, 32);
 		panToggle.addSelectionListener(new SelectionListener<ButtonEvent>() {
 			@Override
 			public void componentSelected(ButtonEvent be) {

src/main/java/org/gcube/portlets/user/gisviewer/client/resources/Images.java

@@ -45,6 +45,10 @@ public class Images {
 	public static AbstractImagePrototype iconExport() {
 		return AbstractImagePrototype.create(GisViewer.resources.iconExport());
 	}
+	
+	public static AbstractImagePrototype iconExportOld() {
+		return AbstractImagePrototype.create(GisViewer.resources.iconExportOld());
+	}
 
 	public static AbstractImagePrototype iconFilter() {
 		return AbstractImagePrototype.create(GisViewer.resources.iconFilter());
@@ -69,6 +73,10 @@ public class Images {
 	public static AbstractImagePrototype iconSave() {
 		return AbstractImagePrototype.create(GisViewer.resources.iconSave());
 	}
+	
+	public static AbstractImagePrototype iconSaveOld() {
+		return AbstractImagePrototype.create(GisViewer.resources.iconSaveOld());
+	}
 
 	public static AbstractImagePrototype iconExecuteQuery() {
 		return AbstractImagePrototype.create(GisViewer.resources.iconArrowBlueRight());

src/main/java/org/gcube/portlets/user/gisviewer/client/resources/Resources.java

@@ -34,6 +34,9 @@ public interface Resources extends ClientBundle {
 	ImageResource iconTiff();
 
 	@Source("export.gif")
+	ImageResource iconExportOld();
+	
+	@Source("new-icon/export_24.png")
 	ImageResource iconExport();
 
 	@Source("filter.gif")
@@ -58,6 +61,9 @@ public interface Resources extends ClientBundle {
 	ImageResource iconTriangleDown();
 
 	@Source("saveLayer.png")
+	ImageResource iconSaveOld();
+	
+	@Source("new-icon/save_24.png")
 	ImageResource iconSave();
 
 	@Source("arrowBlueRight.png")
@@ -66,7 +72,10 @@ public interface Resources extends ClientBundle {
 	@Source("remove.png")
 	ImageResource iconRemoveCqlFilter();
 
-	@Source("cancel_icon.png")
+//	@Source("cancel_icon.png")
+//	ImageResource iconToolbarRemove();
+	
+	@Source("new-icon/cancel_24.png")
 	ImageResource iconToolbarRemove();
 
 	@Source("cqlFilterTip.png")
@@ -86,24 +95,38 @@ public interface Resources extends ClientBundle {
 
 	@Source("closeOver.png")
 	ImageResource iconCloseLayerOver();
-
-
-	@Source("icon_zoomfull2.png")
+//
+//	@Source("icon_zoomfull2.png")
+//	ImageResource iconMaxExtent();
+	
+	@Source("new-icon/globe_24.png")
 	ImageResource iconMaxExtent();
 
-	@Source("zoom_in.png")
+//	@Source("zoom_in.png")
+//	ImageResource iconZoomIn();
+	
+	@Source("new-icon/zoom_in_24.png")
 	ImageResource iconZoomIn();
 
 	@Source("zoom_out.png")
 	ImageResource iconZoomOut();
 
-	@Source("hand.png")
+//	@Source("hand.png")
+//	ImageResource iconPan();
+	
+	@Source("new-icon/drag_24.png")
 	ImageResource iconPan();
 
-	@Source("info_icon.gif")
+//	@Source("info_icon.gif")
+//	ImageResource iconClickData();
+	
+	@Source("new-icon/point_selection_24.png")
 	ImageResource iconClickData();
 
-	@Source("selection.gif")
+//	@Source("selection.gif")
+//	ImageResource iconBoxData();
+	
+	@Source("new-icon/box_selection_24.png")
 	ImageResource iconBoxData();
 
 	@Source("no_legend_available.png")