tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-07-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* include/styles/pandora.css
	operation/events/events_list.php
	images/splash_pandora.png
	images/sort_down.png
	images/sort_up.png
	general/pandora_help.php
	general/error_perms.php
	general/login_page.php
	general/error_noconfig.php
	general/logoff.php
	general/error_install.php
	godmode/alerts/alert_list.list.php: Css style improvements.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4515 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-07-06 17:16:16 +00:00
parent f814152fbe
commit 2f46bf9cc5
13 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/ChangeLog
View File

@ -1,3 +1,18 @@
2011-07-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css
operation/events/events_list.php
images/splash_pandora.png
images/sort_down.png
images/sort_up.png
general/pandora_help.php
general/error_perms.php
general/login_page.php
general/error_noconfig.php
general/logoff.php
general/error_install.php
godmode/alerts/alert_list.list.php: Css style improvements.
2011-07-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-07-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php * include/functions_html.php

2
pandora_console/general/error_install.php
View File

@ -32,7 +32,7 @@
</head> </head>
<body> <body>
<div id="main" style='float:left; margin-left: 100px'> <div id="main" style=' width: 80%; margin:0 auto 0 auto;'>
<div align='center'> <div align='center'>
<div id='login_f'> <div id='login_f'>
<h1 id="log_f" class="error">Installer active</h1> <h1 id="log_f" class="error">Installer active</h1>

2
pandora_console/general/error_noconfig.php
View File

@ -32,7 +32,7 @@
</head> </head>
<body> <body>
<div id="main" style='float:left; margin-left: 100px'> <div id="main" style=' width: 80%; margin:0 auto 0 auto;'>
<div align='center'> <div align='center'>
<div id='login_f'> <div id='login_f'>
<h1 id="log_f" class="error">No configuration file found</h1> <h1 id="log_f" class="error">No configuration file found</h1>

2
pandora_console/general/error_perms.php
View File

@ -32,7 +32,7 @@
</head> </head>
<body> <body>
<div id="main" style='float:left; margin-left: 100px'> <div id="main" style=' width: 80%; margin:0 auto 0 auto;'>
<div align='center'> <div align='center'>
<div id='login_f'> <div id='login_f'>
<h1 id="log_f" class="error">Bad permission for include/config.php</h1> <h1 id="log_f" class="error">Bad permission for include/config.php</h1>

10
pandora_console/general/login_page.php
View File

@ -24,7 +24,7 @@ if (!empty ($page) && !empty ($sec)) {
echo '<div class="databox_login" id="login">'; echo '<div class="databox_login" id="login">';
//echo '<h1>Put here your custom welcome message</h1>"; // echo "<h1>Put here your custom welcome message</h1>";
//echo '<br /><br /><br />'; //echo '<br /><br /><br />';
echo ' echo '
@ -34,7 +34,7 @@ echo '
if (isset ($login_failed)) { if (isset ($login_failed)) {
// echo '<tr><td colspan="3">'; // echo '<tr><td colspan="3">';
echo '<div style="margin-top:-35px;">'; echo '<div id="error_login">';
echo '<h3 class="error">'.__('Login failed').': '.$config["auth_error"].'</h3>'; echo '<h3 class="error">'.__('Login failed').': '.$config["auth_error"].'</h3>';
echo '</div>'; echo '</div>';
// echo '</td></tr>'; // echo '</td></tr>';
@ -53,13 +53,13 @@ if (!empty ($page) && !empty ($sec)) {
// Replace the following with your own URL and logo. // Replace the following with your own URL and logo.
// A mashup of the Pandora FMS logo and your companies highly preferred // A mashup of the Pandora FMS logo and your companies highly preferred
echo '<a href="http://pandorafms.org" title="Go to pandorafms.org...">'; echo '&nbsp;&nbsp;<a href="http://pandorafms.org" title="Go to pandorafms.org...">';
html_print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0)); html_print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0));
echo '</a><br />'; echo '</a><br />';
// This prints the current pandora console version. // This prints the current pandora console version.
// For stable/live function it might be wise to comment it out // For stable/live function it might be wise to comment it out
echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : ''); echo '&nbsp;&nbsp;&nbsp;' . $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '');
/* CUSTOM BRANDING ENDS HERE */ /* CUSTOM BRANDING ENDS HERE */
@ -67,9 +67,11 @@ echo '</td><td class="f9b">
'.__('Login').':<br />'.html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).' '.__('Login').':<br />'.html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).'
</td></tr> </td></tr>
<tr><td class="f9b"> <tr><td class="f9b">
<br>
'.__('Password').':<br />'.html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).' '.__('Password').':<br />'.html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).'
</td></tr> </td></tr>
<tr><td align="center"> <tr><td align="center">
<br>
'.html_print_submit_button ("Login",'',false,'class="sub next"',true).' '.html_print_submit_button ("Login",'',false,'class="sub next"',true).'
</td></tr> </td></tr>
</table> </table>

