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

2011-07-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_events.php
	include/functions.php
	operation/agentes/estado_monitores.php
	operation/agentes/networkmap.php
	godmode/modules/manage_nc_groups.php: Fixes in this views in order 
	to have compatibility with IE.
	
	Bug: #3274423



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-07-12 13:11:33 +00:00
parent aec9f98d83
commit 578116e863
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2011-07-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_events.php
include/functions.php
operation/agentes/estado_monitores.php
operation/agentes/networkmap.php
godmode/modules/manage_nc_groups.php: Fixes in this views in order
to have compatibility with IE.
Bug: #3274423
2011-07-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* install.php: Fixed installation over a new database.

2
pandora_console/godmode/modules/manage_nc_groups.php
View File

@ -120,7 +120,7 @@ foreach ($groups as $group) {
$data[1] = network_components_get_group_name ($group['parent']);
$data[2] = '<form method="post" onsubmit="if (! confirm (\''.__('Are you sure?').'\')) return false">';
$data[2] = '<form method="post" onsubmit="if (! confirm (\''.__('Are you sure?').'\')) return false" style="display: inline">';
$data[2] .= html_print_input_hidden ('delete', 1, true);
$data[2] .= html_print_input_hidden ('id', $group['id_sg'], true);
$data[2] .= html_print_input_image ('del', 'images/cross.png', 1, '', true,

1
pandora_console/include/functions.php
View File

@ -1172,6 +1172,7 @@ function string2image($string, $width, $height, $fontsize = 3,
imagedestroy($rotated);
$file_url = str_replace('#','%23',$file_url);
$file_url = str_replace('%','%25',$file_url);
return $file_url;
}

4
pandora_console/include/functions_events.php
View File

@ -411,7 +411,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$data[3] = '<span class="'.get_priority_class ($event["criticity"]).'f9">'. ui_print_string_substr ($event["evento"],45,true). '</span>';
$data[3] = '<span class="'.get_priority_class ($event["criticity"]).'f9">'. ui_print_string_substr ($event["evento"], 45, true, '9.5'). '</span>';
if ($event["id_agente"] > 0) {
// Agent name
@ -434,7 +434,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
}
// Timestamp
$data[6] = ui_print_timestamp ($event["timestamp"], true);
$data[6] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 7pt'));
array_push ($table->rowclass, get_priority_class ($event["criticity"]));
array_push ($table->data, $data);

6
pandora_console/operation/agentes/estado_monitores.php
View File

@ -312,7 +312,7 @@ foreach ($modules as $module) {
}
}
$data[2] = servers_show_type ($module['id_modulo']) . '&nbsp;&nbsp;';
$data[2] = servers_show_type ($module['id_modulo']) . '&nbsp;';
if (check_acl ($config['id_user'], $id_grupo, "AW"))
$data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
@ -415,7 +415,7 @@ foreach ($modules as $module) {
// if ($nombre_tipo_modulo != "log4x")
$data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> &nbsp;&nbsp;';
$data[8] .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&tab=data_view&amp;period=86400&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("border" => '0', "alt" => "")) . "</a>";
$data[8] .= "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&tab=data_view&amp;period=86400&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("border" => '0', "alt" => "")) . "</a>";
}
if ($module['estado'] == 3) {
@ -424,7 +424,7 @@ foreach ($modules as $module) {
else {
$data[9] = '<span>';
}
$data[9] .= ui_print_timestamp ($module["utimestamp"], true);
$data[9] .= ui_print_timestamp ($module["utimestamp"], true, array('style' => 'font-size: 7pt'));
$data[9] .= '</span>';
array_push ($table->data, $data);

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

@ -214,7 +214,7 @@ switch($activeTab){
}
if(!empty($name)) {
$title .= " &raquo; ".$name;
$title .= " &raquo; ". mb_substr($name, 0, 25);
}
ui_print_page_header (__('Network map')." - ".$title, "images/bricks.png", false, "network_map", false, $buttons);