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

2013-05-31 Miguel de Dios <miguel.dedios@artica.es> 

* 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.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8242 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-31 15:38:59 +00:00
parent bcf51c9666
commit 5e1e3efe24
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-05-31 Miguel de Dios <miguel.dedios@artica.es>
* 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 <sergio.martin@artica.es> 2013-05-31 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php: Minor visual fix * include/functions_events.php: Minor visual fix

9
pandora_console/mobile/include/style/main.css
View File

@ -537,7 +537,7 @@ table#list_events th {
#list_Modules .cell_5 a { #list_Modules .cell_5 a {
color: #000000 !important; color: #000000 !important;
} }
/*
@media screen and (max-width: 35em) { @media screen and (max-width: 35em) {
#list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_1 .ui-table-cell-label,
#list_Modules_Embedded .cell_6 .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_1 .ui-table-cell-label,
#list_Modules_Embedded .cell_3 .ui-table-cell-label, #list_Modules_Embedded .cell_3 .ui-table-cell-label,
#list_Modules_Embedded .cell_4 .ui-table-cell-label { #list_Modules_Embedded .cell_4 .ui-table-cell-label {
display: none; display: none !important;
} }
#list_Modules_Embedded .show_collapside { #list_Modules_Embedded .show_collapside {
@ -569,10 +569,11 @@ table#list_events th {
white-space: nowrap; white-space: nowrap;
} }
#list_Modules_Embedded .cell_2 { #list_Modules_Embedded .cell_2,
#list_Modules_Embedded .cell_1 {
display: none !important; display: none !important;
} }
} }*/
#list_Modules_Embedded .cell_4 a { #list_Modules_Embedded .cell_4 a {
color: #000000 !important; color: #000000 !important;

3
pandora_console/mobile/operation/agent.php
View File

@ -130,7 +130,8 @@ class Agent {
$modules = new Modules(); $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->setFilters($filters);
$modules->disabledColumns(array('agent')); $modules->disabledColumns(array('agent'));
$ui->contentBeginCollapsible(__('Modules')); $ui->contentBeginCollapsible(__('Modules'));

6
pandora_console/mobile/operation/agents.php
View File

@ -255,8 +255,10 @@ class Agents {
$row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true); $row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true);
$row[4] = $row[__('Interval')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('I.') . ' </span>' . $row[4] = $row[__('Interval')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('I.') . ' </span>' .
'<span style="vertical-align: 0%;">' . human_time_description_raw($agent["intervalo"]) . '</span>'; '<span style="vertical-align: 0%;">' . human_time_description_raw($agent["intervalo"]) . '</span>';
$row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' . agents_tree_view_status_img ($agent["critical_count"], $row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' .
$agent["warning_count"], $agent["unknown_count"]); agents_tree_view_status_img ($agent["critical_count"],
$agent["warning_count"], $agent["unknown_count"],
$agent["total_count"], $agent["notinit_count"]);
$row[6] = $row[__('Alerts')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('A.') . ' </span>' . agents_tree_view_alert_img ($agent["fired_count"]); $row[6] = $row[__('Alerts')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('A.') . ' </span>' . agents_tree_view_alert_img ($agent["fired_count"]);
$row[7] = $row[__('Modules')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('M.') . ' </span>' . $row[7] = $row[__('Modules')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('M.') . ' </span>' .