2012-04-30 Sancho Lerena <slerena@artica.es>

All changes (except a small patch on function_groups) are
	ported from 4.0.2 development branch. 

	* include/help/en/help_main_help.php: Added new general
	introduction help file. Need work.

	* include/functions_events.php: Fixed link colors and other 
	aesthetic improvements.
	
	* include/styles/pandora_legacy.css
	include/styles/pandora_black.css
	include/styles/pandora.css
	include/styles/pandora_bluenavy.css
	include/styles/pandora_minimal.css
	include/styles/pandora_blackmetal.css
	include/styles/pandora_green.css:
	
	
	* extensions/agents_modules.php,
	include/functions_groups.php: now colors uses CSS instead
	fixed codes in code. In function_groups also I've also applied a missing
	patch from the 4.0 with corrections on the Group extration from the DB.
	
	* operation/events/sound_events.php: Fixed small format problem.
	
	* operation/events/events_list.php: Link on event now "zoom it" instead
	filter for the same events (nosense since agrupatio is the default view!). 
	Fixed a	lof of aesthetic issues, now uses CSS for most issues.

	* operation/agentes/tactical.php
	operation/agentes/estado_generalagente.php: more work in the visual
	aspect of the information.
	
	* images/status_sets/default/agent_ok.png
	images/status_sets/default/module_warning.png
	images/status_sets/default/module_ok.png
	images/status_sets/default/agent_warning.png: Replaced colors with
	more contrast, easier to view for operators!.
	
	* images/header_f2b.png
	images/header_f2.png: new style headers.
	
	* general/header.php: New icon for general help.
	
	* godmode/agentes/agent_manager.php: Removed ugly visualization for GIS
	agent icons. Now it's much better :)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-04-30 19:22:07 +00:00
parent 17fcf15146
commit 7a84bf9cd3
21 changed files with 2036 additions and 161 deletions

View File

@ -1,3 +1,52 @@
2012-04-30 Sancho Lerena <slerena@artica.es>
All changes (except a small patch on function_groups) are
ported from 4.0.2 development branch.
* include/help/en/help_main_help.php: Added new general
introduction help file. Need work.
* include/functions_events.php: Fixed link colors and other
aesthetic improvements.
* include/styles/pandora_legacy.css
include/styles/pandora_black.css
include/styles/pandora.css
include/styles/pandora_bluenavy.css
include/styles/pandora_minimal.css
include/styles/pandora_blackmetal.css
include/styles/pandora_green.css:
* extensions/agents_modules.php,
include/functions_groups.php: now colors uses CSS instead
fixed codes in code. In function_groups also I've also applied a missing
patch from the 4.0 with corrections on the Group extration from the DB.
* operation/events/sound_events.php: Fixed small format problem.
* operation/events/events_list.php: Link on event now "zoom it" instead
filter for the same events (nosense since agrupatio is the default view!).
Fixed a lof of aesthetic issues, now uses CSS for most issues.
* operation/agentes/tactical.php
operation/agentes/estado_generalagente.php: more work in the visual
aspect of the information.
* images/status_sets/default/agent_ok.png
images/status_sets/default/module_warning.png
images/status_sets/default/module_ok.png
images/status_sets/default/agent_warning.png: Replaced colors with
more contrast, easier to view for operators!.
* images/header_f2b.png
images/header_f2.png: new style headers.
* general/header.php: New icon for general help.
* godmode/agentes/agent_manager.php: Removed ugly visualization for GIS
agent icons. Now it's much better :)
2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_filemanager.php: Fixed: Collection list

View File

