Change visual of metaconsole

This commit is contained in:
m-lopez-f 2015-07-01 17:05:53 +02:00
parent 78e60249a7
commit 03b617908b
8 changed files with 31 additions and 29 deletions

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

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) {

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>';

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');

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);
}

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);

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")) {

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 ();