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

2010-05-11 Raul Mateos <raulofpandora@gmail.com> 

* godmode/reporting/map_builder.php: Fixed a typo.
	* godmode/gis_maps/index.php: Updated year. Show text if no map defined.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2694 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-05-11 15:17:09 +00:00
parent 4113b9b697
commit d25cf8c368
3 changed files with 15 additions and 8 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 @@
2010-05-11 Raúl Mateos <raulofpandora@gmail.com>
* godmode/reporting/map_builder.php: Fixed a typo.
* godmode/gis_maps/index.php: Updated year. Show text if no map defined.
2010-05-11 Sergio Martin <sergio.martin@artica.es>
* godmode/gis_maps/index.php: Fixed the change

9
pandora_console/godmode/gis_maps/index.php
View File

@ -1,7 +1,7 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -77,7 +77,9 @@ $table->data = array();
$defaultMapId = null;
if ($maps !== false) {
if (!$maps) {
echo '<div class="nf">'.('No maps defined').'</div>';
} else {
foreach ($maps as $map) {
$checked = false;
@ -92,10 +94,9 @@ if ($maps !== false) {
print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true),
'<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/index&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">' . print_image ("images/cross.png", true).'</a>');
}
print_table($table);
}
print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">';
echo '<form action="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map" method="post">';
print_input_hidden ('action','new_map');

8
pandora_console/godmode/reporting/map_builder.php
View File

@ -81,20 +81,20 @@ if ($copy_layout) {
// If the number of inserts is correct, the copy is completed
if ($ninsert == $inserts) {
echo '<h3 class="suc">'.__('Successfully copyed').'</h3>';
echo '<h3 class="suc">'.__('Successfully copied').'</h3>';
clean_cache();
} else {
echo '<h3 class="error">'.__('Not copyed. Error copying data').'</h3>';
echo '<h3 class="error">'.__('Not copied. Error copying data').'</h3>';
}
}
else{
// If the array is empty the copy is completed
echo '<h3 class="suc">'.__('Successfully copyed').'</h3>';
echo '<h3 class="suc">'.__('Successfully copied').'</h3>';
clean_cache();
}
}
else {
echo '<h3 class="error">'.__('Not copyed. Error copying data').'</h3>';
echo '<h3 class="error">'.__('Not copied. Error copying data').'</h3>';
}
}