tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-03-31 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/agentes/agent_conf_gis.php,
	operation/agentes/gis_view.php: changed the style to message of
	error to set the standar style of new Pandora.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9681 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-31 10:25:59 +00:00
parent 3a8794c06c
commit b1f963e9bb
3 changed files with 46 additions and 34 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 @@
2014-03-31 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_conf_gis.php,
operation/agentes/gis_view.php: changed the style to message of
error to set the standar style of new Pandora.
2014-03-30 Junichi Satoh <junichi@rworks.jp>
* include/functions_config.php, include/auth/mysql.php,

10
pandora_console/godmode/agentes/agent_conf_gis.php
View File

@ -37,13 +37,19 @@ $agent_name = md5($agent_name);
echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
if (!gis_get_agent_map($id_agente, "500px", "98%", false)) {
echo "<br /><div class='nf'>" . __("There is no default map.") . "</div>";
ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map."));
echo "<script type='text/javascript'>
$(document).ready(function() {
$('#" . $agent_name . "_agent_map').hide();
});
</script>";
}
if ($agentData === false) {
echo "<p>" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "</p>";
}
echo "<div class='warn'>" .__("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "</div>";
echo "<div class='warn'>" .
__("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "</div>";
$table->width = '85%';
$table->data = array();

2
pandora_console/operation/agentes/gis_view.php
View File

@ -52,7 +52,7 @@ echo "<div style='margin-bottom: 30px;'></div>";
echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
if (!gis_get_agent_map($id_agente, "500px", "98%", true, true, $period)) {
echo "<br /><div class='nf'>" . __("There is no default map. Please go to the setup for to set a default map.") . "</div>";
ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map."));
echo "<script type='text/javascript'>
$(document).ready(function() {
$('#" . $agent_name . "_agent_map').hide();