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

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
Alejandro Gallardo Escobar 2015-07-01 17:16:42 +02:00
parent ca6fcce190 03b617908b
commit 0fb9519441
14 changed files with 111 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pandora_console/godmode/events/event_filter.php
View File

@ -111,12 +111,12 @@ $table->head[5] = __('Action') .
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->align = array ();
$table->align[1] = 'center';
$table->align[2] = 'center';
if(!defined("METACONSOLE"))
$table->align[3] = 'left';
$table->align[4] = 'center';
$table->align[5] = 'center';
$table->align[1] = 'left';
$table->align[2] = 'left';
$table->align[3] = 'left';
$table->align[4] = 'left';
$table->align[5] = 'left';
$table->size = array ();
$table->size[0] = '50%';
$table->size[1] = '5px';
@ -148,30 +148,31 @@ foreach ($filters as $filter) {
}
if (isset($data)) {
echo "<form method='post' action='index.php?sec=geventos&sec2=godmode/events/events&amp;pure=".$config['pure']."'>";
html_print_input_hidden('multiple_delete', 1);
html_print_table ($table);
if(!defined("METACONSOLE"))
echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
else
echo "<div style='text-align: right; width:100%;'>";
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
echo "</div>";
echo "</form>";
}
else {
ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined filters') ) );
}
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&amp;pure='.$config['pure'].'">';
if (isset($data)) {
echo "<form method='post' action='index.php?sec=geventos&sec2=godmode/events/events&amp;pure=".$config['pure']."'>";
html_print_input_hidden('multiple_delete', 1);
if(!defined("METACONSOLE"))
echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
echo "<div style='padding-bottom: 20px; text-align: right;'>";
else
echo "<div style='text-align: right; width:100%;'>";
html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"');
echo "<div style='float:right; '>";
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
echo "</div>";
echo "</form>";
}
if(!defined("METACONSOLE"))
echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
else
echo "<div style='float:right; '>";
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&amp;pure='.$config['pure'].'">';
html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"');
echo '</form>';
echo "</div>";
?>
<script type="text/javascript">

2
pandora_console/godmode/netflow/nf_edit_form.php
View File

