# HG changeset patch # User fknauft # Date 1327653820 -3600 # Node ID f25ee0424ce67d6e95c5c37852b2bc1c4d1823d7 # Parent 260ec888fe15dce24665aaa932676585171b2837 Open Map in new Window diff -r 260ec888fe15 -r f25ee0424ce6 gis_gui/blocks/map.html.pt --- a/gis_gui/blocks/map.html.pt Wed Jan 25 20:45:13 2012 +0100 +++ b/gis_gui/blocks/map.html.pt Fri Jan 27 09:43:40 2012 +0100 @@ -52,11 +52,9 @@

- -


- -

+

+

+

diff -r 260ec888fe15 -r f25ee0424ce6 gis_gui/blocks/map.js --- a/gis_gui/blocks/map.js Wed Jan 25 20:45:13 2012 +0100 +++ b/gis_gui/blocks/map.js Fri Jan 27 09:43:40 2012 +0100 @@ -53,13 +53,14 @@ }); // new window button - /* $(be).find(".map_newwindow_button").click(function () { + $(be).find(".map_newwindow_button").click(function () { console.debug("map in new window"); params = block.readMapParams(); - var newWindow = window.open("blocks/map_newwindow.html"); - map=block.updateMap(newWindow.document.getElementById("map_box"),params); + paramsString=JSON.stringify(params); + var newWindow = window.open("blocks/map_newwindow.html?map_params="+paramsString); + //map=block.updateMap(newWindow.document.getElementById("map_box"),params); }); - */ + // reload button $(be).find(".map_reload_button").click(function () { console.debug("reload map"); @@ -173,6 +174,22 @@ }; +guiBlocks.Block.prototype.updateMapId = function(id) { + + //************ + console.debug("updateMap:", id); + //************* + data2= blocks.loadListOfItems("test1","map",data); + var params = jQuery.grep(data, function(x){return (x.key == mapname);})[0].val; + if (elem == null) { + elem = this.element; + } + if (map_params == null) { + map_params = params; + } + var map = block.updateMap(elem, params); +}; + guiBlocks.Block.prototype.updateMap = function(elem,map_params) { //************ diff -r 260ec888fe15 -r f25ee0424ce6 gis_gui/blocks/map_newwindow.html.pt --- a/gis_gui/blocks/map_newwindow.html.pt Wed Jan 25 20:45:13 2012 +0100 +++ b/gis_gui/blocks/map_newwindow.html.pt Fri Jan 27 09:43:40 2012 +0100 @@ -1,15 +1,116 @@ - + Map Points in Time - - - + + + + + + + - + + + + +
[loading...]
-
[loading...]
+ + \ No newline at end of file diff -r 260ec888fe15 -r f25ee0424ce6 gis_gui/head.pt --- a/gis_gui/head.pt Wed Jan 25 20:45:13 2012 +0100 +++ b/gis_gui/head.pt Fri Jan 27 09:43:40 2012 +0100 @@ -1,6 +1,8 @@
+
map Places In Time +
Manual
\ No newline at end of file diff -r 260ec888fe15 -r f25ee0424ce6 gis_gui/index_html.html --- a/gis_gui/index_html.html Wed Jan 25 20:45:13 2012 +0100 +++ b/gis_gui/index_html.html Fri Jan 27 09:43:40 2012 +0100 @@ -7,7 +7,7 @@ - + diff -r 260ec888fe15 -r f25ee0424ce6 zpt/GIS_schema_table.zpt --- a/zpt/GIS_schema_table.zpt Wed Jan 25 20:45:13 2012 +0100 +++ b/zpt/GIS_schema_table.zpt Fri Jan 27 09:43:40 2012 +0100 @@ -2,13 +2,13 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + + - +
\ No newline at end of file