tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* operation/gis_maps/render_view.php: Resize GIS map on normal view.
	
	Bugfix merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-19 18:16:40 +00:00
parent a2c1df3f57
commit 88d2943d6b
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/gis_maps/render_view.php: Resize GIS map on normal view.
Bugfix merged from branches.
2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/gis_maps/render_view.php: Resize GIS map on fullscreen.

18
pandora_console/operation/gis_maps/render_view.php
View File

@ -133,7 +133,7 @@ if ($config["pure"] == 0) {
echo "<div id='map' style='width: 99%; height: 500px; border: 1px solid black;' ></div>";
}
else {
echo "<div id='map' style='position:absolute;top:40px; z-index:100; width: 98%; height:94%; min-height:500px; border: 1px solid black;' ></div>";
echo "<div id='map' style='position:absolute;top:40px; z-index:100; width: 100%; height:94%; min-height:500px; border: 1px solid black;' ></div>";
}
gis_print_map('map', $map['zoom_level'], $map['initial_latitude'],
@ -196,12 +196,24 @@ if ($config["pure"] != 0) {
$().ready(function(){
var new_height = $(document).height();
var new_width = $(document).width();
$("#map").css("height", new_height - 60);
$("#map").css("width", new_width - 25);
});
</script>
<?php
}
else {
// Resize GIS map on normalview
?>
<script type="text/javascript">
$().ready(function(){
var new_height = $("#menu").height();
$("#map").css("height", new_height - 20);
});
</script>
<?php
}
?>