@ -176,8 +176,6 @@ $table->class = "databox filters";
$table->style[0] = 'font-weight: bold';
if (defined('METACONSOLE')) {
$table->width = '100%';
$table->class = 'databox data';
if($id)
$table->head[0] = __("Update filter");
else

3
pandora_console/godmode/reporting/map_builder.php
View File

@ -206,6 +206,9 @@ $table->head[0] = __('Map name');
$table->head[1] = __('Group');
$table->head[2] = __('Items');
if (defined("METACONSOLE"))
$table->styleTable = "margin-top:0px";
// Fix: IW was the old ACL for report editing, now is RW
//Only for RW flag
if ($vconsoles_write || $vconsoles_manage) {

100
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -538,10 +538,7 @@ $urlForm = $config['homeurl'] .
echo '<form action="' . $urlForm . '" method="post">';
html_print_input_hidden('id_item', $idItem);
if (defined("METACONSOLE"))
$class = 'databox data';
else
$class = 'databox filters';
$class = 'databox filters';
?>
<table style="" class="<?php echo $class;?>" id="" border="0" cellpadding="4" cellspacing="4" width="100%">
@ -558,7 +555,7 @@ else
?>
<tbody>
<tr id="row_type" style="" class="datos">
<td style="vertical-align: top; width: 220px;"><?php echo __('Type'); ?></td>
<td style="font-weight:bold; width: 220px;"><?php echo __('Type'); ?></td>
<td style="">
<?php
if ($action == 'new') {
@ -576,7 +573,7 @@ else
</td>
</tr>
<tr id="row_name" style="" class="datos">
<td style="vertical-align: top;">
<td style="font-weight:bold;">
<?php echo __('Name'); ?>
</td>
<td style="">
@ -586,7 +583,7 @@ else
</td>
</tr>
<tr id="row_netflow_filter" style="" class="datos">
<td><?php echo __('Filter');?></td>
<td style="font-weight:bold;"><?php echo __('Filter');?></td>
<td>
<?php
$own_info = get_user_info ($config['id_user']);
@ -604,7 +601,7 @@ else
</td>
</tr>
<tr id="row_description" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Description'); ?></td>
<td style="font-weight:bold;"><?php echo __('Description'); ?></td>
<td style="">
<?php
echo html_print_textarea('description', 3, 25, $description);
@ -612,7 +609,7 @@ else
</td>
</tr>
<tr id="row_period" style="" class="datos">
<td style="vertical-align: top;">
<td style="font-weight:bold;">
<?php
echo __('Period');
?>
@ -625,7 +622,7 @@ else
</tr>
<tr id="row_last_value" style="" class="datos">
<td style="vertical-align: top;" class="datos">
<td style="font-weight:bold;" class="datos">
<?php
echo __('Last value');
ui_print_help_tip(__('Warning: period 0 reports cannot be used to show information back in time. Information contained in this kind of reports will be always reporting the most recent information'));
@ -640,7 +637,7 @@ else
</tr>
<tr id="row_resolution" style="" class="datos">
<td style="vertical-align: top;">
<td style="font-weight:bold;">
<?php
echo __('Resolution');
?>
@ -651,7 +648,7 @@ else
?></td>
</tr>
<tr id="row_period1" style="" class="datos">
<td style="vertical-align: top;">
<td style="font-weight:bold;">
<?php
echo __('Period');
if ($type == 'projection_graph') {
@ -669,7 +666,7 @@ else
</td>
</tr>
<tr id="row_estimate" style="" class="datos">
<td style="vertical-align: top;">
<td style="font-weight:bold;">
<?php
echo __('Projection period') . ui_print_help_icon('projection_graph', true);
?>
@ -681,7 +678,7 @@ else
</td>
</tr>
<tr id="row_interval" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Data range') . ui_print_help_icon('prediction_date', true); ?></td>
<td style="font-weight:bold;"><?php echo __('Data range') . ui_print_help_icon('prediction_date', true); ?></td>
<td><?php
echo __('Max') . "&nbsp;";
html_print_input_text('max_interval', $max_interval, '', 5, 10);
@ -690,7 +687,7 @@ else
?></td>
</tr>
<tr id="row_only_display_wrong" style="" class="datos">
<td><?php echo __('Only display wrong SLAs');?></td>
<td style="font-weight:bold;"><?php echo __('Only display wrong SLAs');?></td>
<td>
<?php
html_print_checkbox('checkbox_only_display_wrong', 1, $only_display_wrong);
@ -698,7 +695,7 @@ else
</td>
</tr>
<tr id="row_working_time">
<td style="vertical-align: top;">
<td style="font-weight:bold;">
<?php echo __('Working time');?>
</td>
<td>
@ -769,7 +766,7 @@ else
</td>
</tr>
<tr id="row_group" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Group');?></td>
<td style="font-weight:bold;"><?php echo __('Group');?></td>
<td style="">
<?php
html_print_select_groups($config['id_user'],
@ -778,7 +775,7 @@ else
</td>
</tr>
<tr id="row_module_group" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Module group');?></td>
<td style="font-weight:bold;"><?php echo __('Module group');?></td>
<td style="">
<?php
html_print_select_from_sql(
@ -788,7 +785,7 @@ else
</td>
</tr>
<tr id="row_agent" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Agent'); ?></td>
<td style="font-weight:bold;"><?php echo __('Agent'); ?></td>
<td style="">
<?php
if ($meta) {
@ -838,7 +835,7 @@ else
</td>
</tr>
<tr id="row_module" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Module'); ?></td>
<td style="font-weight:bold;"><?php echo __('Module'); ?></td>
<td style="max-width: 180px">
<?php
if ($idAgent) {
@ -881,7 +878,7 @@ else
</td>
</tr>
<tr id="row_agent_multi" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Agents'); ?></td>
<td style="font-weight:bold;"><?php echo __('Agents'); ?></td>
<td>
<?php
$agents = enterprise_hook('inventory_get_agents');
@ -896,7 +893,7 @@ else
</td>
</tr>
<tr id="row_module_multi" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Modules'); ?></td>
<td style="font-weight:bold;"><?php echo __('Modules'); ?></td>
<td>
<?php
html_print_select(array(), 'inventory_modules[]', '', $script = '', __('None'), 0, false, true, true, '', false, "min-width: 180px");
@ -914,7 +911,7 @@ else
</td>
</tr>
<tr id="row_date" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Date'); ?></td>
<td style="font-weight:bold;"><?php echo __('Date'); ?></td>
<td style="max-width: 180px">
<?php
$dates = enterprise_hook(
@ -931,7 +928,7 @@ else
</td>
</tr>
<tr id="row_custom_graph" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Custom graph'); ?></td>
<td style="font-weight:bold;"><?php echo __('Custom graph'); ?></td>
<td style="">
<?php
if ($meta) {
@ -992,15 +989,15 @@ else
</td>
</tr>
<tr id="row_text" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Text'); ?></td>
<td style="font-weight:bold;"><?php echo __('Text'); ?></td>
<td style=""><?php html_print_textarea('text', 5, 25, $text); ?></td>
</tr>
<tr id="row_custom" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Custom SQL template'); ?></td>
<td style="font-weight:bold;"><?php echo __('Custom SQL template'); ?></td>
<td style=""><?php html_print_select_from_sql('SELECT id, name FROM treport_custom_sql', 'id_custom', $idCustom, 'chooseSQLquery()', '--', '0'); ?></td>
</tr>
<tr id="row_query" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('SQL query'); ?></td>
<td style="font-weight:bold;"><?php echo __('SQL query'); ?></td>
<td style="" id="sql_entry">
<?php
html_print_textarea('sql', 5, 25, $sql);
@ -1012,7 +1009,7 @@ else
if ($meta) {
?>
<tr id="row_servers" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Server'); ?></td>
<td style="font-weight:bold;"><?php echo __('Server'); ?></td>
<td style="">
<?php
html_print_select ($servers, 'combo_server', $server_name, '', __('Select server'), 0);
@ -1023,27 +1020,27 @@ else
}
?>
<tr id="row_header" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Serialized header') . ui_print_help_tip(__("The separator character is |"), true);?></td>
<td style="font-weight:bold;"><?php echo __('Serialized header') . ui_print_help_tip(__("The separator character is |"), true);?></td>
<td style=""><?php html_print_input_text('header', $header, '', 90, 250); ?></td>
</tr>
<tr id="row_url" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('URL'); ?></td>
<td style="font-weight:bold;"><?php echo __('URL'); ?></td>
<td style=""><?php html_print_input_text('url', $url, '', 90, 250); ?></td>
</tr>
<tr id="row_field_separator" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Field separator') . ui_print_help_tip(__("Separator for different fields in the serialized text chain"), true); ?></td>
<td style="font-weight:bold;"><?php echo __('Field separator') . ui_print_help_tip(__("Separator for different fields in the serialized text chain"), true); ?></td>
<td style=""><?php html_print_input_text('field', $field, '', 2, 4); ?></td>
</tr>
<tr id="row_line_separator" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Line separator') . ui_print_help_tip(__("Separator in different lines (composed by fields) of the serialized text chain"), true); ?></td>
<td style="font-weight:bold;"><?php echo __('Line separator') . ui_print_help_tip(__("Separator in different lines (composed by fields) of the serialized text chain"), true); ?></td>
<td style=""><?php html_print_input_text('line', $line, '', 2, 4); ?></td>
</tr>
<tr id="row_group_by_agent" style="" class="datos">
<td><?php echo __('Group by agent');?></td>
<td style="font-weight:bold;"><?php echo __('Group by agent');?></td>
<td><?php html_print_checkbox('checkbox_row_group_by_agent', 1, $group_by_agent);?></td>
</tr>
<tr id="row_order_uptodown" style="" class="datos">
<td><?php echo __('Order');?></td>
<td style="font-weight:bold;"><?php echo __('Order');?></td>
<td>
<?php
echo __('Ascending');
@ -1059,15 +1056,15 @@ else
</td>
</tr>
<tr id="row_quantity" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Quantity (n)'); ?></td>
<td style="font-weight:bold;"><?php echo __('Quantity (n)'); ?></td>
<td style=""><?php html_print_input_text('quantity', $top_n_value, '', 5, 5); ?></td>
</tr>
<tr id="row_max_values" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Max. values'); ?></td>
<td style="font-weight:bold;"><?php echo __('Max. values'); ?></td>
<td style=""><?php html_print_input_text('max_values', $max_values, '', 5, 5); ?></td>
</tr>
<tr id="row_max_min_avg" style="" class="datos">
<td><?php echo __('Display');?></td>
<td style="font-weight:bold;"><?php echo __('Display');?></td>
<td>
<?php
echo __('Max');
@ -1080,7 +1077,7 @@ else
</td>
</tr>
<tr id="row_time_compare_overlapped" style="" class="datos">
<td><?php echo __('Time compare (Overlapped)');?></td>
<td style="font-weight:bold;"><?php echo __('Time compare (Overlapped)');?></td>
<td>
<?php
html_print_checkbox('time_compare_overlapped', 1, $time_compare_overlapped);
@ -1088,11 +1085,11 @@ else
</td>
</tr>
<tr id="row_only_avg" style="" class="datos">
<td><?php echo __('Only average');?></td>
<td style="font-weight:bold;"><?php echo __('Only average');?></td>
<td><?php html_print_checkbox('only_avg', 1, $only_avg);?></td>
</tr>
<tr id="row_exception_condition_value" style="" class="datos">
<td style="vertical-align: top;"><?php echo __('Value'); ?></td>
<td style="font-weight:bold;"><?php echo __('Value'); ?></td>
<td style="">
<?php
html_print_input_text('exception_condition_value',
@ -1101,7 +1098,7 @@ else
</td>
</tr>
<tr id="row_exception_condition" style="" class="datos">
<td><?php echo __('Condition');?></td>
<td style="font-weight:bold;"><?php echo __('Condition');?></td>
<td><?php
$list_exception_condition = array(
REPORT_EXCEPTION_CONDITION_EVERYTHING => __('Everything'),
@ -1129,12 +1126,12 @@ else
*/?></td>
</tr>
<tr id="row_show_graph" style="" class="datos">
<td><?php echo __('Show graph');?></td>
<td style="font-weight:bold;"><?php echo __('Show graph');?></td>
<td><?php html_print_select ($show_graph_options, 'combo_graph_options', $show_graph);?></td>
</tr>
<tr id="row_show_address_agent" style="" class="datos">
<td>
<td style="font-weight:bold;">
<?php
echo __('Show address instead module name.') .
ui_print_help_tip(__('Show the main address of agent.'), true);
@ -1148,7 +1145,7 @@ else
</td>
</tr>
<tr id="row_show_resume" style="" class="datos">
<td><?php echo __('Show resume') . ui_print_help_tip(__('Show a resume table with max, min, average of total modules on the report bottom'), true);?></td>
<td style="font-weight:bold;"><?php echo __('Show resume') . ui_print_help_tip(__('Show a resume table with max, min, average of total modules on the report bottom'), true);?></td>
<td>
<?php
html_print_checkbox('checkbox_show_resume', 1,
@ -1157,7 +1154,7 @@ else
</td>
</tr>
<tr id="row_event_filter" style="" class="datos">
<td><?php echo __('Event filter'); ?></td>
<td style="font-weight:bold;"><?php echo __('Event filter'); ?></td>
<td>
<?php
echo __('No Validated');
@ -1173,7 +1170,7 @@ else
</tr>
</tr>
<tr id="row_event_graphs" style="" class="datos">
<td><?php echo __('Event graphs'); ?></td>
<td style="font-weight:bold;"><?php echo __('Event graphs'); ?></td>
<td>
<span id="row_event_graph_by_agent">
<?php
@ -1202,16 +1199,16 @@ else
</td>
</tr>
<tr id="row_show_in_two_columns" style="" class="datos">
<td><?php echo __('Show in two columns');?></td>
<td style="font-weight:bold;"><?php echo __('Show in two columns');?></td>
<td><?php html_print_checkbox('show_in_two_columns', 1, $show_in_two_columns, false,
false, 'if ($(\'input[name=show_in_two_columns]\').is(\':checked\')) $(\'input[name=show_in_landscape]\').attr(\'checked\', false);');?></td>
</tr>
<tr id="row_sort" style="" class="datos">
<td><?php echo __('Order') . ui_print_help_tip(__('SLA items sorted by fulfillment value'), true);?></td>
<td style="font-weight:bold;"><?php echo __('Order') . ui_print_help_tip(__('SLA items sorted by fulfillment value'), true);?></td>
<td><?php html_print_select ($show_sort_options, 'combo_sla_sort_options', $sla_sorted_by, '', __('None'), 0); ?></td>
</tr>
<tr id="row_show_in_landscape" style="" class="datos">
<td><?php echo __('Show in landscape');?></td>
<td style="font-weight:bold;"><?php echo __('Show in landscape');?></td>
<td>
<?php
html_print_checkbox('show_in_landscape', 1,
@ -1221,7 +1218,7 @@ else
</td>
</tr>
<tr id="row_filter_search" style="" class="datos">
<td><?php echo __('Free search');?></td>
<td style="font-weight:bold;"><?php echo __('Free search');?></td>
<td>
<?php
html_print_input_text('filter_search', $filter_search);
@ -1230,8 +1227,7 @@ else
</tr>
</tbody>
</table>
<br />
<br />
<?php
print_SLA_list('100%', $action, $idItem);
print_General_list('100%', $action, $idItem, $type);

5
pandora_console/godmode/reporting/reporting_builder.main.php
View File

@ -48,8 +48,6 @@ $table->class = 'databox filters';
$table->head = array ();
if (defined("METACONSOLE")) {
$table->width = '100%';
$table->class = 'databox data';
$table->head[0] = __('Main data');
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
@ -62,7 +60,8 @@ $table->size[0] = '15%';
$table->size[1] = '90%';
if(!defined("METACONSOLE"))
$table->style[0] = 'font-weight: bold; vertical-align: top;';
else
$table->style[0] = 'font-weight: bold;';
$table->data['name'][0] = __('Name');
$table->data['name'][1] = html_print_input_text('name', $reportName,
__('Name'), 80, 100, true);

12
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -472,16 +472,12 @@ switch ($action) {
$table->class = 'databox data';
$table->cellpadding = 0;
$table->cellspacing = 0;
if (defined('METACONSOLE')) {
$table->class = 'databox';
$table->width = '100%';
}
$table->head = array ();
$table->align = array ();
$table->align[2] = 'center';
$table->align[3] = 'center';
$table->align[4] = 'center';
$table->align[2] = 'left';
$table->align[3] = 'left';
$table->align[4] = 'left';
$table->data = array ();
$table->head[0] = __('Report name');
$table->head[1] = __('Description');
@ -509,7 +505,7 @@ switch ($action) {
if(defined('METACONSOLE'))
$table->align[$next] = '';
else
$table->align[$next] = 'center';
$table->align[$next] = 'left';
$next++;
$table->head[$next] = __('Group');
$table->size[$next] = '15%';

3
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -119,7 +119,8 @@ foreach ($layoutDatas as $layoutData) {
}
echo "<img style='position: absolute; top: 0px; left: 0px;' id='background_img' src='" . $metaconsole_hack . "images/console/background/" . $background . "' width='100%' height='100%' />";
echo "<img style='position: absolute; top: 0px; left: 0px;' id='background_img' src='" . $metaconsole_hack .
"images/console/background/" . $background . "' width='100%' height='100%' />";
echo '</div>';
echo '</div>';

11
pandora_console/godmode/reporting/visual_console_builder.elements.php
View File

@ -69,14 +69,9 @@ foreach ($all_images as $image_file) {
}
$table = new stdClass();
if (!defined('METACONSOLE')) {
$table->width = '100%';
$table->class = 'databox filters';
}
else {
$table->width = '100%';
$table->class = 'databox';
}
$table->width = '100%';
$table->class = 'databox data';
$table->head = array();
$table->head['icon'] = '';
$table->head[0] = __('Label') . ' / ' . __('Agent') . ' / ' . __('Group');

17
pandora_console/godmode/reporting/visual_console_builder.wizard.php
View File

@ -25,6 +25,8 @@ if (empty($visualConsole)) {
exit;
}
$strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
// ACL for the existing visual console
// if (!isset($vconsole_read))
// $vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
@ -53,8 +55,8 @@ if (!defined('METACONSOLE')) {
else {
$metaconsole_hack = '../../';
$table->width = '100%';
$table->class = 'databox data';
$table->styleTable = 'padding-top: 15px; margin-top:0px';
$table->class = 'databox filters';
$table->styleTable = ' margin-top:0px';
require_once($config['homedir'] .
"/enterprise/meta/include/functions_html_meta.php");
}
@ -62,7 +64,7 @@ else {
$table->style = array ();
$table->style[0] = 'font-weight: bold; ';
$table->style[1] = 'font-weight: bold; ';
$table->style[2] = 'font-weight: bold; ';
$table->size = array ();
@ -179,8 +181,13 @@ $table->data["percentileitem_4"][1] = html_print_radio_button_extended(
if (defined('METACONSOLE')) {
$table->rowstyle["all_2"] = 'display: none;';
$table->data["all_2"][0] = __('Servers');
$table->data["all_2"][1] = html_meta_print_select_servers(false,
false, 'servers', '', 'metaconsole_init();', '', 0, true);
if ($strict_user)
$table->data["all_2"][1] = html_print_select('','server_id',
$server_id, 'metaconsole_init();', __('All'), '0', true);
else
$table->data["all_2"][1] = html_print_select_from_sql(
'SELECT id, server_name FROM tmetaconsole_setup',
'server_id', $server_id, 'metaconsole_init();', __('All'), '0', true);
}

6
pandora_console/include/functions_reporting_html.php
View File

@ -101,8 +101,8 @@ function reporting_html_print_report($report, $mini = false) {
$table = new stdClass();
$table->size = array ();
$table->style = array ();
$table->width = '98%';
$table->class = 'databox';
$table->width = '100%';
$table->class = 'databox filters';
$table->rowclass = array ();
$table->rowclass[0] = 'datos3';
$table->data = array ();
@ -268,7 +268,7 @@ function reporting_html_print_report($report, $mini = false) {
}
if ($item['type'] == 'agent_module')
echo '<div style="width: 99%; overflow: auto;">';
echo '<div style="width: 100%; overflow: auto;">';
html_print_table($table);

6
pandora_console/include/functions_visual_map_editor.php
View File

@ -533,7 +533,11 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
function visual_map_editor_print_toolbox() {
global $config;
echo '<div id="editor" style="margin-top: -10px;">';
if (defined("METACONSOLE"))
echo '<div id="editor" style="">';
else
echo '<div id="editor" style="margin-top: -10px;">';
echo '<div id="toolbox">';
visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true);
visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true);

9
pandora_console/operation/netflow/nf_live_view.php
View File

@ -178,12 +178,7 @@ if (isset($config['netflow_disable_custom_lvfilters'])) {
enterprise_hook('open_meta_frame');
if (defined ('METACONSOLE')) {
$class = "databox data";
}
else {
$class = "databox filters";
}
$class = "databox filters";
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
echo "<table class='".$class."' width='100%'>";
@ -398,7 +393,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
echo "<table class='' width='100%' style='border: 0px; text-align:right;'><tr><td>";
echo html_print_submit_button (__('Draw'), 'draw_button', false, 'class="sub upd"',true) . "&nbsp;&nbsp;" ;
echo html_print_submit_button (__('Draw'), 'draw_button', false, 'class="sub upd"',true) ;
if (!$netflow_disable_custom_lvfilters) {
if (check_acl ($config["id_user"], 0, "AW")) {

6
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -143,11 +143,11 @@ else {
//------------------------ INIT FORM -----------------------------------
$table = new stdClass();
$table->id = 'controls_table';
$table->width = '99%';
$table->width = '100%';
$table->class = 'databox';
if (defined("METACONSOLE")) {
$table->width = '100%';
$table->class = 'databox data';
$table->class = 'databox filters';
$table->head[0] = __('View Report');
$table->head_colspan[0] = 5;
@ -252,8 +252,6 @@ $report = reporting_make_reporting_data(null, $id_report, $date, $time,
reporting_html_print_report($report);
echo "<br>";
//----------------------------------------------------------------------

9
pandora_console/operation/users/user_edit.php
View File

@ -186,9 +186,6 @@ $table->cellspacing = 4;
$table->cellpadding = 4;
$table->class = 'databox filters';
if (defined('METACONSOLE')) {
$table->width = '100%';
$table->class = 'databox data';
$table->head[0] = __('Edit my User');
$table->head_colspan[0] = 5;
$table->headstyle[0] = 'text-align: center';
@ -400,11 +397,13 @@ if (!defined('METACONSOLE'))
$table->width = '100%';
$table->class = 'databox data';
if (defined('METACONSOLE')) {
echo '<br />';
$table->width = '100%';
$table->class = 'databox_tactical data';
$table->class = 'databox data';
$table->title = __('Profiles/Groups assigned to this user');
$table->head_colspan[0] = 0;
$table->headstyle[] = "background-color: #82B93C";
$table->headstyle[] = "background-color: #82B93C";
$table->headstyle[] = "background-color: #82B93C";
}
$table->data = array ();