3
pandora_console/general/logoff.php
View File

@ -16,7 +16,9 @@
?> ?>
<div class="databox_login" id="login"> <div class="databox_login" id="login">
<br>
<h1 id="log"><?php echo __('Logged out'); ?></h1> <h1 id="log"><?php echo __('Logged out'); ?></h1>
<br>
<div class="databox" style="width: 400px; margin: 0 auto auto;"> <div class="databox" style="width: 400px; margin: 0 auto auto;">
<table cellpadding="4" cellspacing="1" width="400"> <table cellpadding="4" cellspacing="1" width="400">
<tr><td align="left"> <tr><td align="left">
@ -30,5 +32,6 @@
</td></tr> </td></tr>
</table> </table>
</div> </div>
<br>
<div id="ip"><?php echo 'IP: <b class="f10">'.$_SERVER['REMOTE_ADDR'].'</b>'; ?></div> <div id="ip"><?php echo 'IP: <b class="f10">'.$_SERVER['REMOTE_ADDR'].'</b>'; ?></div>
</div> </div>

4
pandora_console/general/pandora_help.php
View File

@ -19,13 +19,13 @@ require_once ("../include/config.php");
require_once ("../include/functions.php"); require_once ("../include/functions.php");
require_once ("../include/functions_html.php"); require_once ("../include/functions_html.php");
?> ?>
<html><head><title> <html style="height:100%; margin: 0 0;"><head><title>
<?php <?php
echo __('Pandora FMS help system'); echo __('Pandora FMS help system');
?> ?>
</title></head> </title></head>
<?php echo '<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css" type="text/css">'; ?> <?php echo '<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css" type="text/css">'; ?>
<body style="background-color: #fff;"> <body style="background-color: #fff; height: 100%; margin: -10 0;">
<?php <?php
$id = get_parameter ('id'); $id = get_parameter ('id');

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

