From d00322840508e70528990cd72c5bc4ae4f7c87ee Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Thu, 7 Feb 2013 16:54:21 +0000
Subject: [PATCH] 2013-02-07  Sergio Martin <sergio.martin@artica.es>

	* godmode/agentes/agent_conf_gis.php
	godmode/agentes/agent_manager.php
	godmode/massive/massive_edit_agents.php: Change a strings of
	ignore gis option in agent configuration to be more usable



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                               | 7 +++++++
 pandora_console/godmode/agentes/agent_conf_gis.php      | 8 ++++----
 pandora_console/godmode/agentes/agent_manager.php       | 8 ++++----
 pandora_console/godmode/massive/massive_edit_agents.php | 4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b9584fc757..8e756e79d6 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-07  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/agentes/agent_conf_gis.php
+	godmode/agentes/agent_manager.php
+	godmode/massive/massive_edit_agents.php: Change a strings of 
+	ignore gis option in agent configuration to be more usable
+
 2013-02-07 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* include/functions_ui.php, include/ajax/agent.php: improved the
diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php
index 0b5c2b178f..ae964f2826 100644
--- a/pandora_console/godmode/agentes/agent_conf_gis.php
+++ b/pandora_console/godmode/agentes/agent_conf_gis.php
@@ -61,8 +61,8 @@ $table->data[3][1] = html_print_input_text_extended ('altitude', $agentData['sto
 	array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true);
 
 $table->data[4][0] = __('Ignore new GIS data:');
-$table->data[4][1] = __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
-$table->data[4][1] .= __('Enabled').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
+$table->data[4][1] = __('Yes').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
+$table->data[4][1] .= __('No').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
 
 $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente;
 echo "<form method='post' action='" . $url . "' onsubmit ='return validateFormFields();'>";
@@ -76,8 +76,8 @@ echo "</form>";
 ?>
 <script type="text/javascript">
 function setIgnoreGISDataEnabled() {
-	$("#radiobtn0001").removeAttr("checked");
-	$("#radiobtn0002").attr("checked","checked");
+	$("#radiobtn0002").removeAttr("checked");
+	$("#radiobtn0001").attr("checked","checked");
 }
 
 function validateFormFields() {
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 25367c58f9..14bbcc3909 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -303,12 +303,12 @@ $table->data[4][1] = html_print_select($arraySelectIcon, "icon_path",
 
 if ($config['activate_gis']) {
 	$table->data[5][0] = __('Ignore new GIS data:');
-	$table->data[5][1] = __('Disabled') . ' ' .
-		html_print_radio_button_extended ("update_gis_data", 1, '',
-			$update_gis_data, false, '', 'style="margin-right: 40px;"', true);
-	$table->data[5][1] .= __('Enabled') . ' ' .
+	$table->data[5][1] = __('Yes') . ' ' .
 		html_print_radio_button_extended ("update_gis_data", 0, '',
 			$update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] .= __('No') . ' ' .
+		html_print_radio_button_extended ("update_gis_data", 1, '',
+			$update_gis_data, false, '', 'style="margin-right: 40px;"', true);
 }
 
 $table->data[6][0] = __('Url address');
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index bae746556d..7658eeb63c 100644
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -352,8 +352,8 @@ $table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path
 if ($config['activate_gis']) {
 	$table->data[5][0] = __('Ignore new GIS data:');
 	$table->data[5][1] = __('No change').' '.html_print_radio_button_extended ("update_gis_data", -1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
-	$table->data[5][1] .= __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
-	$table->data[5][1] .= __('Active').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] .= __('Yes').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] .= __('No').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
 }
 
 $table->data[6][0] = __('Quiet');