diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d497865363..9468db72cf 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2013-05-31 Miguel de Dios + + * mobile/include/style/main.css: fixed the list of modules in the + main agent view. + + * mobile/operation/agent.php: improved the source code style. + + * mobile/operation/agents.php: fixed the PHP warnings. + 2013-05-31 Sergio Martin * include/functions_events.php: Minor visual fix diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 56bb1afec5..1c77801da2 100644 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -537,7 +537,7 @@ table#list_events th { #list_Modules .cell_5 a { color: #000000 !important; } - +/* @media screen and (max-width: 35em) { #list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_6 .ui-table-cell-label { @@ -558,7 +558,7 @@ table#list_events th { #list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_3 .ui-table-cell-label, #list_Modules_Embedded .cell_4 .ui-table-cell-label { - display: none; + display: none !important; } #list_Modules_Embedded .show_collapside { @@ -569,10 +569,11 @@ table#list_events th { white-space: nowrap; } - #list_Modules_Embedded .cell_2 { + #list_Modules_Embedded .cell_2, + #list_Modules_Embedded .cell_1 { display: none !important; } -} +}*/ #list_Modules_Embedded .cell_4 a { color: #000000 !important; diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php index a3a3b47e01..8a721e9777 100644 --- a/pandora_console/mobile/operation/agent.php +++ b/pandora_console/mobile/operation/agent.php @@ -130,7 +130,8 @@ class Agent { $modules = new Modules(); - $filters = array('id_agent' => $this->id, 'all_modules' => true, 'status' => -1); + $filters = array('id_agent' => $this->id, + 'all_modules' => true, 'status' => -1); $modules->setFilters($filters); $modules->disabledColumns(array('agent')); $ui->contentBeginCollapsible(__('Modules')); diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php index 57f6f4efd0..ad0856af6b 100644 --- a/pandora_console/mobile/operation/agents.php +++ b/pandora_console/mobile/operation/agents.php @@ -255,8 +255,10 @@ class Agents { $row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true); $row[4] = $row[__('Interval')] = '' . '' . human_time_description_raw($agent["intervalo"]) . ''; - $row[5] = $row[__('Status')] = '' . agents_tree_view_status_img ($agent["critical_count"], - $agent["warning_count"], $agent["unknown_count"]); + $row[5] = $row[__('Status')] = '' . + agents_tree_view_status_img ($agent["critical_count"], + $agent["warning_count"], $agent["unknown_count"], + $agent["total_count"], $agent["notinit_count"]); $row[6] = $row[__('Alerts')] = '' . agents_tree_view_alert_img ($agent["fired_count"]); $row[7] = $row[__('Modules')] = '' .