@ -300,8 +300,8 @@ $table->class = 'alert_list';
$table->width = '98%'; $table->width = '98%';
$table->size = array (); $table->size = array ();
$table->align[2] = 'center'; $table->align[2] = 'left';
$table->align[3] = 'center'; $table->align[3] = 'left';
$table->align[4] = 'center'; $table->align[4] = 'center';
$table->align[5] = 'center'; $table->align[5] = 'center';
@ -355,8 +355,6 @@ $table->valign[2] = 'middle';
$table->valign[3] = 'middle'; $table->valign[3] = 'middle';
$table->valign[4] = 'middle'; $table->valign[4] = 'middle';
$table->valign[5] = 'middle'; $table->valign[5] = 'middle';
$table->align[2] = 'center';
$table->align[3] = 'center';
/*if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { /*if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->align[5] = 'center'; $table->align[5] = 'center';

BIN
pandora_console/images/sort_down.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 554 B

After

Width:  |  Height:  |  Size: 187 B

BIN
pandora_console/images/sort_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 551 B

After

Width:  |  Height:  |  Size: 187 B

BIN
pandora_console/images/splash_pandora.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 60 KiB

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

@ -146,10 +146,17 @@ div#login {
border-right: solid 2px #000; border-right: solid 2px #000;
} }
div#login_in, #login_f { div#login_in, #login_f {
padding-top: 30px; padding-top: 40px;
#padding-top: 20px;
margin: 0 auto; margin: 0 auto;
width: 400px; width: 400px;
} }
div#error_login {
margin-top:-35px;
#margin-top:0px;
position: float;
#margin-left:120px;
}
div#login_f { div#login_f {
margin-top: 10px; margin-top: 10px;
margin-bottom: 25px; margin-bottom: 25px;
@ -210,12 +217,13 @@ div#main {
margin-right: 0px; margin-right: 0px;
} }
div#main_help { div#main_help {
width: 98%; width: 100%;
min-height: 400px; height: 100%;
min-height: 350px;
padding-left: 0px; padding-left: 0px;
padding-top: 0px; padding-top: 0px;
padding-bottom: 20px; /* padding-bottom: 20px;
margin-bottom: 25px; margin-bottom: 25px; */
background-color: #fefefe; background-color: #fefefe;
background-image: url(../../images/backgrounds/background4.jpg); background-image: url(../../images/backgrounds/background4.jpg);
margin-top: 0px; margin-top: 0px;
@ -250,8 +258,10 @@ div#foot {
margin-bottom: 25px; margin-bottom: 25px;
} }
#ip { #ip {
margin-top: 10px; margin-top: 20px;
#margin-top: 3px;
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 280px;
} }
label { label {
display: block; display: block;

13
pandora_console/operation/events/events_list.php
View File

@ -34,6 +34,8 @@ if (! check_acl ($config["id_user"], 0, "IR")) {
return; return;
} }
$tag_search = get_parameter("tag", "");
if ($id_agent == -2) { if ($id_agent == -2) {
$text_agent = (string) get_parameter("text_agent", __("All")); $text_agent = (string) get_parameter("text_agent", __("All"));
@ -131,13 +133,18 @@ if ($event_view_hr > 0) {
$sql_post .= " AND (utimestamp > ".$unixtime . " OR estado = 2)"; $sql_post .= " AND (utimestamp > ".$unixtime . " OR estado = 2)";
} }
//Search by tag
if ($tag_search != "") {
$sql_post .= " AND tags LIKE '%".io_safe_input($tag_search)."%'";
}
$url = "index.php?sec=eventos&amp;sec2=operation/events/events&amp;search=" . $url = "index.php?sec=eventos&amp;sec2=operation/events/events&amp;search=" .
rawurlencode($search) . "&amp;event_type=" . $event_type . rawurlencode($search) . "&amp;event_type=" . $event_type .
"&amp;severity=" . $severity . "&amp;status=" . $status . "&amp;ev_group=" . "&amp;severity=" . $severity . "&amp;status=" . $status . "&amp;ev_group=" .
$ev_group . "&amp;refr=" . $config["refr"] . "&amp;id_agent=" . $ev_group . "&amp;refr=" . $config["refr"] . "&amp;id_agent=" .
$id_agent . "&amp;id_event=" . $id_event . "&amp;pagination=" . $id_agent . "&amp;id_event=" . $id_event . "&amp;pagination=" .
$pagination . "&amp;group_rep=" . $group_rep . "&amp;event_view_hr=" . $pagination . "&amp;group_rep=" . $group_rep . "&amp;event_view_hr=" .
$event_view_hr . "&amp;id_user_ack=" . $id_user_ack . "&amp;offset=" . $offset; $event_view_hr . "&amp;id_user_ack=" . $id_user_ack . "&amp;tag_search=" . $tag_search . "&amp;offset=" . $offset;
echo "<br>"; echo "<br>";
//Link to toggle filter //Link to toggle filter
@ -234,6 +241,10 @@ $repeated_sel[0] = __("All events");
$repeated_sel[1] = __("Group events"); $repeated_sel[1] = __("Group events");
html_print_select ($repeated_sel, "group_rep", $group_rep, ''); html_print_select ($repeated_sel, "group_rep", $group_rep, '');
echo "</td></tr>"; echo "</td></tr>";
echo "<tr><td>";
echo __("Tag") . "</td><td>";
html_print_input_text ('tag', $tag_search, '', 15);
echo "</td></tr>";
echo '<tr><td colspan="4" style="text-align:right">'; echo '<tr><td colspan="4" style="text-align:right">';
//The buttons //The buttons