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

2009-02-16 Raul Mateos <raulofpandora@gmail.com> 

* include/config_process.php: Update build after last changes.
	* operation/events/events.php: Now the legend is shown only if there are
	events, just a cosmetic change.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-02-16 17:09:41 +00:00
parent 64292adc7c
commit a7bccca13c
3 changed files with 48 additions and 37 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 @@
2009-02-16 Raul Mateos <raulofpandora@gmail.com>
* include/config_process.php: Update build after last changes.
* operation/events/events.php: Now the legend is shown only if there are
events, just a cosmetic change.
2009-02-16 Esteban Sanchez <estebans@artica.es>
* include/javascript/jquery.pandora.controls.js: Added to repository.

10
pandora_console/include/config_process.php
View File

@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//Pandora Version
$build_version = 'PC090120';
$build_version = 'PC090216';
$pandora_version = 'v2.1-dev';
// Next is the directory where "/attachment" directory is placed, to upload files stores.
@ -86,9 +86,13 @@ foreach ($configs as $c) {
break;
case "auth":
exit ('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head><title>Pandora FMS Error</title>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Pandora FMS Error</title>
<link rel="stylesheet" href="./include/styles/pandora.css" type="text/css">
</head><body><div align="center">
</head>
<body>
<div align="center">
<div id="db_f">
<div>
<a href="index.php"><img src="images/pandora_logo.png" border="0" alt="logo" /></a>

68
pandora_console/operation/events/events.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - the Flexible Monitoring System
// ============================================
// Copyright (c) 2008 Artica Soluciones Tecnologicas, http://www.artica.es
// Copyright (c) 2009 Artica Soluciones Tecnologicas, http://www.artica.es
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
@ -430,7 +430,9 @@ foreach ($result as $row) {
array_push ($table->data, $data);
}
if (!empty ($table->data)) {
if (empty ($table->data)) {
echo '<div class="nf">'.__('No events').'</div>';
} else {
echo '<form method="post" action="'.$url.'&pure='.$config["pure"].'">';
print_table ($table);
echo '<div style="width:750px; text-align:right">';
@ -440,39 +442,37 @@ if (!empty ($table->data)) {
if (give_acl ($config["id_user"], 0,"IM") == 1) {
print_submit_button (__('Delete'), 'delete', false, 'class="sub delete"');
}
echo '</div></form>';
} else {
echo '<div class="nf">'.__('No events').'</div>';
echo '</div></form>
<script language="JavaScript" type="text/javascript">
$(document).ready( function() {
$("INPUT[name=\'allbox\']").click( function() {
$("INPUT[name=\'eventid[]\']").each( function() {
$(this).attr(\'checked\', !$(this).attr(\'checked\'));
});
return !(this).attr(\'checked\');
});
$("#tgl_event_control").click( function () {
$("#event_control").slideToggle ("slow");
});
});
</script>';
if ($config["pure"]== 0) {
echo '<div style="padding-left:30px; width:150px; float:left; line-height:17px;">';
echo '<h3>'.__('Status').'</h3>';
echo '<img src="images/dot_green.png" /> - '.__('Validated event');
echo '<br />';
echo '<img src="images/dot_red.png" /> - '.__('Not validated event');
echo '</div><div style="padding-left:30px; width:150px; float:left; line-height:17px;">';
echo '<h3>'.__('Action').'</h3>';
echo '<img src="images/ok.png" /> - '.__('Validate event');
echo '<br />';
echo '<img src="images/cross.png" /> - '.__('Delete event');
echo '<br />';
echo '<img src="images/page_lightning.png" /> - '.__('Create incident');
echo '</div><div style="clear:both;">&nbsp;</div>';
}
}
unset ($table);
if ($config["pure"]== 0) {
echo '<div style="padding-left:30px; width:150px; float:left; line-height:17px;">';
echo '<h3>'.__('Status').'</h3>';
echo '<img src="images/dot_green.png" /> - '.__('Validated event');
echo '<br />';
echo '<img src="images/dot_red.png" /> - '.__('Not validated event');
echo '</div><div style="padding-left:30px; width:150px; float:left; line-height:17px;">';
echo '<h3>'.__('Action').'</h3>';
echo '<img src="images/ok.png" /> - '.__('Validate event');
echo '<br />';
echo '<img src="images/cross.png" /> - '.__('Delete event');
echo '<br />';
echo '<img src="images/page_lightning.png" /> - '.__('Create incident');
echo '</div><div style="clear:both;">&nbsp;</div>';
}
?>
<script language="JavaScript" type="text/javascript">
$(document).ready( function() {
$("INPUT[name='allbox']").click( function() {
$("INPUT[name='eventid[]']").each( function() {
$(this).attr('checked', !$(this).attr('checked'));
});
return !(this).attr('checked');
});
$("#tgl_event_control").click( function () {
$("#event_control").slideToggle ("slow");
});
});
</script>