@ -162,9 +162,9 @@ function mainAgentsModules() {
return;
}
echo '<table cellpadding="1" cellspacing="4" cellspacing="0" border="0" style="background-color: #EEE; width:98%;">';
echo '<table cellpadding="4" cellspacing="4" border="0" width=98%>';
echo "<th width='140px' height='25px' style='background-color: #799E48;'>".__("Agents")." / ".__("Modules")."</th>";
echo "<th width='140px' height='25px'>".__("Agents")." / ".__("Modules")."</th>";
if($hor_offset > 0) {
$new_hor_offset = $hor_offset-$block;
@ -178,7 +178,7 @@ function mainAgentsModules() {
continue;
}
echo '<th width="20px" style ="background-color:#90B165 !important">'. html_print_image('images/information.png', true, array('title' => io_safe_output($module['name']))) ."</th>";
echo '<th width="20px" >'. html_print_image('images/information.png', true, array('title' => io_safe_output($module['name']))) ."</th>";
}
if(($hor_offset + $block) < $nmodules) {
@ -200,32 +200,27 @@ function mainAgentsModules() {
switch($agent_status) {
case 4: // Alert fired status
$rowcolor = '#ffa300';
$textcolor = '#000';
$rowcolor = 'group_view_alrm';
break;
case 1: // Critical status
$rowcolor = '#bc0000';
$textcolor = '#FFF';
$rowcolor = 'group_view_crit';
break;
case 2: // Warning status
$rowcolor = '#f2ef00';
$textcolor = '#000';
$rowcolor = 'group_view_warn';
break;
case 0: // Normal status
$rowcolor = '#8ae234';
$textcolor = '#000';
$rowcolor = "group_view_ok";
break;
case 3:
case -1:
default: // Unknown status
$rowcolor = '#babdb6';
$textcolor = '#000';
$rowcolor = 'group_view_unk';
break;
}
echo "<tr style='height: 25px;'>";
echo "<td style='background-color: ".$rowcolor.";'><a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$agent['id_agente']."'>" . ui_print_truncate_text(io_safe_output($agent['nombre']), 35, true, true, true, '...', 'font-size:8.5px; font-weight: bold;') . "</a></td>";
echo "<td class='$rowcolor'><a class='$rowcolor' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$agent['id_agente']."'>" . ui_print_truncate_text(io_safe_output($agent['nombre']), 35, true, true, true, '...', 'font-size:10px; font-weight: bold;') . "</a></td>";
$agent_modules = agents_get_modules($agent['id_agente']);
$nmodules = 0;
@ -241,7 +236,7 @@ function mainAgentsModules() {
foreach($module['id'] as $module_id){
if(!$match && array_key_exists($module_id,$agent_modules)) {
$status = modules_get_agentmodule_status($module_id);
echo "<td style='text-align: center; background-color: #DDD;'>";
echo "<td style='text-align: center;'>";
$win_handle = dechex(crc32($module_id.$module["name"]));
$graph_type = return_graphtype (modules_get_agentmodule_type($module_id));
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module_id."&label=".base64_encode($module["name"])."&refresh=600','day_".$win_handle."')";
@ -271,7 +266,7 @@ function mainAgentsModules() {
}
if(!$match) {
echo "<td style='background-color: #DDD;'></td>";
echo "<td></td>";
}
}

View File

@ -87,7 +87,13 @@ config_check();
echo '<a class="white_bold" href="index.php?bye=bye">';
html_print_image("images/log-out.png", false, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')));
echo '</a></td>';
echo '</a>';
// Main help icon
echo "&nbsp;";
echo "&nbsp;";
echo ui_print_help_icon ("main_help", true);
echo '</td>';
echo '<td width="20%">';
if ($config["metaconsole"] == 0){

View File

@ -324,13 +324,12 @@ else {
}
$table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
'&nbsp;' . __('Without status') . ': ' . html_print_image($path_without, true, array("id" => "icon_without_status", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Default') . ': ' . html_print_image($path_default, true, array("id" => "icon_default", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Ok') . ': ' . html_print_image($path_ok, true, array("id" => "icon_ok", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Bad') . ': ' . html_print_image($path_bad, true, array("id" => "icon_bad", "style" => "display:".$display_icons.";")) .
'&nbsp;' . html_print_image($path_ok, true, array("id" => "icon_ok", "style" => "display:".$display_icons.";")) .
'&nbsp;' . __('Warning') . ': ' . html_print_image($path_warning, true, array("id" => "icon_warning", "style" => "display:".$display_icons.";"));
'&nbsp;' . html_print_image($path_bad, true, array("id" => "icon_bad", "style" => "display:".$display_icons.";")) .
'&nbsp;' . html_print_image($path_warning, true, array("id" => "icon_warning", "style" => "display:".$display_icons.";"));
if ($config['activate_gis']) {
$table->data[5][0] = __('Ignore new GIS data:');

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

View File

@ -338,7 +338,6 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$table->width = $width;
$table->class = "databox";
$table->title = __('Latest events');
$table->titlestyle = "background-color:#799E48;";
$table->headclass = array ();
$table->head = array ();
$table->rowclass = array ();
@ -358,14 +357,10 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$table->head[3] = __('Event name');
$table->head[4] = __('Agent name');
$table->head[5] = __('User ID');
$table->head[5] = __('Timestamp');
$table->headclass[5] = "datos3 f9";
$table->align[5] = "center";
$table->head[6] = __('Timestamp');
$table->headclass[6] = "datos3 f9";
$table->align[6] = "right";
$table->align[5] = "right";
foreach ($result as $event) {
if (! check_acl ($config["id_user"], $event["id_grupo"], "AR")) {
@ -423,11 +418,16 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
/* Event type */
$data[2] = events_print_type_img ($event["event_type"], true);
$data[3] = '<span class="'.get_priority_class ($event["criticity"]).'f9">'. ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '9'). '</span>';
$data[3] = ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '9');
if ($event["id_agente"] > 0) {
// Agent name
$data[4] = ui_print_agent_name ($event["id_agente"], true, 25, '', true);
// Get class name, for the link color...
$myclass = get_priority_class ($event["criticity"]);
$data[4] = "<a class='$myclass' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event["id_agente"]."'>".agents_get_name ($event["id_agente"]). "</A>";
// ui_print_agent_name ($event["id_agente"], true, 25, '', true);
// for System or SNMP generated alerts
}
elseif ($event["event_type"] == "system") {
@ -436,17 +436,9 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
else {
$data[4] = __('Alert')."SNMP";
}
// User who validated event
if ($event["estado"] != 0) {
$data[5] = ui_print_username ($event["id_usuario"], true);
}
else {
$data[5] = '';
}
// Timestamp
$data[6] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 7pt'));
$data[5] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 7px'));
array_push ($table->rowclass, get_priority_class ($event["criticity"]));
array_push ($table->data, $data);

View File

@ -588,7 +588,7 @@ function groups_get_users ($id_group, $filter = false) {
$result = $resulta;
else
$result = array_merge($resulta,$resultb);
if ($result === false)
return array ();
@ -637,41 +637,41 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Calculate entire row color
if ($data["monitor_alerts_fired"] > 0){
echo "<tr style='background-color: #ffd78f; height: 35px;'>";
echo "<tr class='group_view_alrm' style='height: 35px;'>";
}
elseif ($data["monitor_critical"] > 0) {
echo "<tr style='background-color: #ffc0b5; height: 35px;'>";
echo "<tr class='group_view_crit' style='height: 35px;'>"; //background-color: #ffc0b5;
}
elseif ($data["monitor_warning"] > 0) {
echo "<tr style='background-color: #f4ffbf; height: 35px;'>";
echo "<tr class='group_view_warn' style='height: 35px;'>";
}
elseif (($data["monitor_unknown"] > 0) || ($data["agents_unknown"] > 0)) {
echo "<tr style='background-color: #ddd; height: 35px;'>";
echo "<tr class='group_view_unk' style='height: 35px;'>";
}
elseif ($data["monitor_ok"] > 0) {
echo "<tr style='background-color: #bbffa4; height: 35px;'>";
echo "<tr class='group_view_ok' style='height: 35px;'>";
}
else {
echo "<tr style='height: 35px;'>";
echo "<tr class='group_view_normal' style='height: 35px;'>";
}
// Group name
echo "<td style='font-weight: bold; font-size: 12px;'>&nbsp;&nbsp;";
echo "<td class='group_view_data' 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 "&nbsp;<a href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
echo "&nbsp;<a class='group_view_data' href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_group'>";
echo ui_print_truncate_text($group['name'], 35);
echo "</a>";
echo "</td>";
echo "<td style='text-align: center; vertica-align: middle;'>";
echo "<td class='group_view_data' style='text-align: center; vertica-align: middle;'>";
if (check_acl ($config['id_user'], $id_group, "AW")) {
echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>';
}
echo "</td>";
// Total agents
echo "<td style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<td class='group_view_data' class='group_view_data' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if ($data["total_agents"] > 0)
echo "<a style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<a class='group_view_data' 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
@ -683,17 +683,20 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
if($id_group != 0) {
$data["total_agents"] = db_get_sql ("SELECT COUNT(*) FROM tagente
$data["total_agents"] = db_get_sql ("SELECT COUNT(id_agente) FROM tagente
WHERE id_grupo = $id_group AND disabled = 0");
}
} else {
$data["total_agents"] = db_get_sql ("SELECT COUNT(id_agente) FROM tagente
WHERE disabled = 0");
}
echo $data["total_agents"];
echo "</a>";
// Agents unknown
if ($data["agents_unknown"] > 0) {
echo "<td style='font-weight: bold; font-size: 18px; color: #886666; text-align: center;'>";
echo "<a style='font-weight: bold; font-size: 18px; text-align: center;'
echo "<td class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data_unk' 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>";
@ -705,7 +708,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Unknown
if ($data["monitor_unknown"] > 0){
echo "<td style='font-weight: bold; font-size: 18px; color: #666; text-align: center;'>";
echo "<td class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a style='font-weight: bold; font-size: 18px; color: #666; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=$id_group&status=3'>";
echo $data["monitor_unknown"];
@ -719,8 +722,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Not Init
if ($data["monitor_not_init"] > 0){
echo "<td style='font-weight: bold; font-size: 18px; color: #729fcf; text-align: center;'>";
echo "<a style='font-weight: bold; font-size: 18px; color: #729fcf; text-align: center;'
echo "<td class='group_view_data_unk' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='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=5'>";
echo $data["monitor_not_init"];
echo "</a>";
@ -732,10 +735,9 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors OK
echo "<td style='font-weight: bold; font-size: 18px; color: #6ec300; text-align: center;'>";
echo "<td class='group_view_data_ok' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if ($data["monitor_ok"] > 0) {
echo "<a style='font-weight: bold; font-size: 18px; color: #6ec300; 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_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 $data["monitor_ok"];
echo "</a>";
}
@ -746,8 +748,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Warning
if ($data["monitor_warning"] > 0){
echo "<td style='font-weight: bold; font-size: 18px; color: #f2ef00; text-align: center;'>";
echo "<a style='font-weight: bold; font-size: 18px; color: #f2ef00; text-align: center;'
echo "<td class='group_view_data_warn' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data_warn' class='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=1'>";
echo $data["monitor_warning"];
echo "</a>";
@ -759,8 +761,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
// Monitors Critical
if ($data["monitor_critical"] > 0){
echo "<td style='font-weight: bold; font-size: 18px; color: #bc0000; text-align: center;'>";
echo "<a style='font-weight: bold; font-size: 18px; color: #bc0000; text-align: center;'
echo "<td class='group_view_data_crit' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data_crit' 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>";
@ -771,8 +773,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
}
// Alerts fired
if ($data["monitor_alerts_fired"] > 0){
echo "<td style='font-weight: bold; font-size: 18px; color: #ffa300; text-align: center;'>";
echo "<a style='font-weight: bold; font-size: 18px; color: #ffa300; text-align: center;'
echo "<td class='group_view_data_alrm' style='font-weight: bold; font-size: 18px; text-align: center;'>";
echo "<a class='group_view_data_alrm' 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>";

View File

@ -0,0 +1,14 @@
<?php
/**
* @package Include/help/en
*/
?>
<h1>Pandora FMS - Help index</h1>
<h3>Introduction</h3>
<p>
This is the online help for Pandora FMS console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
<br><br>
<a href="http://pandorafms.com/pandora/doc/"><b>Download the official documentation</b></a>
</p>

View File

@ -43,6 +43,10 @@
margin-left: 23px;
}
.menu li.subselected a{
background-color: #grey !important;
}
.menu a:hover {
text-decoration:none;
color: #D54E21;
@ -61,6 +65,17 @@
border-style: solid;
border-color: #dadbdc;
}
.submenu2 li a {
background-color: #fff;
margin-left: 0px;
padding-left: 40px;
display:block;
border-width: 1px 1px 0 1px;
border-style: solid;
border-color: #dadbdc;
}
.menu li img.toggle {
visibility: hidden;
float:right;
@ -72,6 +87,15 @@
visibility: visible;
z-index: 1; /* Positions it on top of the rest */
}
.is_submenu2{
background-color: #E4E4E4 !important;
}
.submenu2_not_selected a {
font-weight: normal;
}
.menu li.submenu_selected a {
font-weight: bold;
}

View File

@ -30,11 +30,21 @@ svg * {
}
body {
text-align: center;
background-color: #555555;
background-image: url(../../images/greyback.gif);
background-color: #fafafa;
margin: 0 auto;
}
div#page {
background: #fafafa;
background-image: none;
}
div#main {
background: #fafafa;
background-image: none;
}
#login_body {
/* Set rules to fill background */
min-height: 100%;
@ -230,10 +240,9 @@ div#container {
}
div#page {
width: 960px;
background: #fff;
clear: both;
border-bottom: solid 5px #80ab51;
border-top: solid 5px #80ab51;
border-bottom: solid 5px #567953;
border-top: solid 5px #567953;
}
div#main {
width: 785px;
@ -243,8 +252,6 @@ div#main {
padding-top: 0px;
padding-bottom: 20px;
margin-bottom: 25px;
background-color: #fefefe;
background-image: url(../../images/backgrounds/background4.jpg);
margin-top: 0px;
margin-left: 0px;
margin-right: 0px;
@ -269,7 +276,7 @@ div#head {
width: 960px;
height: 62px;
padding-top: 1px;
background: url(../../images/header.jpg);
background-color: #274C00;
}
div#foot {
@ -486,39 +493,50 @@ input.grid_min[disabled] {
table, img {
border: 0px;
}
th {
color: #fff;
background-color: #90b165;
background-color: #B1B1B1;
text-align:center;
font-size: 7pt;
}
tr.datos, tr.datost, tr.datosb , tr.datos_id,
tr.datosf9, tr.datos2, tr.datos2t,
tr.datos2b, tr.datos2_id , tr.datos2f9 {
background-color: #f9f9f9;
tr.datosf9 {
background-color: #eaeaea;
}
tr.datos2, tr.datos2t,
tr.datos2b, tr.datos2_id , tr.datos2f9 {
background-color: #f2f2f2;
}
tr.datos:hover, tr.datost:hover, tr.datosb:hover, tr.datos_id:hover,
tr.datosf9:hover, tr.datos2:hover, tr.datos2t:hover,
tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover {
background-color: #efefef;
}
td.datos3 {
background-color: #d4ddc6;
}
td.datos4 {
/*Add !important because in php the function html_print_table write style in cell and this is style head.*/
text-align: center !important;
background-color: #d4ddc6;
}
td.datos_id {
color: #1a313a;
}
tr.rowPair {
background-color: #fff;
background-color: #efefef;
}
tr.rowOdd {
background-color: #EEEEEE;
background-color: #f2f2f2;
}
tr.rowPair:hover {
background-color: #E0E0E0;
}
@ -526,16 +544,16 @@ tr.rowOdd:hover {
background-color: #E0E0E0
}
.bg { /* op menu */
background-color: #80ab51;
background-color: #567953;
}
.bg2 { /* main page */
background-color: #e79b5d;
background-color: #0A160C;
}
.bg3 { /* godmode */
background-color: #e79b5d;
background-color: #0A160C;
}
.bg4 { /* links */
background-color: #5385bf;
background-color: #6BBE2F;
}
.bg, .bg2, .bg3, .bg4 {
position: relative;
@ -545,7 +563,7 @@ tr.rowOdd:hover {
height: 20px;
}
.bg2, .bg3, .bg4 {
height: 17px;
height: 18px;
}
.f10, #ip {
font-size: 7pt;
@ -558,7 +576,7 @@ tr.rowOdd:hover {
font-style: italic;
}
.tit {
padding: 3px 1px;
padding: 5px 1px;
}
.tit, .titb {
font-weight: bold;
@ -663,18 +681,25 @@ div.title_line {
height: 5px;
width: 762px;
}
#menu_tab_frame {
background:#0A160C;
}
#menu_tab_frame_view {
background:#567953;
}
#menu_tab_frame, #menu_tab_frame_view {
display: block !important;
background:#e79b5d none repeat scroll 0 0;
border-bottom:1px solid #778866;
border-bottom:1px solid #B1B1B1;
/* float:left; */
margin-left:-8px;
min-height:25px;
padding-right:8px;
padding-right:28px;
width:100%;
}
#menu_tab_frame_view {
background: #9bc969;
background: #567953;
}
#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul {
padding: 0px;
@ -689,7 +714,7 @@ div.title_line {
background: #d4ddc6;
padding: 3px 5px;
color: #666;
border-left: 2px solid #80AB51;
border-left: 2px solid #567953;
font-weight: bold;
line-height: 18px;
}
@ -840,16 +865,23 @@ span.rmess, span.nrmess {
margin-bottom: 5px;
margin-top: 5px;
margin-left: 0px;
border: 1px solid #f2f2f2;
border: 1px solid #e2e2e2;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.databox {
background-color: #fafafa;
background-color: #f4f5f4;
}
/* Style for login form */
.databox_login {
#margin-top: 100px !important;
width: 657px !important;
height: 400px;
#margin-bottom: 5px;
#margin-top: 5px;
#margin-left: 0px;
border: none !important;
background-color: #fafafa;
background: url(../../images/splash_pandora.png) no-repeat;
@ -924,25 +956,7 @@ div#logo_text3 {
#table-add-item select, #table-add-sla select {
width: 180px;
}
/* classes for event priorities. Sits now in functions.php */
.datos_green, .datos_greenf9 {
background-color: #BBFFA4;
}
.datos_red, .datos_redf9 {
background-color: #FFC0B5;
}
.datos_yellow, .datos_yellowf9 {
background-color: #F4FFBF;
}
.datos_blue, .datos_bluef9 {
background-color: #CDE2EA;
}
.datos_grey, .datos_greyf9 {
background-color: #E4E4E4;
}
td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 {
padding: 5px 5px 5px 5px;
}
/* end of classes for event priorities */
div#main_pure {
background-color: #fefefe;
@ -1183,9 +1197,10 @@ fieldset {
position:relative;
}
fieldset legend {
font-size:1.3em;
font-size:1.1em;
font-weight:bold;
#color:#3f4e2f;
line-height: 20px;
color:#000;
#top:-2em;
}
@ -1341,7 +1356,11 @@ div#main {
}
div#head {
width: auto;
background-color: #000;
background-image: url(../../images/header_f2.png);
}
div#foot {
width: auto;
}
@ -1513,3 +1532,135 @@ div.cellBig {
width: 30px !important;
text-align: center;
}
/* Standard styles for status colos (groups, events, backgrounds...) */
tr.group_view_crit, .group_view_crit {
background-color: #FA3030;
}
tr.group_view_norm, .group_view_norm {
background-color: #ffffff;
}
tr.group_view_ok, .group_view_ok {
background-color: #00C000;
}
tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, tr.a.group_view_warn {
background-color: #F5E535;
}
a.group_view_warn {
color: #000;
}
tr.group_view_alrm, .group_view_alrm {
background-color: #ED8701;
}
tr.group_view_unk, .group_view_unk {
background-color: #C4C4C4;
}
tr.group_view_data, .group_view_data {
color: #000;
}
.group_view_data_unk {
color: #303030;
}
.group_view_data_ok{
color: #00C000;
}
.group_view_data_crit {
color: #5C0000;
}
.group_view_data_alrm {
color: #5C1D00;
}
.group_view_data_warn {
color: #5C5900;
}
/* classes for event priorities. Sits now in functions.php */
.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a {
background-color: #52A000;
color: #fff;
}
.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a{
background-color: #FF3E41;
color: #fff !important;
}
.datos_yellow, .datos_yellowf9 {
background-color: #F5E535;
color: #000;
}
a.datos_blue, .datos_bluef9, .datos_blue {
background-color: #77E2F2;
color: #000;
}
.datos_grey, .datos_greyf9 {
background-color: #E4E4E4;
}
td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 {
padding: 5px 5px 5px 5px;
}
.menu li.selected {
background-color: #B1B1B1 !important;
}
.menu li {
background-color: #fff !important;
}
.submenu li a{
background-color: #E4E4E4 !important;
}
.menu li a:hover,
.submenu li a:hover {
color: #000;
}
.is_submenu2 li {
background-color #ff0000;
}
.is_submenu2 {
background-color: #222222 !important;
}
.menu li.submenu_selected a {
background-color: #C5C5C5 !important;
}
.operation.ul, ul.operation .operation ul {
background-color: #00ff00 !important;
}
.menu ul {
background-color: #DEDEDE !important;
}
.menu li, .menu li.selected, .menu .li.not_selected {
border-radius: 0px 0px 0px 0px;
background-color: #EBEBEB !important;
}
#menu_tab li.separator {
}
input#text-id_parent.ac_input, input, textarea, select {
background-color: #ffffff !important;
border: 1px solid #cbcbcb;
}

View File

@ -1,12 +1,12 @@
/*
Author: The Pandora FMS team
Name: Black theme
Name: New black theme
Description: A theme with a dark style
// Pandora FMS - the Flexible Monitoring System
// =============================================
// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L
// Copyright (c) 2004-2012 Artica Soluciones Tecnologicas S.L
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@ -26,7 +26,7 @@ Description: A theme with a dark style
body, body.pure {
color: #EEE;
background-color: #4b4949;
background: #4b4949 url(../../images/black_background.png) repeat-x left top;
}
h1, h2, h3, h4 {
color: #BBB;
@ -41,21 +41,24 @@ a:hover {
h1#log {
color: #FFF;
}
div#container, div#page, div#main, div#head {
div#head {
background: #1E1E1E;
background-image: url(../../images/header_f2b.png);
}
div#container, div#page, div#main {
background-image: none;
background-color: #000;
background: #4b4949 url(../../images/black_background.png) repeat-x left top;
}
div#page {
border-bottom: solid 5px #001E40;
border-top: solid 5px #001E40;
border-top: solid 5px #202020;
}
div#foot {
background-color: #960003;
}
div#head {
background: url(../../images/black_red_header.png);
background-color: #503030;
}
input:hover {
background-color: #d4dccd;
}
@ -63,19 +66,40 @@ input.login {
background-color: #000;
}
th {
background-color: #041D3D;
background-color: #082C43;
}
tr.datos, tr.datost, tr.datosb , tr.datos_id,
tr.datosf9, tr.datos2, tr.datos2t,
tr.datos2b, tr.datos2_id , tr.datos2f9 {
background-color: #020E1D;
tr.datosf9 {
background-color: rgb(14,14,14);
}
tr.datos:hover, tr.datost:hover, tr.datosb:hover, tr.datos_id:hover,
tr.datosf9:hover, tr.datos2:hover, tr.datos2t:hover,
tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover {
background-color: #02152A;
tr.datosf9:hover {
background-color: #262626;
}
tr.datos2, tr.datos2t, td.datos2,
tr.datos2b, tr.datos2_id , tr.datos2f9 {
background-color: rgb(24,24,24);
}
tr.datos2:hover, tr.datos2t:hover, td.datos2,
tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover {
background-color: #363636;
}
td.datos2 {
line-height: 20px;
background-color: #1B1B1B;
}
td.datos {
line-height: 20px;
background-color: #0E0E0E;
}
td.datos3 {
line-height: 20px;
background-color: #1e1e1e;
}
td.datos_id {
@ -83,19 +107,19 @@ td.datos_id {
}
tr.rowPair {
background-color: #274263;
background-color: #202020;
}
tr.rowOdd {
background-color: #020E1D;
background-color: #101010;
}
tr.rowPair:hover {
background-color: #4782A3;
background-color: #232323;
}
tr.rowOdd:hover {
background-color: #424E5D;
background-color: #151515;
}
div.title_line {
@ -103,8 +127,7 @@ div.title_line {
}
#menu_tab li a, #menu_tab li.nomn a {
background: #082C43;
color: #CFCFCF;
border-left: 1px solid #000;
border-left: 1px solid #0C1E56;
}
#menu_tab li.nomn_high a {
background: #799E48;
@ -127,14 +150,16 @@ div.title_line {
background-color: #0B315B;
}
.databox, .databox_color, .databox_frame {
border: 1px solid #071924;
border: none;
}
.databox {
background-color: #000;
background-color:#030303;
color: #fff;
}
.databox_color {
border-left: 4px solid #071924;
border-left:none;
}
div#main_pure {
background-color: #000;
@ -156,24 +181,22 @@ ol.steps li.visited {
}
/* Menus */
.menu li a {
background-color: #000;
color: #CCC;
.menu li a {
color: #ACACAC;
}
.submenu li a {
background-color: #505050;
background-color: #121212 !important;
color: #CCC;
}
.menu li.submenu_selected a {
background-color: #9c9c9c;
color: #222;
background-color: #9c9c9c !important;
}
.menu li.selected {
background-color: #333 !important;
}
.menu li.links {
border-color: #333;
border-color: #333 ;
}
.submenu li a {
border-color: #333;
@ -182,7 +205,7 @@ ol.steps li.visited {
border-color: #333;
}
.menu .menu_icon, .menu li.links {
background-color: #000;
background-color: #000 !important;
}
#ip {
@ -212,3 +235,105 @@ td.scwFoot {
}
.bg {
background-color: #333333;
}
.bg3 {
background-color: #082C43;
}
a.datos_yellow, a.datos_yellowf9 {
color: #000;
}
fieldset {
background-color: #050505;
border: 1px solid #303030;
color: #ababab;
}
fieldset legend {
color: #ababab;
font-size: 1.1em;
}
.databox_color {
background-color: #0E0E0E;
}
.notify {
color: #181818;
}
.info_box {
background-color: #BCBCBC;
margin: 10px 0px 10px 10px;
}
#menu_tab_frame_view {
background: #333333 !important;
}
/* Godmode */
#menu_tab_frame {
background: #082C43 !important;
}
#menu_tab_frame, #menu_tab_frame_view {
display: block !important;
border-bottom: 1px solid #082C43;
margin-left:-8px;
min-height:25px;
padding-right:28px;
width:100%;
}
.menu a:hover {
color: #fff;
}
.is_submenu2 {
background-color: #222222 !important;
}
.menu ul {
background-color: #101010;
}
#menu_tab li.separator, #menu_tab li.separator_view {
background: none !important;
padding: 5px;
}
input#text-id_parent.ac_input, input, textarea, select{
background-color: #cfcfcf !important;
}
.menu li, menu li.selected, .menu li.not_selected {
border: 0px none;
border-radius: 0px;
}
.menu ul {
background-color: #202020 !important;
}
.menu li a:hover,
.submenu li a:hover {
color: #fff;
}
.ui-dialog-content {
background-color: #404040 !important;
}
.info_box {
box-shadow: 0px 5px 5px rgb(22,22,22);
}

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/*
Author: The Pandora FMS team
Name: Legacy theme
Name: Green "float window"
Description: The default Pandora FMS theme layout
// Pandora FMS - http://pandorafms.com

View File

@ -1,8 +1,8 @@
/*
Author: The Pandora FMS team
Name: Minimal theme
Description: A minimal layout
This is not a theme, is a minimal CSS for inclusion in some code.
Exclude css from visual styles
// Pandora FMS - the Flexible Monitoring System
// =============================================

View File

@ -619,8 +619,10 @@ $idx = 0;
//Arrange data. We already did ACL's in the query
foreach ($result as $event) {
$data = array ();
//First pass along the class of this row
$table->rowclass[] = get_priority_class ($event["criticity"]);
$myclass = get_priority_class ($event["criticity"]);
$table->rowclass[] = $myclass;
//print status
// Grouped events
@ -691,8 +693,8 @@ foreach ($result as $event) {
if (in_array('evento', $show_fields)) {
// Event description
$data[$i] = '<span title="'.$event["evento"].'" class="f9">';
$data[$i] .= '<a href="'.$url.'&amp;group_rep=0&amp;offset=0&amp;pure='.$config["pure"].'&amp;search='.rawurlencode(io_safe_input($event["evento"])).'">';
$data[$i] .= '<span style="font-size: 7.5pt; color: #000000">' . io_safe_output($event["evento"]) . '</span>';
$data[$i] .= '<a href="javascript: toggleVisibleExtendedInfo(' . $event["id_evento"] . ');">';
$data[$i] .= '<span class="'.$myclass.'" style="font-size: 7.5pt;">' . ui_print_truncate_text (io_safe_output($event["evento"]), 160) . '</span>';
$data[$i] .= '</a></span>';
$i++;
@ -714,7 +716,7 @@ foreach ($result as $event) {
if (in_array('timestamp', $show_fields)) {
//Time
$data[$i] = '<span style="color: #000000">';
$data[$i] = '<span class="'.$myclass.'">';
if ($group_rep == 1) {
$data[$i] .= ui_print_timestamp ($event['timestamp_rep'], true);
}

View File

@ -61,8 +61,8 @@ echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico" />';
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';
echo "</head>";
echo "<body>";
echo "<h1 style='background: #66AA44; color: #fff;'>" . html_print_image('images/pandora_header_logo.png', true) . __("Sound Events") . "</h1>";
echo html_print_image('images/pandora_header_logo.png', true);
echo "<h1 style='background: #66AA44; color: #fff;'>" . __("Sound console"). "</h1>";
$table = null;
$table->width = '100%';