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/gis_maps/index.php: Updated year. Clean code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2700 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-05-11 17:07:33 +00:00
parent 6cc7514600
commit 12d375c974
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2010-05-11 Raúl Mateos <raulofpandora@gmail.com>
* godmode/gis_maps/configure_gis_map.php: Updated year. Clean code.
2010-05-11 Sergio Martin <sergio.martin@artica.es> 2010-05-11 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/gis_step_2.php: Fixed the creation * godmode/setup/gis_step_2.php: Fixed the creation

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

@ -1,7 +1,7 @@
<?php <?php
// Pandora FMS - http://pandorafms.com // 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 // Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
@ -163,7 +163,6 @@ switch ($action) {
case 'new_map': case 'new_map':
print_input_hidden('action', 'save_new'); print_input_hidden('action', 'save_new');
echo "<h2>" . __('GIS Maps') . " &raquo; " . __('Builder') . "</h2>";
$map_name = ''; $map_name = '';
$map_initial_longitude = ''; $map_initial_longitude = '';
$map_initial_latitude = ''; $map_initial_latitude = '';
@ -313,7 +312,7 @@ foreach ($listConnectionTemp as $connectionTemp) {
} }
} }
$table->data[1][0] = __("Add Map connection") . print_help_tip (__('At least one map connection must be deffined, it will be possible to change betwwen the connections in the map'), true). ": " . $iconError; $table->data[1][0] = __("Add Map connection") . print_help_tip (__('At least one map connection must be deffined, it will be possible to change betwwen the connections in the map'), true). ": " . $iconError;
$table->data[1][1] = "<table class='databox' border='0' id='map_connection'> $table->data[1][1] = "<table class='databox' border='0' id='map_connection'>
<tr> <tr>
<td> <td>
@ -770,12 +769,12 @@ function deleteConnectionMap(idConnectionMap) {
function setFieldsRequestAjax(id_conexion) { function setFieldsRequestAjax(id_conexion) {
if (confirm('<?php echo __('Do you want to use the default data from the connection?');?>')) { if (confirm('<?php echo __('Do you want to use the default data from the connection?');?>')) {
jQuery.ajax ({ jQuery.ajax ({
data: "page=operation/gis_maps/ajax&opt=get_data_conexion&id_conection=" + idConnectionMap, data: "page=operation/gis_maps/ajax&opt=get_data_conexion&id_conection=" + idConnectionMap,
type: "GET", type: "GET",
dataType: 'json', dataType: 'json',
url: "ajax.php", url: "ajax.php",
timeout: 10000, timeout: 10000,
success: function (data) { success: function (data) {
if (data.correct) { if (data.correct) {
$("input[name=map_initial_longitude]").val(data.content.initial_longitude); $("input[name=map_initial_longitude]").val(data.content.initial_longitude);
$("input[name=map_initial_latitude]").val(data.content.initial_latitude); $("input[name=map_initial_latitude]").val(data.content.initial_latitude);