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

2009-11-04 Raul Mateos <raulofpandora@gmail.com> 

* operation/agentes/alerts_status.php: different colour for table header.

	* operation/agentes/tactical.php: Use red colour from tango palette.

	* godmode/alerts/alert_lists.php, godmode/alerts/alert_compounds.php,
	godmode/alerts/configure_alerts.php: Added text if no alerts defined.

	*  Changelog: Added missed change.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2080 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-11-04 17:11:12 +00:00
parent bbef071585
commit 8effb6d47f
6 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2009-11-04 Raul Mateos <raulofpandora@gmail.com>
* operation/agentes/alerts_status.php: different colour for table header.
* operation/agentes/tactical.php: Use red colour from tango palette.
* godmode/alerts/alert_lists.php, godmode/alerts/alert_compounds.php,
godmode/alerts/configure_alerts.php: Added text if no alerts defined.
* Changelog: Added missed change.
2009-11-04 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: simplify the source code of script.
@ -28,10 +39,12 @@
appareance in title.
* godmode/alerts/alert_actions.php, godmode/alerts/alert_templates.php:
Added text if no action, list or template defined.
Added text if no action or template defined.
* godmode/alerts/alert_list.php: Small fix
* include/styles/pandora.css: Use red colour from tango palette in error.
2009-11-02 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Updated build/version.

4
pandora_console/godmode/alerts/alert_compounds.php
View File

@ -190,7 +190,11 @@ foreach ($id_alerts as $alert) {
array_push ($table->data, $data);
}
if (isset($data)){
print_table ($table);
} else {
echo "<div class='nf'>".__('No alerts found')."</div>";
}
echo '<div class="action-buttons" style="width: '.$table->width.'">';
echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_compound">';

6
pandora_console/godmode/alerts/alert_list.php
View File

@ -198,7 +198,7 @@ if ($id_agente) {
$agents = get_group_agents (array_keys ($groups), false, "none");
}
echo '<a href="#" id="tgl_alert_control"><b>'.__('Alert control filter').'</b>&nbsp;'.print_image ("images/wand.png", true, array ("title" => __('Toggle filter(s)'))).'</a>';
echo '<a href="#" id="tgl_alert_control"><b>'.__('Alert control filter').'</b>&nbsp;'.print_image ("images/wand.png", true, array ("title" => __('Toggle filter(s)'))).'</a><br><br>';
$templateName = get_parameter('template_name','');
$moduleName = get_parameter('module_name','');
@ -460,7 +460,11 @@ foreach ($simple_alerts as $alert) {
array_push ($table->data, $data);
}
if (isset($data)){
print_table ($table);
} else {
echo "<div class='nf'>".__('No alerts defined')."</div>";
}
echo '<h3>'.__('Add alert').'</h3>';

4
pandora_console/godmode/alerts/configure_alert_compound.php
View File

@ -561,7 +561,7 @@ if ($step == 1) {
$alerts = get_agent_alerts_simple ($id_agent);
if (empty ($alerts)) {
$table_alerts->data[0][0] = __('No alerts found');
$table_alerts->data[0][0] = "<div class='nf'>".__('No alerts found')."</div>";
$table_alerts->colspan[0][0] = 3;
$id_agent = 0;
}
@ -728,7 +728,7 @@ $(document).ready (function () {
if (! data) {
$("#alerts_loading").hide ();
tr = $('<tr></tr>').append ($('<td></td>')
.append ("<?php echo __('No alerts found') ?>")
.append ("<?php echo '<div class=\'nf\'>'.__('No alerts found').'</div>'; ?>")
.attr ("colspan", 3));
$("#alert_list").append (tr)
.trigger ("update")

3
pandora_console/operation/agentes/alerts_status.php
View File

@ -191,6 +191,7 @@ else
$table->head[5] = __('Validate');
}
$table->title = __('Single alerts');
$table->titlestyle = "background-color:#799E48;";
if ($print_agent == 0) {
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK)
@ -246,6 +247,8 @@ if (!empty ($table->data)) {
}
$table->title = __('Compound alerts');
$table->titlestyle = "background-color:#799E48;";
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->head[0] = '';
$table->head[1] = '';

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

@ -106,7 +106,7 @@ $cells[2]["color"] = "#FFB900";
$cells[3][0] = __('Monitors critical');
$cells[3][1] = $data["monitor_critical"];
$cells[3]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=2"; //Down
$cells[3]["color"] = "#f00";
$cells[3]["color"] = "#c00";
$cells[4][0] = __('Monitors unknown');
$cells[4][1] = $data["monitor_unknown"];
@ -115,7 +115,7 @@ $cells[4]["color"] = "#C0C0C0";
$cells[5][0] = __('Monitors not init');
$cells[5][1] = $data["monitor_not_init"];
$cells[5]["color"] = "#f00";
$cells[5]["color"] = "#c00";
$cells[5]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=5"; //Not init
$cells[6][0] = __('Alerts defined');
@ -126,7 +126,7 @@ $cells[6]["color"] = "#000";
$cells[7][0] = __('Alerts fired');
$cells[7][1] = $data["monitor_alerts_fired"];
$cells[7]["href"] = "index.php?sec=eventos&sec2=operation/events/events&search=&event_type=alert_fired"; //Fired alert events
$cells[7]["color"] = "#f00";
$cells[7]["color"] = "#c00";
print_cells_temp ($cells);