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

2013-06-04 Sergio Martin <sergio.martin@artica.es> 

* include/styles/pandora.css
	include/functions_groups.php
	operation/agentes/group_view.php: Delete status column
	and group image from groups view. Another visual fixes
	were done



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8249 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-06-04 08:12:44 +00:00
parent c29d1f92fa
commit 756a889d15
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-06-04 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css
include/functions_groups.php
operation/agentes/group_view.php: Delete status column
and group image from groups view. Another visual fixes
were done
2013-06-03 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css

22
pandora_console/include/functions_groups.php
View File

@ -871,20 +871,20 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
echo "</td>";
// Status
echo "<td style='text-align:center;'>" . $status_image . "</td>";
// echo "<td style='text-align:center;'>" . $status_image . "</td>";
// Group name
echo "<td class='' style='font-weight: bold; font-size: 12px;'>&nbsp;&nbsp;";
echo $group['prefix'] . ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt');
//echo $group['prefix'] . ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt');
echo "&nbsp;<a class='' href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
echo ui_print_truncate_text($group['name']);
echo $group['prefix'] . ui_print_truncate_text($group['name']);
echo "</a>";
echo "</td>";
// Total agents
echo "<td class='group_view_data $group_class' class='group_view_data' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if ($data["total_agents"] > 0)
echo "<a class='group_view_data' style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
//Total agent field given by function reporting_get_group_stats return the number of agents
@ -911,7 +911,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Agents unknown
if ($data["agents_unknown"] > 0) {
echo "<td class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group&status=3'>";
echo $data["agents_unknown"];
echo "</a>";
@ -924,7 +924,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Unknown
if ($data["monitor_unknown"] > 0) {
echo "<td class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data' style='font-weight: bold; font-size: 18px; color: #666; text-align: center;'
echo "<a class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=3'>";
echo $data["monitor_unknown"];
echo "</a>";
@ -938,7 +938,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Not Init
if ($data["monitor_not_init"] > 0) {
echo "<td class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=5'>";
echo $data["monitor_not_init"];
echo "</a>";
@ -952,7 +952,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors OK
echo "<td class='group_view_data group_view_data_ok $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if ($data["monitor_ok"] > 0) {
echo "<a class='group_view_data group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;' href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=0'>";
echo "<a class='group_view_data group_view_data_unk $group_class' style='font-weight: bold; font-size: 18px; text-align: center;' href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=0'>";
echo $data["monitor_ok"];
echo "</a>";
}
@ -964,7 +964,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Warning
if ($data["monitor_warning"] > 0) {
echo "<td class='group_view_data group_view_data_warn $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data group_view_data_warn' class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data group_view_data_warn $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=1'>";
echo $data["monitor_warning"];
echo "</a>";
@ -977,7 +977,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Critical
if ($data["monitor_critical"] > 0) {
echo "<td class='group_view_data group_view_data_crit $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data group_view_data_crit' style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data group_view_data_crit $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=2'>";
echo $data["monitor_critical"];
echo "</a>";
@ -989,7 +989,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Alerts fired
if ($data["monitor_alerts_fired"] > 0) {
echo "<td class='group_view_data group_view_data_alrm $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data group_view_data_alrm' style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data group_view_data_alrm $group_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/alerts_status&ag_group=$id_group&filter=fired'>";
echo $data["monitor_alerts_fired"];
echo "</a>";

12
pandora_console/include/styles/pandora.css
View File

@ -2276,6 +2276,11 @@ div.cellBig {
-khtml-opacity: 0.8;
}
tr.group_view_data, .group_view_data {
color: #fff;
}
tr.group_view_crit, .group_view_crit {
background-color: #FA3030;
}
@ -2289,10 +2294,11 @@ tr.group_view_ok, .group_view_ok {
tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, tr.a.group_view_warn {
background-color: #F5E535;
color: #3F3F3F !important;
}
a.group_view_warn {
color: #111 !important;
color: #3F3F3F !important;
}
tr.group_view_alrm, .group_view_alrm {
@ -2303,10 +2309,6 @@ tr.group_view_unk, .group_view_unk {
background-color: #C4C4C4;
}
tr.group_view_data, .group_view_data {
color: #fff !important;
}
/* classes for event priorities. Sits now in functions.php */
.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a, .datos_green * {
background-color: #6EB432;

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

@ -94,7 +94,7 @@ if (count($agents) > 0) {
echo '<table cellpadding="0" cellspacing="0" style="margin-top:10px;" class="databox" border="0" width="98%">';
echo "<tr>";
echo "<th style='width: 26px;'>" . __("Force") . "</th>";
echo "<th style='width: 26px;'>" . __("Status") . "</th>";
//echo "<th style='width: 26px;'>" . __("Status") . "</th>";
echo "<th width='30%'>" . __("Group") . "</th>";
echo "<th width='10%'>" . __("Agents") . "</th>";
echo "<th width='10%'>" . __("Agent unknown") . "</th>";