From ad48fa224221b52c475204829a1459fea19abcd0 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Mon, 5 Dec 2011 11:54:06 +0000 Subject: [PATCH] 2011-12-05 Juan Manuel Ramon * godmode/agentes/agent_conf_gis.php godmode/gis_maps/configure_gis_map.php: Changed order of latitude, longitude and altitude in Gis maps information. Fixes: #3450292 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ .../godmode/agentes/agent_conf_gis.php | 8 ++++---- .../godmode/gis_maps/configure_gis_map.php | 16 ++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fcf83ad426..d27cd64985 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-12-05 Juan Manuel Ramon + + * godmode/agentes/agent_conf_gis.php + godmode/gis_maps/configure_gis_map.php: Changed order of latitude, + longitude and altitude in Gis maps information. + + Fixes: #3450292 + 2011-12-02 Sergio Martin * include/functions_modules.php diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index e2c31d562b..0b5c2b178f 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -48,12 +48,12 @@ $table->data = array(); $table->head[0] =__('Agent position'); $table->head_colspan[0] = 2; -$table->data[1][0] = __('Longitude: '); -$table->data[1][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '', +$table->data[1][0] = __('Latitude: '); +$table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 10, 10, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); -$table->data[2][0] = __('Latitude: '); -$table->data[2][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 10, 10, false, '', +$table->data[2][0] = __('Longitude: '); +$table->data[2][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); $table->data[3][0] = __('Altitude: '); diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index c25e888cf8..8fb99b43ec 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -345,20 +345,20 @@ $table->data[2][1] = html_print_select_groups(false, 'IW', $display_all_group, ' $table->data[3][0] = __('Default zoom') . ui_print_help_tip (__('Default zoom level when opening the map'), true). ':'; $table->data[3][1] = html_print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true) . html_print_input_hidden('map_levels_zoom', $map_levels_zoom, true); -$table->data[4][0] = __('Center Longitude') . ':'; -$table->data[4][1] = html_print_input_text ('map_initial_longitude', $map_initial_longitude, '', 4, 8, true); +$table->data[4][0] = __('Center Latitude') . ':'; +$table->data[4][1] = html_print_input_text ('map_initial_latitude', $map_initial_latitude, '', 4, 8, true); -$table->data[5][0] = __('Center Latitude') . ':'; -$table->data[5][1] = html_print_input_text ('map_initial_latitude', $map_initial_latitude, '', 4, 8, true); +$table->data[5][0] = __('Center Longitude') . ':'; +$table->data[5][1] = html_print_input_text ('map_initial_longitude', $map_initial_longitude, '', 4, 8, true); $table->data[6][0] = __('Center Altitude') . ':'; $table->data[6][1] = html_print_input_text ('map_initial_altitude', $map_initial_altitude, '', 4, 8, true); -$table->data[7][0] = __('Default Longitude') . ':'; -$table->data[7][1] = html_print_input_text ('map_default_longitude', $map_default_longitude, '', 4, 8, true); +$table->data[7][0] = __('Default Latitude') . ':'; +$table->data[7][1] = html_print_input_text ('map_default_latitude', $map_default_latitude, '', 4, 8, true); -$table->data[8][0] = __('Default Latitude') . ':'; -$table->data[8][1] = html_print_input_text ('map_default_latitude', $map_default_latitude, '', 4, 8, true); +$table->data[8][0] = __('Default Longitude') . ':'; +$table->data[8][1] = html_print_input_text ('map_default_longitude', $map_default_longitude, '', 4, 8, true); $table->data[9][0] = __('Default Altitude') . ':'; $table->data[9][1] = html_print_input_text ('map_default_altitude', $map_default_altitude, '', 4, 8, true);