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

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

* mobile/operation/agents.php, mobile/include/style/main.css: some
	fixes.
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8484 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-05 11:28:29 +00:00
parent 4480476589
commit cd47a1fcf5
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-07-05 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php, mobile/include/style/main.css: some
fixes.
MERGED FROM BRANCH 4.0
2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: Small changes. Make

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

@ -544,9 +544,19 @@ table#list_events th {
white-space: nowrap;
}
#list_Modules .cell_2 {
#list_Modules .cell_2,
#list_Modules .cell_3 {
display: none !important;
}
#list_Modules .cell_0 .show_collapside,
#list_Modules .cell_1 .show_collapside {
display: none !important;
}
#list_Modules .cell_0 .ui-link {
font-size: 15px;
}
}
#list_Modules .cell_5 a {

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

@ -234,7 +234,7 @@ class Agents {
'nombre',
'ultimo_contacto',
'intervalo',
'comentarios description',
'comentarios description',
'quiet',
'normal_count',
'warning_count',
@ -255,6 +255,8 @@ class Agents {
$img_status = agents_tree_view_status_img ($agent["critical_count"],
$agent["warning_count"], $agent["unknown_count"])
$img_alert = agents_tree_view_alert_img ($agent_info["monitor_alertsfired"]);
$row[0] = $row[__('Agent')] =
'<a class="ui-link" data-ajax="false" href="index.php?page=agent&id=' . $agent['id_agente'] . '">' . io_safe_output($agent['nombre']) . '</a>';
@ -270,10 +272,13 @@ class Agents {
$row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' .
$img_status;
$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>' .
$img_alert;
$row[7] = $row[__('Modules')] =
'<span class="show_collapside" style="display: none; vertical-align: top;">' . $img_status . '</span>' .
'<span class="show_collapside" style="display: none; vertical-align: top;">' .
$img_status . '</span>' . '&nbsp;' .
'<span class="show_collapside" style="display: none; vertical-align: middle;">' . $img_alert . '</span>' .
'<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;">&nbsp;&nbsp;' . __('M.') . ' </span>' .
reporting_tiny_stats($agent, true);