diff options
| author | tommy tomson <thomas.bierey@gmx.de> | 2012-05-11 16:41:16 +0200 |
|---|---|---|
| committer | tommy tomson <thomas.bierey@gmx.de> | 2012-05-11 16:41:16 +0200 |
| commit | 48c48d644f4b6dca237e61594d5d95a0c1c3f6e8 (patch) | |
| tree | 6116903d1172c0b8b0c7f1eabefa0806af151448 /view/theme/diabook/theme.php | |
| parent | 74e79a06a8987cda06951cee863b9b3e61cdc9f9 (diff) | |
| download | volse-hubzilla-48c48d644f4b6dca237e61594d5d95a0c1c3f6e8.tar.gz volse-hubzilla-48c48d644f4b6dca237e61594d5d95a0c1c3f6e8.tar.bz2 volse-hubzilla-48c48d644f4b6dca237e61594d5d95a0c1c3f6e8.zip | |
diabook-theme: update mapquery and small fix
Diffstat (limited to 'view/theme/diabook/theme.php')
| -rwxr-xr-x | view/theme/diabook/theme.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 666059283..8a7bf19e9 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -254,8 +254,8 @@ if ($color=="dark") $color_path = "/diabook-dark/"; function open_mapcontrol() { $("div#mapcontrol").attr("style","display: block;width:900px;height:900px;"); $("#map2").mapQuery({ - layers:[{type:"osm", minZoom:1, label:"OpenStreetMap" }, - {type:"wms", minZoom:1, label:"Population density 2010", legend:{url:"http://mapserver.edugis.nl/cgi-bin/mapserv?map=maps/edugis/cache/population.map&version=1.1.1&service=WMS&request=GetLegendGraphic&layer=Bevolkingsdichtheid_2010&format=image/png"}, url:"http://t1.edugis.nl/tiles/tilecache.py?map=maps/edugis/cache/population.map", + layers:[{type:"osm", label:"OpenStreetMap" }, + {type:"wms", label:"Population density 2010", legend:{url:"http://mapserver.edugis.nl/cgi-bin/mapserv?map=maps/edugis/cache/population.map&version=1.1.1&service=WMS&request=GetLegendGraphic&layer=Bevolkingsdichtheid_2010&format=image/png"}, url:"http://t1.edugis.nl/tiles/tilecache.py?map=maps/edugis/cache/population.map", layers:"Bevolkingsdichtheid_2010" }], center:({zoom:'.$ELZoom.',position:['.$ELPosX.','.$ELPosY.']})}); @@ -270,10 +270,12 @@ if ($color=="dark") $color_path = "/diabook-dark/"; map = $("#map2").mapQuery().data("mapQuery"); textarea = document.getElementById("id_diabook_ELZoom"); - + textarea.value = "'.$ELZoom.'"; $("#map2").bind("mousewheel", function(event, delta) { - if (delta > 0 || delta < 0){ - textarea.value = map.center().zoom; } + if (delta > 0 && textarea.value < 18){ + textarea.value = textarea.value - delta*-1; } + if (delta < 0 && textarea.value > "0"){ + textarea.value = textarea.value - delta*-1; } }); }; </script>'; @@ -579,7 +581,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 12 photos - if($close_photos != "1") { + if($close_lastphotos != "1") { $aside['$photos_title'] = t('Last photos'); $aside['$photos_items'] = array(); $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM |