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

2013-06-24 Miguel de Dios <miguel.dedios@artica.es> 

* operation/visual_console/render_view.php: fixed the javascript
	draw lines when there is any error in the map.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-25 10:11:26 +00:00
parent cb31a08927
commit e11dca6754
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/visual_console/render_view.php: fixed the javascript
draw lines when there is any error in the map.
MERGED FROM THE BRANCH PANDORA_4.0
2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: added more changes for to make

9
pandora_console/operation/visual_console/render_view.php
View File

@ -197,7 +197,7 @@ $(document).ready (function () {
<?php
if ($config["pure"] && ((int)get_parameter('refr', 0)) > 0) {
?>
?>
t = new Date();
t.setTime (t.getTime() + <?php echo ((int)get_parameter('refr', 0)) * 1000; ?>);
$("#countdown").countdown({
@ -205,10 +205,13 @@ $(document).ready (function () {
format: 'MS',
description: '<?php echo __('Until refresh'); ?>'
});
<?php
<?php
}
?>
draw_lines (lines, 'layout_map');
if (typeof(lines) != 'undefined') {
draw_lines (lines, 'layout_map');
}
});
/* ]]> */
</script>