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

2011-07-20 Sergio Martin <sergio.martin@artica.es> 

* godmode/agentes/agent_manager.php: Fixed a not found image
	error with the agent icons



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4591 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-20 07:53:03 +00:00
parent b6a2b62c02
commit 62d9f7cf3d
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-07-20 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/agent_manager.php: Fixed a not found image
error with the agent icons
2011-07-20 Junichi Satoh <junichi@rworks.jp> 2011-07-20 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added missing ';'. * extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added missing ';'.

22
pandora_console/godmode/agentes/agent_manager.php
View File

@ -234,18 +234,30 @@ $path = 'images/gis_map/icons/'; //TODO set better method the path
$table->data[4][0] = __('Agent icon'); $table->data[4][0] = __('Agent icon');
if($icon_path == '') { if($icon_path == '') {
$display_icons = 'none'; $display_icons = 'none';
// Hack to show no icon. Use any given image to fix not found image errors
$path_without = "images/spinner.png";
$path_default = "images/spinner.png";
$path_ok = "images/spinner.png";
$path_bad = "images/spinner.png";
$path_warning = "images/spinner.png";
} }
else { else {
$display_icons = ''; $display_icons = '';
$path_without = $path . $icon_path . ".default.png";
$path_default = $path . $icon_path . ".default.png";
$path_ok = $path . $icon_path . ".default.png";
$path_bad = $path . $icon_path . ".default.png";
$path_warning = $path . $icon_path . ".default.png";
} }
$table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) . $table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
'&nbsp;' . __('Without status') . ': ' . html_print_image($path . $icon_path . ".default.png", true, array("id" => "icon_without_status", "style" => "display:".$display_icons.";")) . '&nbsp;' . __('Without status') . ': ' . html_print_image($path_without, true, array("id" => "icon_without_status", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Default') . ': ' . html_print_image($path . $icon_path . ".default.png", true, array("id" => "icon_default", "style" => "display:".$display_icons.";")) . '&nbsp;' . __('Default') . ': ' . html_print_image($path_default, true, array("id" => "icon_default", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Ok') . ': ' . html_print_image($path . $icon_path . ".ok.png", true, array("id" => "icon_ok", "style" => "display:".$display_icons.";")) . '&nbsp;' . __('Ok') . ': ' . html_print_image($path_ok, true, array("id" => "icon_ok", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Bad') . ': ' . html_print_image($path . $icon_path . ".bad.png", true, array("id" => "icon_bad", "style" => "display:".$display_icons.";")) . '&nbsp;' . __('Bad') . ': ' . html_print_image($path_bad, true, array("id" => "icon_bad", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Warning') . ': ' . html_print_image($path . $icon_path . ".warning.png", true, array("id" => "icon_warning", "style" => "display:".$display_icons.";")); '&nbsp;' . __('Warning') . ': ' . html_print_image($path_warning, true, array("id" => "icon_warning", "style" => "display:".$display_icons.";"));
if ($config['activate_gis']) { if ($config['activate_gis']) {
$table->data[5][0] = __('Ignore new GIS data:'); $table->data[5][0] = __('Ignore new GIS data:');