tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 11:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed styles from views in nodo

Browse Source
This commit is contained in:
m-lopez-f 2015-04-15 09:45:13 +02:00
parent aab9628cbd
commit 2d9168ac8f
19 changed files with 125 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pandora_console/extensions/module_groups.php
View File

@ -178,7 +178,10 @@ function mainModuleGroups() {
if (!empty($agentGroups) && !empty($modelGroups)) { if (!empty($agentGroups) && !empty($modelGroups)) {
array_walk($modelGroups, 'translate'); //Translate all head titles to language is set array_walk($modelGroups, 'translate'); //Translate all head titles to language is set
$table = null;
$table->headstyle[] = "width: 20%";
foreach ($modelGroups as $i => $n) { foreach ($modelGroups as $i => $n) {
$table->headstyle[] = "width: 7%";
$modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT); $modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT);
} }
@ -186,12 +189,11 @@ function mainModuleGroups() {
array_unshift($head, ' '); array_unshift($head, ' ');
//Metaobject use in html_print_table //Metaobject use in html_print_table
$table = null; $table->align[0] = 'left'; //Align to left the first column.
$table->align[0] = 'right'; //Align to right the first column.
$table->style[0] = 'color: #ffffff; '. $table->style[0] = 'color: #ffffff; '.
'background-color: #373737; font-weight: bolder; padding-right: 10px;'; 'background-color: #373737; font-weight: bolder; padding-right: 10px; width:20%; ';
$table->head = $head; $table->head = $head;
$table->width = '98%'; $table->width = '100%';
//The content of table //The content of table
$tableData = array(); $tableData = array();
@ -247,29 +249,29 @@ function mainModuleGroups() {
else { else {
if ($fired) { if ($fired) {
$color = '#ffa300'; //Orange when the cell for this model group and agent has at least one alert fired. $color = '#FFA631'; //Orange when the cell for this model group and agent has at least one alert fired.
} }
else if (array_key_exists(1, $states)) { else if (array_key_exists(1, $states)) {
$color = '#cc0000'; //Red when the cell for this model group and agent has at least one module in critical state and the rest in any state. $color = '#FC4444'; //Red when the cell for this model group and agent has at least one module in critical state and the rest in any state.
$font_color = '#ffffff'; $font_color = '#ffffff';
} }
elseif (array_key_exists(2, $states)) { elseif (array_key_exists(2, $states)) {
$color = '#fce94f'; //Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state. $color = '#FAD403'; //Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state.
} }
elseif (array_key_exists(3, $states)) { elseif (array_key_exists(3, $states)) {
$color = '#babdb6'; //Grey when the cell for this model group and agent has at least one module in unknown state and the rest in any state. $color = '#B2B2B2 '; //Grey when the cell for this model group and agent has at least one module in unknown state and the rest in any state.
} }
elseif (array_key_exists(0, $states)) { elseif (array_key_exists(0, $states)) {
$color = '#8ae234'; //Green when the cell for this model group and agent has OK state all modules. $color = '#80BA27'; //Green when the cell for this model group and agent has OK state all modules.
} }
elseif (array_key_exists(5, $states)) { elseif (array_key_exists(5, $states)) {
$color = '#729fcf'; // Blue when the cell for this module group and all modules have not init value. $color = '#5BB6E5'; // Blue when the cell for this module group and all modules have not init value.
} }
$alinkStart = '<a class="info_cell" rel="ajax.php?page=extensions/module_groups&get_info_alert_module_group=1&module_group=' . $idModelGroup . '&id_agent_group=' . $idAgentGroup . '" $alinkStart = '<a class="info_cell" rel="ajax.php?page=extensions/module_groups&get_info_alert_module_group=1&module_group=' .
href="index.php?sec=estado&sec2=operation/agentes/status_monitor&status=-1&ag_group=' . $idAgentGroup . $idModelGroup . '&id_agent_group=' . $idAgentGroup . '"href="index.php?sec=estado&sec2=operation/agentes/status_monitor&status=-1&ag_group=' .
'&modulegroup=' . $idModelGroup . '" style="color: ' . $font_color . '; font-size: 18px;";>'; $idAgentGroup . '&modulegroup=' . $idModelGroup . '" style="color: ' . $font_color . '; font-size: 18px;";>';
$alinkEnd = '</a>'; $alinkEnd = '</a>';
} }
@ -284,13 +286,13 @@ function mainModuleGroups() {
array_push($tableData,$row); array_push($tableData,$row);
} }
$table->data = $tableData; $table->data = $tableData;
echo "<div style='width:98%; overflow-x:auto;'>"; echo "<div style='width:100%; overflow-x:auto;'>";
html_print_table($table); html_print_table($table);
echo "</div>"; echo "</div>";
echo "<div class='legend_basic' style='width: 94%'>"; echo "<div class='legend_basic' style='width: 98.6%'>";
echo "<table>"; echo "<table >";
echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>"; echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_ALERTFIRED . ";'></div></td><td>" . __("Orange cell when the module group and agent have at least one alarm fired.") . "</td></tr>"; echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_ALERTFIRED . ";'></div></td><td>" . __("Orange cell when the module group and agent have at least one alarm fired.") . "</td></tr>";
echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_CRITICAL . ";'></div></td><td>" . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . "</td></tr>"; echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_CRITICAL . ";'></div></td><td>" . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . "</td></tr>";

21
pandora_console/extensions/realtime_graphs.php
View File

@ -42,9 +42,9 @@ function pandora_realtime_graphs () {
$canvas .= '</div>'; $canvas .= '</div>';
echo $canvas; echo $canvas;
$table->width = '99%'; $table->width = '100%';
$table->id = 'table-form'; $table->id = 'table-form';
$table->class = 'databox'; $table->class = 'databox filters';
$table->style = array (); $table->style = array ();
$table->style[0] = 'font-weight: bold;'; $table->style[0] = 'font-weight: bold;';
$table->style[1] = 'font-weight: bold;'; $table->style[1] = 'font-weight: bold;';
@ -62,7 +62,7 @@ function pandora_realtime_graphs () {
$graph = get_parameter('graph', 'cpu_load'); $graph = get_parameter('graph', 'cpu_load');
$refresh = get_parameter('refresh', '1000'); $refresh = get_parameter('refresh', '1000');
$data['graph'] = __('Graph') . '<br>' . html_print_select ($graph_fields, 'graph', $graph, '', '', 0, true); $data['graph'] = __('Graph') . '&nbsp;&nbsp;' . html_print_select ($graph_fields, 'graph', $graph, '', '', 0, true);
$data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'clearGraph()', 'class="sub delete"', true); $data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'clearGraph()', 'class="sub delete"', true);
$refresh_fields[1000] = human_time_description_raw(1, true, 'large'); $refresh_fields[1000] = human_time_description_raw(1, true, 'large');
@ -70,8 +70,8 @@ function pandora_realtime_graphs () {
$refresh_fields[10000] = human_time_description_raw(10, true, 'large'); $refresh_fields[10000] = human_time_description_raw(10, true, 'large');
$refresh_fields[30000] = human_time_description_raw(30, true, 'large'); $refresh_fields[30000] = human_time_description_raw(30, true, 'large');
$data['refresh'] = __('Refresh interval') . '<br>' . html_print_select ($refresh_fields, 'refresh', $refresh, '', '', 0, true); $data['refresh'] = __('Refresh interval') . '&nbsp;&nbsp;' . html_print_select ($refresh_fields, 'refresh', $refresh, '', '', 0, true);
$data['incremental'] = __('Incremental') . '<br>' . html_print_checkbox ('incremental', 1, 0, true); $data['incremental'] = __('Incremental') . '&nbsp;&nbsp;' . html_print_checkbox ('incremental', 1, 0, true);
$table->data[] = $data; $table->data[] = $data;
@ -85,10 +85,10 @@ function pandora_realtime_graphs () {
$data = array(); $data = array();
$data['snmp_address'] = __('Target IP') . '<br>' . html_print_input_text ('ip_target', $snmp_address, '', 50, 255, true); $data['snmp_address'] = __('Target IP') . '&nbsp;&nbsp;' . html_print_input_text ('ip_target', $snmp_address, '', 50, 255, true);
$table->colspan[1]['snmp_address'] = 2; $table->colspan[1]['snmp_address'] = 2;
$data['snmp_community'] = __('Community') . '<br>' . html_print_input_text ('snmp_community', $snmp_community, '', 50, 255, true); $data['snmp_community'] = __('Community') . '&nbsp;&nbsp;' . html_print_input_text ('snmp_community', $snmp_community, '', 50, 255, true);
$table->colspan[1]['snmp_community'] = 2; $table->colspan[1]['snmp_community'] = 2;
$table->data[] = $data; $table->data[] = $data;
@ -99,12 +99,11 @@ function pandora_realtime_graphs () {
$snmp_versions['2c'] = '2c'; $snmp_versions['2c'] = '2c';
$data = array(); $data = array();
$data['snmp_oid'] = __('OID') . '<br>' . html_print_input_text ('snmp_oid', $snmp_oid, '', 100, 255, true); $data['snmp_oid'] = __('OID') . '&nbsp;&nbsp;' . html_print_input_text ('snmp_oid', $snmp_oid, '', 100, 255, true);
$data['snmp_oid'] .= html_print_button (__('SNMP walk'), 'snmp_walk', false, 'snmpBrowserWindow()', 'class="sub next"', true);
$table->colspan[2]['snmp_oid'] = 2; $table->colspan[2]['snmp_oid'] = 2;
$data['snmp_ver'] = __('Version') . '<br>' . html_print_select ($snmp_versions, 'snmp_version', $snmp_ver, '', '', 0, true); $data['snmp_ver'] = __('Version') . '&nbsp;&nbsp;' . html_print_select ($snmp_versions, 'snmp_version', $snmp_ver, '', '', 0, true);
$data['snmp_ver'] .= '&nbsp;&nbsp;' . html_print_button (__('SNMP walk'), 'snmp_walk', false, 'snmpBrowserWindow()', 'class="sub next"', true);
$table->colspan[2]['snmp_ver'] = 2; $table->colspan[2]['snmp_ver'] = 2;
$table->data[] = $data; $table->data[] = $data;

6
pandora_console/general/logon_ok.php
View File

@ -39,7 +39,7 @@ if (tags_has_user_acl_tags()) {
<table border="0" width="100%"> <table border="0" width="100%">
<tr> <tr>
<td width="30%" style="padding-right: 10px;" valign="top"> <td width="25%" style="padding-right: 20px;" valign="top">
<?php <?php
@ -54,7 +54,7 @@ if (tags_has_user_acl_tags()) {
$table->cellspacing = 4; $table->cellspacing = 4;
$table->head = array (); $table->head = array ();
$table->data = array (); $table->data = array ();
$table->style[0] = 'text-align:center;'; $table->headstyle[0] = 'text-align:center;';
$table->width = "100%"; $table->width = "100%";
$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>'; $table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
$table->head_colspan[0] = 4; $table->head_colspan[0] = 4;
@ -103,7 +103,7 @@ if (tags_has_user_acl_tags()) {
</td> </td>
<td width="70%" valign="top"> <td width="75%" valign="top">
<?php <?php

2
pandora_console/godmode/agentes/agent_template.php
View File

@ -252,6 +252,6 @@ if (!empty ($table->data)) {
unset ($table); unset ($table);
} }
else { else {
echo '<div class="nf">No modules</div>'; ui_print_empty_data ( __('No modules') ) ;
} }
?> ?>

4
pandora_console/godmode/agentes/module_manager.php
View File

@ -126,7 +126,7 @@ if (($policy_page) || (isset($agent))) {
echo "</table>"; echo "</table>";
echo "</form>"; echo "</form>";
echo '<div style="text-align: right; width: 100%;">'; echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
echo "<strong>"; echo "<strong>";
echo "<a style='color: #004A1B;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>"; echo "<a style='color: #004A1B;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
echo "</strong>"; echo "</strong>";
@ -478,7 +478,7 @@ $total_modules = db_get_value_sql($sql_total_modules);
$total_modules = isset ($total_modules) ? $total_modules : 0; $total_modules = isset ($total_modules) ? $total_modules : 0;
if ($modules === false) { if ($modules === false) {
echo "<div class='nf'>" . __('No available data to show') . "</div>"; ui_print_empty_data ( __('No available data to show') );
return; return;
} }

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

@ -674,7 +674,7 @@ if (isset($data)) {
html_print_table ($table); html_print_table ($table);
} }
else { else {
echo "<div class='nf'>" . __('No alerts defined') . "</div>"; ui_print_empty_data ( __('No alerts defined') );
} }
// Create alert button // Create alert button

14
pandora_console/godmode/servers/servers.build_table.php
View File

@ -38,6 +38,7 @@ if ($servers === false) {
} }
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox data';
$table->size = array (); $table->size = array ();
$table->style = array (); $table->style = array ();
@ -46,10 +47,12 @@ $table->style[0] = 'font-weight: bold';
$table->align = array (); $table->align = array ();
$table->align[1] = 'center'; $table->align[1] = 'center';
$table->align[3] = 'center'; $table->align[3] = 'center';
$table->align[4] = 'center';
$table->align[5] = 'center';
$table->align[8] = 'center'; $table->align[8] = 'center';
$table->headstyle[1] = 'text-align:center';
$table->headstyle[3] = 'text-align:center';
$table->headstyle[8] = 'text-align:center';
//$table->title = __('Tactical server information'); //$table->title = __('Tactical server information');
$table->titleclass = 'tabletitle'; $table->titleclass = 'tabletitle';
$table->titlestyle = 'text-transform:uppercase;'; $table->titlestyle = 'text-transform:uppercase;';
@ -74,7 +77,7 @@ $table->data = array ();
foreach ($servers as $server) { foreach ($servers as $server) {
$data = array (); $data = array ();
$table->cellclass[][3] = "progress_bar";
$data[0] = '<span title="' . $server['version'] . '">' . $data[0] = '<span title="' . $server['version'] . '">' .
$server['name'] . '</span>'; $server['name'] . '</span>';
@ -100,12 +103,12 @@ foreach ($servers as $server) {
$data[5] = 'N/A'; $data[5] = 'N/A';
break; break;
case "export": case "export":
$data[3] = progress_bar($server["load"], 60, 20, $server["lag_txt"], 0); $data[3] = progress_bar($server["load"], 100, 10, $server["lag_txt"], 0);
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = 'N/A'; $data[5] = 'N/A';
break; break;
default: default:
$data[3] = progress_bar($server["load"], 60, 20, $server["lag_txt"], 0); $data[3] = progress_bar($server["load"], 100, 10, $server["lag_txt"], 0);
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = '<span style="white-space:nowrap;">' . $data[5] = '<span style="white-space:nowrap;">' .
$server["lag_txt"] . '</span>'; $server["lag_txt"] . '</span>';
@ -153,6 +156,7 @@ foreach ($servers as $server) {
unset($data[8]); unset($data[8]);
} }
array_push ($table->data, $data); array_push ($table->data, $data);
} }
if ($tiny) { if ($tiny) {

10
pandora_console/include/constants.php
View File

@ -120,13 +120,13 @@ switch ($config["dbtype"]) {
/* Color constants */ /* Color constants */
define('COL_CRITICAL', '#f85858'); define('COL_CRITICAL', '#FC4444');
define('COL_WARNING', '#ffea59'); define('COL_WARNING', '#FAD403');
define('COL_WARNING_DARK', '#FFB900'); define('COL_WARNING_DARK', '#FFB900');
define('COL_NORMAL', '#6EB432'); define('COL_NORMAL', '#80BA27');
define('COL_NOTINIT', '#3BA0FF'); define('COL_NOTINIT', '#3BA0FF');
define('COL_UNKNOWN', '#AAAAAA'); define('COL_UNKNOWN', '#B2B2B2');
define('COL_ALERTFIRED', '#FF8800'); define('COL_ALERTFIRED', '#FFA631');
define('COL_MINOR', '#F099A2'); define('COL_MINOR', '#F099A2');
define('COL_MAJOR', '#C97A4A'); define('COL_MAJOR', '#C97A4A');
define('COL_INFORMATIONAL', '#E4E4E4'); define('COL_INFORMATIONAL', '#E4E4E4');

15
pandora_console/include/functions_events.php
View File

@ -857,10 +857,10 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
} }
else { else {
$table->id = 'latest_events_table'; $table->id = 'latest_events_table';
$table->cellpadding = 4; $table->cellpadding = 0;
$table->cellspacing = 4; $table->cellspacing = 0;
$table->width = $width; $table->width = $width;
$table->class = "databox"; $table->class = "databox data";
if (!$tactical_view) if (!$tactical_view)
$table->title = __('Latest events'); $table->title = __('Latest events');
$table->titleclass = 'tabletitle'; $table->titleclass = 'tabletitle';
@ -953,7 +953,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$data[2] = events_print_type_img ($event["event_type"], true); $data[2] = events_print_type_img ($event["event_type"], true);
/* Event text */ /* Event text */
$data[3] = ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '9'); $data[3] = ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '7.5');
if($agent_id == 0) { if($agent_id == 0) {
if ($event["id_agente"] > 0) { if ($event["id_agente"] > 0) {
@ -961,7 +961,8 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
// Get class name, for the link color... // Get class name, for the link color...
$myclass = get_priority_class ($event["criticity"]); $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>"; $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); // ui_print_agent_name ($event["id_agente"], true, 25, '', true);
// for System or SNMP generated alerts // for System or SNMP generated alerts
@ -975,7 +976,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
} }
// Timestamp // Timestamp
$data[5] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 8px')); $data[5] = ui_print_timestamp ($event["timestamp"], true, array('style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;'));
$class = get_priority_class ($event["criticity"]); $class = get_priority_class ($event["criticity"]);
$cell_classes[3] = $cell_classes[4] = $cell_classes[5] = $class; $cell_classes[3] = $cell_classes[4] = $cell_classes[5] = $class;
@ -985,7 +986,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
} }
$events_table = html_print_table ($table, true); $events_table = html_print_table ($table, true);
$out = '<table width="98%"><tr><td style="width: 90%; padding-right: 10px; vertical-align: top; padding-top: 0px;">'; $out = '<table width="100%"><tr><td style="width: 90%; vertical-align: top; padding-top: 0px;">';
$out .= $events_table; $out .= $events_table;
if (!$tactical_view) { if (!$tactical_view) {

20
pandora_console/include/functions_graph.php
View File

@ -2337,7 +2337,7 @@ function graph_events_validated($width = 300, $height = 200, $url = "", $meta =
* @param bool if the graph required is or not for metaconsole * @param bool if the graph required is or not for metaconsole
* @param bool if the graph required is or not for history table * @param bool if the graph required is or not for history table
*/ */
function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta = false, $history = false) { function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta = false, $history = false, $noWaterMark = true) {
global $config; global $config;
global $graphic_type; global $graphic_type;
@ -2459,9 +2459,10 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
// Sort the data // Sort the data
arsort($data); arsort($data);
if ($noWaterMark) {
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false)); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
}
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark, __('Other'), '', $water_mark,
@ -2534,7 +2535,7 @@ function grafico_eventos_agente ($width = 300, $height = 200, $result = false, $
* *
* @param string filter Filter for query in DB * @param string filter Filter for query in DB
*/ */
function grafico_eventos_total($filter = "", $width = 320, $height = 200) { function grafico_eventos_total($filter = "", $width = 320, $height = 200, $noWaterMark = true) {
global $config; global $config;
global $graphic_type; global $graphic_type;
@ -2591,10 +2592,11 @@ function grafico_eventos_total($filter = "", $width = 320, $height = 200) {
break; break;
} }
} }
if ($noWaterMark) {
$water_mark = array( $water_mark = array(
'file' => $config['homedir'] . "/images/logo_vertical_water.png", 'file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false)); 'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false));
}
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark, __('Other'), '', $water_mark,

2
pandora_console/include/functions_ui.php
View File

@ -931,7 +931,7 @@ function ui_print_string_substr ($string, $cutoff = 16, $return = false, $fontsi
$font_size_mod = ""; $font_size_mod = "";
if ($fontsize > 0) { if ($fontsize > 0) {
$font_size_mod = "style='font-size: ".$fontsize."px'"; $font_size_mod = "style='font-size: ".$fontsize."pt'";
} }
$string = '<span '.$font_size_mod.' title="'.io_safe_input($string2).'">'.mb_substr ($string2, 0, $cutoff, "UTF-8").$string3.'</span>'; $string = '<span '.$font_size_mod.' title="'.io_safe_input($string2).'">'.mb_substr ($string2, 0, $cutoff, "UTF-8").$string3.'</span>';

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

@ -315,7 +315,7 @@ div#menu {
width: 45px; width: 45px;
float: left; float: left;
height: 828px; height: 828px;
z-index: 999; z-index: 2000;
position: absolute; position: absolute;
} }
@ -613,12 +613,6 @@ input:-webkit-autofill {
/* END OF LOGIN STYLES */ /* END OF LOGIN STYLES */
/***********************/ /***********************/
label {
display: block;
padding-top: 4px;
font-weight: bold;
text-align: left;
}
th > label { th > label {
padding-top: 7px; padding-top: 7px;
} }
@ -665,6 +659,7 @@ input.target, input.search, input.copy, input.add, input.graph,
input.percentile, input.binary, input.camera, input.config, input.percentile, input.binary, input.camera, input.config,
input.cancel, input.default, input.filter, input.pdf { input.cancel, input.default, input.filter, input.pdf {
padding-right: 30px; padding-right: 30px;
margin-top: 15px;
height: 23px; height: 23px;
} }
@ -1316,6 +1311,11 @@ span.rmess, span.nrmess {
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
padding-bottom: 5px;
}
.databox_color{
padding-top: 5px;
} }
table.databox { table.databox {
@ -1335,8 +1335,10 @@ table.databox {
} }
.databox th { .databox th {
padding: 5px 7px; padding: 9px 7px;
font-weight: normal;
color: #fff; color: #fff;
padding-left: 10px;
} }
.databox th * { .databox th * {
@ -1723,7 +1725,7 @@ form#filter_form {
} }
ul.action_list { ul.action_list {
margin: 0; margin: 0;
list-style: none inside url(../../images/arrow.png); list-style: none inside circle;
} }
ul.action_list li div { ul.action_list li div {
margin-left: 15px; margin-left: 15px;
@ -2456,7 +2458,7 @@ input.search_input {
margin-top: 8px !important; margin-top: 8px !important;
} }
a>img, td>img, td>input, td>span { a>img, td>input, td>span {
vertical-align: middle; vertical-align: middle;
} }
@ -2853,8 +2855,23 @@ table#policy_modules td * {
} }
.databox.data td{ .databox.data td{
padding-left: 5px; padding-left: 10px;
border: 1px solid #E2E2E2; border: 1px solid #EFEFEF;
}
.databox .search{
margin-top: 0px;
}
.databox.data td.progress_bar img{
border: 3px solid #000;
border-radius: 100px;
}
.databox td{
padding-left: 10px;
padding-top: 7px;
padding-bottom: 7px;
} }
.difference{ .difference{
@ -2909,6 +2926,9 @@ table#policy_modules td * {
.databox.filters td{ .databox.filters td{
padding: 10px; padding: 10px;
} }
.databox_color td{
padding-left: 10px;
}
.godmode, .menu_icon ul li{ .godmode, .menu_icon ul li{
background-color: #222; background-color: #222;

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

@ -574,7 +574,7 @@ if (!empty ($table->data)) {
echo '</form>'; echo '</form>';
} }
else { else {
echo '<div class="nf">'.__('No alerts found').'</div>'; ui_print_empty_data ( __('No alerts found') );
} }
//strict user hidden //strict user hidden

4
pandora_console/operation/agentes/custom_fields.php
View File

@ -49,15 +49,17 @@ else {
if ($fields === false) { if ($fields === false) {
$fields = array(); $fields = array();
echo "<div class='nf'>". __("No fields defined"). "</div>"; ui_print_empty_data ( __("No fields defined") );
} }
else { else {
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox data'; $table->class = 'databox data';
$table->head = array (); $table->head = array ();
$table->head[0] = __('Field'); $table->head[0] = __('Field');
$table->size[0] = "20%";
$table->head[1] = __('Display on front') . $table->head[1] = __('Display on front') .
ui_print_help_tip (__('The fields with display on front enabled will be displayed into the agent details'), true); ui_print_help_tip (__('The fields with display on front enabled will be displayed into the agent details'), true);
$table->size[1] = "10%";
$table->head[2] = __('Description'); $table->head[2] = __('Description');
$table->align = array (); $table->align = array ();
$table->align[1] = 'center'; $table->align[1] = 'center';

8
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -100,7 +100,7 @@ $table_agent->cellstyle[count($table_agent->data)][2] =
$status_img = agents_detail_view_status_img ($agent["critical_count"], $status_img = agents_detail_view_status_img ($agent["critical_count"],
$agent["warning_count"], $agent["unknown_count"], $agent["total_count"], $agent["warning_count"], $agent["unknown_count"], $agent["total_count"],
$agent["notinit_count"]); $agent["notinit_count"]);
$data[5] = $status_img; $data[2] .= "&nbsp;&nbsp;" .$status_img;
$table_agent->data[] = $data; $table_agent->data[] = $data;
$table_agent->rowclass[] = ''; $table_agent->rowclass[] = '';
@ -492,13 +492,13 @@ $table->style = array_fill(0, 3, 'vertical-align: top;');
$data = array(); $data = array();
$data[0] = html_print_table($table_agent, true); $data[0] = html_print_table($table_agent, true);
$data[0] .= $data[0] .=
'<table width=450px class="databox" style=""> '<br /> <table width=455px class="databox" style="">
<tr><th>' . <tr><th>' .
__('Events (24h)') . __('Events (24h)') .
'</th></tr>' . '</th></tr>' .
'<tr><td style="text-align:center;">' . '<tr><td style="text-align:center;"><br />' .
graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true) . graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true) .
'</td></tr>' . '<br /></td></tr>' .
'</table>'; '</table>';
// ACCESS RATE GRAPH // ACCESS RATE GRAPH

5
pandora_console/operation/agentes/gis_view.php
View File

@ -49,7 +49,7 @@ foreach ($_GET as $key => $value) {
echo "<div style='margin-bottom: 30px;'></div>"; echo "<div style='margin-bottom: 30px;'></div>";
/* Map with the current position */ /* Map with the current position */
echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>"; echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:100%; height: 30em;\"></div>";
if (!gis_get_agent_map($id_agente, "500px", "100%", true, true, $period)) { if (!gis_get_agent_map($id_agente, "500px", "100%", true, true, $period)) {
ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map.")); ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map."));
@ -125,8 +125,7 @@ $result = db_get_all_rows_sql ($sql, true);
if ($result === false) { if ($result === false) {
echo "<div class='nf'>" . ui_print_empty_data( __('This agent doesn\'t have any GIS data.') );
__('This agent doesn\'t have any GIS data.') . "</div>";
} }
else { else {
ui_pagination ($countData, false) ; ui_pagination ($countData, false) ;

20
pandora_console/operation/agentes/graphs.php
View File

@ -106,17 +106,12 @@ if (empty($modules)) {
} }
$table = null; $table = null;
$table->width = '98%'; $table->width = '100%';
$table->style[0] = 'font-weight: bolder; text-align: right;'; $table->style[0] = 'font-weight: bolder; text-align: right;';
$table->style[1] = ''; $table->style[1] = '';
$table->style[2] = 'font-weight: bolder; text-align: right;'; $table->style[2] = 'font-weight: bolder; text-align: right;';
$table->valign[0] = 'top';
$table->valign[1] = 'top';
$table->valign[2] = 'top';
$table->valign[3] = 'top';
$table->rowspan[0][0] = 6; $table->rowspan[0][0] = 6;
$table->rowspan[0][1] = 6; $table->rowspan[0][1] = 6;
@ -174,7 +169,11 @@ else
$date = $utime; $date = $utime;
if ($combined) { if ($combined) {
echo "<h4>" . __('Combined graph') . '</h4>';
echo "<div style='width: 555px;'><strong style='font-size:9pt;'>" . __('Combined graph') . '</strong>&nbsp;&nbsp;';
html_print_button(__('Save as custom graph'), 'save_custom_graph',
false, 'save_custom_graph();', 'class="sub add" style="margin:0px"');
echo "</div>";
custom_graphs_print(0, custom_graphs_print(0,
$height, $height,
@ -186,11 +185,6 @@ if ($combined) {
false, false,
'white', 'white',
$modules); $modules);
echo "<div style='width: 555px; text-align: right;'>";
html_print_button(__('Save as custom graph'), 'save_custom_graph',
false, 'save_custom_graph();', 'class="sub save"');
echo "</div>";
} }
else { else {
foreach ($modules as $id_module) { foreach ($modules as $id_module) {
@ -220,7 +214,7 @@ echo "<div style='clear: both;'></div>";
//Dialog to save the custom graph //Dialog to save the custom graph
echo "<div id='dialog_save_custom_graph' style='display: none;'>"; echo "<div id='dialog_save_custom_graph' style='display: none;'>";
$table = null; $table = null;
$table->width = '98%'; $table->width = '100%';
$table->style[0] = 'font-weight: bolder; text-align: right;'; $table->style[0] = 'font-weight: bolder; text-align: right;';
$table->data[0][0] = __('Name custom graph'); $table->data[0][0] = __('Name custom graph');
$table->data[0][1] = $table->data[0][1] =

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

@ -119,8 +119,8 @@ if (!empty($result_groups)) {
echo '<table cellpadding="0" cellspacing="0" style="margin-top:10px;" class="databox data" border="0" width="100%">'; echo '<table cellpadding="0" cellspacing="0" style="margin-top:10px;" class="databox data" border="0" width="100%">';
echo "<tr>"; echo "<tr>";
echo "<th colspan=2 ></th>"; echo "<th colspan=2 ></th>";
echo "<th colspan=3 class='difference'>" . __("Agents") . "</th>"; echo "<th colspan=3 class='difference' style='text-align:center'>" . __("Agents") . "</th>";
echo "<th colspan=6 >" . __("Modules") . "</th>"; echo "<th colspan=6 style='text-align:center'>" . __("Modules") . "</th>";
echo "</tr>"; echo "</tr>";
echo "<tr>"; echo "<tr>";

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

@ -159,7 +159,7 @@ if (!empty($all_data)) {
} }
echo '<table border=0 style="width:100%;"><tr>'; echo '<table border=0 style="width:100%;"><tr>';
echo '<td style="vertical-align: top; min-width: 180px; width:25%; padding-right: 10px; vertical-align: top; padding-top: 0px;" id="leftcolumn">'; echo '<td style="vertical-align: top; min-width: 180px; width:25%; padding-right: 20px; vertical-align: top; padding-top: 0px;" id="leftcolumn">';
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// The status horizontal bars (Global health, Monitor sanity... // The status horizontal bars (Global health, Monitor sanity...
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ -216,7 +216,7 @@ html_print_table($table);
echo '</td>'; //Left column echo '</td>'; //Left column
echo '<td style="vertical-align: top; width: 56%; padding-top: 0px;" id="rightcolumn">'; echo '<td style="vertical-align: top; width: 75%; padding-top: 0px;" id="rightcolumn">';
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ -240,19 +240,20 @@ if (!empty($acltags)) {
if ($is_admin) { if ($is_admin) {
$tiny = true; $tiny = true;
require($config['homedir'] . '/godmode/servers/servers.build_table.php'); require($config['homedir'] . '/godmode/servers/servers.build_table.php');
} }
$out .= '<table cellpadding=0 cellspacing=0 class="databox" style="margin-top:15px;" width=100%><tr><td>'; $out .= '<table cellpadding=0 cellspacing=0 class="databox" style="margin-top:15px;" width=100%><tr><td>';
$out .= '<fieldset class="databox tactical_set"> $out .= '<fieldset class="databox tactical_set">
<legend>' . <legend>' .
__('Event graph') . __('Event graph') .
'</legend>' . '</legend>' .
grafico_eventos_total("", 250, 80) . '</fieldset>'; grafico_eventos_total("", 250, 80, false) . '</fieldset>';
$out .="</td><td>"; $out .="</td><td>";
$out .= '<fieldset class="databox tactical_set"> $out .= '<fieldset class="databox tactical_set">
<legend>' . <legend>' .
__('Event graph by agent') . __('Event graph by agent') .
'</legend>' . '</legend>' .
grafico_eventos_grupo(250, 80) . '</fieldset>'; grafico_eventos_grupo(250, 80, "", false, false, false) . '</fieldset>';
$out .= '</td></tr></table>'; $out .= '</td></tr></table>';
echo $out; echo $out;