From 964b17644a744dacd2e53f388775024a7f65f316 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Fri, 26 Jun 2015 11:20:08 +0200 Subject: [PATCH] Change visual --- pandora_console/extras/pandora_diag.php | 2 +- pandora_console/godmode/setup/news.php | 2 +- pandora_console/godmode/setup/performance.php | 3 +- pandora_console/godmode/setup/setup_auth.php | 2 +- .../godmode/setup/setup_netflow.php | 6 +- .../godmode/setup/setup_visuals.php | 385 ++++++++++-------- 6 files changed, 212 insertions(+), 188 deletions(-) diff --git a/pandora_console/extras/pandora_diag.php b/pandora_console/extras/pandora_diag.php index 7acc7a2dda..439f3b03b5 100644 --- a/pandora_console/extras/pandora_diag.php +++ b/pandora_console/extras/pandora_diag.php @@ -89,7 +89,7 @@ else { // Header ui_print_page_header (__('Pandora FMS Diagnostic tool'), "", false, "", true); - echo ""; + echo "
"; echo ""; echo ""; } diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index a55e166547..7f6e251d00 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -264,7 +264,7 @@ else { echo ""; } - echo ''; + echo ''; } echo "
".__("Item")."".__("Data value")."
".__('No')."' . html_print_image("images/cross.png", true, array("border" => '0')) . '
' . html_print_image("images/cross.png", true, array("border" => '0')) . '
"; } diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php index 66a78ebed1..c0a1d54153 100644 --- a/pandora_console/godmode/setup/performance.php +++ b/pandora_console/godmode/setup/performance.php @@ -37,6 +37,7 @@ to add it there. $table = new StdClass(); $table->width = '100%'; +$table->class = "databox filters"; $table->data = array (); $table->size[0] = '70%'; @@ -66,7 +67,7 @@ $table->data[7][1] = html_print_input_text ('days_compact', $config["days_compac $table->data[8][0] = __('Max. days before delete unknown modules'); $table->data[8][1] = html_print_input_text ('days_delete_unknown', $config["days_delete_unknown"], '', 5, 5, true); -$table_other = new StdClass(); +$table_other = new stdClass(); $table_other->width = '100%'; $table_other->class = 'databox filters'; $table_other->data = array (); diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index 6b421c62bd..25a212d48e 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -32,7 +32,7 @@ enterprise_include ('godmode/setup/setup_auth.php'); $table = new StdClass(); $table->data = array (); $table->width = '100%'; -$tablw->class = 'databox filters'; +$table->class = 'databox filters'; $table->size[0] = '30%'; $table->data[0][0] = __('Authentication method'); diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php index 535309ab23..ba2e56f6b8 100644 --- a/pandora_console/godmode/setup/setup_netflow.php +++ b/pandora_console/godmode/setup/setup_netflow.php @@ -30,11 +30,11 @@ if (! check_acl ($config["id_user"], 0, "IR")) { $update = (bool) get_parameter ("update"); -$table->width = '98%'; +$table->width = '100%'; $table->border = 0; $table->cellspacing = 3; $table->cellpadding = 5; -$table->class = "databox_color"; +$table->class = "databox filters"; $table->data = array (); @@ -76,7 +76,7 @@ echo '
'; html_print_table ($table); // Update button -echo '
'; +echo '
'; html_print_input_hidden ('update_config', 1); html_print_submit_button (__('Update'), 'upd_button', false, 'class="sub upd"'); echo '
'; diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index e55a216c6a..ea856918f8 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -45,21 +45,20 @@ to add it there. require_once ('include/functions_themes.php'); require_once ('include/functions_gis.php'); -$table = new stdClass(); -$table->width = '100%'; -$table->data = array (); - $row = 0; +echo '
'; +html_print_input_hidden ('update_config', 1); //---------------------------------------------------------------------- // BEHAVIOUR CONFIGURATION //---------------------------------------------------------------------- -$table->colspan[$row][0] = 2; -$table->data[$row][0] = __('Behaviour configuration') . '
'; -$row++; +$table_behaviour = new stdClass(); +$table_behaviour->width = '100%'; +$table_behaviour->class = "databox filters"; +$table_behaviour->data = array (); -$table->data[$row][0] = __('Block size for pagination'); -$table->data[$row][1] = html_print_input_text ('block_size', $config["global_block_size"], '', 5, 5, true); +$table_behaviour->data[$row][0] = __('Block size for pagination'); +$table_behaviour->data[$row][1] = html_print_input_text ('block_size', $config["global_block_size"], '', 5, 5, true); $row++; $values = array (); @@ -71,97 +70,110 @@ $values[SECONDS_5MINUTES] = human_time_description_raw(SECONDS_5MINUTES); $values[SECONDS_10MINUTES] = human_time_description_raw(SECONDS_10MINUTES); $values[SECONDS_30MINUTES] = human_time_description_raw(SECONDS_30MINUTES); -$table->data[$row][0] = __('Default interval for refresh on Visual Console') . ui_print_help_tip(__('This interval will affect to Visual Console pages'), true); -$table->data[$row][1] = html_print_select ($values, 'vc_refr', $config["vc_refr"], '', 'N/A', 0, true, false, false); +$table_behaviour->data[$row][0] = __('Default interval for refresh on Visual Console') . + ui_print_help_tip(__('This interval will affect to Visual Console pages'), true); +$table_behaviour->data[$row][1] = html_print_select ($values, 'vc_refr', $config["vc_refr"], '', 'N/A', 0, true, false, false); $row++; -$table->data[$row][0] = __('Paginated module view'); -$table->data[$row][1] = html_print_checkbox('paginate_module', 1, +$table_behaviour->data[$row][0] = __('Paginated module view'); +$table_behaviour->data[$row][1] = html_print_checkbox('paginate_module', 1, $config['paginate_module'], true); $row++; -$table->data[$row][0] = __('Display proc modules in binary format (OK/FAIL).'); -$table->data[$row][1] = __('Yes') . ' ' . +$table_behaviour->data[$row][0] = __('Display proc modules in binary format (OK/FAIL).'); +$table_behaviour->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('render_proc', 1, '', $config["render_proc"], true) . '  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_behaviour->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('render_proc', 0, '', $config["render_proc"], true); $row++; +echo "
"; +echo "" . __('Behaviour configuration') . ""; +html_print_table ($table_behaviour); +echo "
"; //---------------------------------------------------------------------- - //---------------------------------------------------------------------- // STYLE CONFIGURATION //---------------------------------------------------------------------- -$table->colspan[$row][0] = 2; -$table->data[$row][0] = __('Style configuration') . '
'; +$table_styles = new stdClass(); +$table_styles->width = '100%'; +$table_styles->class = "databox filters"; +$table_styles->data = array (); + +$table_styles->data[$row][0] = __('Style template'); +$table_styles->data[$row][1] = html_print_select (themes_get_css (), 'style', $config["style"].'.css', '', '', '', true); $row++; -$table->data[$row][0] = __('Style template'); -$table->data[$row][1] = html_print_select (themes_get_css (), 'style', $config["style"].'.css', '', '', '', true); -$row++; - -$table->data[$row][0] = __('Status icon set'); +$table_styles->data[$row][0] = __('Status icon set'); $iconsets["default"] = __('Colors'); $iconsets["faces"] = __('Faces'); $iconsets["color_text"] = __('Colors and text'); -$table->data[$row][1] = html_print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true); -$table->data[$row][1] .= " " . html_print_button(__("View"), 'status_set_preview', false, '', '', true); +$table_styles->data[$row][1] = html_print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true); +$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'status_set_preview', false, '', '', true); $row++; -$table->data[$row][0] = __('Login background') . ui_print_help_tip(__('You can place your custom images into the folder images/backgrounds/'), true); +$table_styles->data[$row][0] = __('Login background') . ui_print_help_tip(__('You can place your custom images into the folder images/backgrounds/'), true); $backgrounds_list_jpg = list_files("images/backgrounds", "jpg", 1, 0); $backgrounds_list_gif = list_files("images/backgrounds", "gif", 1, 0); $backgrounds_list_png = list_files("images/backgrounds", "png", 1, 0); $backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png); $backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif); asort($backgrounds_list); -$table->data[$row][1] = html_print_select ($backgrounds_list, +$table_styles->data[$row][1] = html_print_select ($backgrounds_list, 'login_background', $config["login_background"], '', __('Default'), '', true); -$table->data[$row][1] .= " " . html_print_button(__("View"), 'login_background_preview', false, '', '', true); +$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true); $row++; -$table->data[$row][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true); -$table->data[$row][1] = html_print_select( +$table_styles->data[$row][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true); +$table_styles->data[$row][1] = html_print_select( list_files('images/custom_logo', "png", 1, 0), 'custom_logo', $config["custom_logo"], '', '', '', true); -$table->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview', false, '', '', true); +$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview', false, '', 'class="sub camera"', true); $row++; -$table->data[$row][0] = __('Fixed header'); -$table->data[$row][1] = __('Yes') . ' ' . +$table_styles->data[$row][0] = __('Fixed header'); +$table_styles->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('fixed_header', 1, '', $config["fixed_header"], true) . '  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_styles->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('fixed_header', 0, '', $config["fixed_header"], true); $row++; -$table->data[$row][0] = __('Fixed menu'); -$table->data[$row][1] = __('Yes') . ' ' . +$table_styles->data[$row][0] = __('Fixed menu'); +$table_styles->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('fixed_menu', 1, '', $config["fixed_menu"], true) . '  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_styles->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('fixed_menu', 0, '', $config["fixed_menu"], true); -$row++; + +// For 5.1 Autohidden menu feature +$table_styles->data['autohidden'][0] = __('Autohidden menu'); +$table_styles->data['autohidden'][1] = html_print_checkbox('autohidden_menu', + 1, $config['autohidden_menu'], true); + +echo "
"; +echo "" . __('Style configuration') . ""; +html_print_table ($table_styles); +echo "
"; //---------------------------------------------------------------------- - - //---------------------------------------------------------------------- // GIS CONFIGURATION //---------------------------------------------------------------------- -$table->colspan[$row][0] = 2; -$table->data[$row][0] = __('GIS configuration') . '
'; -$row++; +$table_gis = new stdClass(); +$table_gis->width = '100%'; +$table_gis->class = "databox filters"; +$table_gis->data = array (); -$table->data[$row][0] = __('GIS Labels') . +$table_gis->data[$row][0] = __('GIS Labels') . ui_print_help_tip(__('This enabling this, you get a label with agent name in GIS maps. If you have lots of agents in the map, will be unreadable. Disabled by default.'), true); -$table->data[$row][1] = __('Yes') . ' ' . +$table_gis->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('gis_label', 1, '', $config["gis_label"], true).'  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_gis->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('gis_label', 0, '', $config["gis_label"], true); $row++; @@ -169,29 +181,34 @@ $listIcons = gis_get_array_list_icons(); $arraySelectIcon = array(); foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index; -$table->data[$row][0] = __('Default icon in GIS') . ui_print_help_tip(__('Agent icon for GIS Maps. If set to "none", group icon will be used'), true); -$table->data[$row][1] = html_print_select($arraySelectIcon, +$table_gis->data[$row][0] = __('Default icon in GIS') . ui_print_help_tip(__('Agent icon for GIS Maps. If set to "none", group icon will be used'), true); +$table_gis->data[$row][1] = html_print_select($arraySelectIcon, "gis_default_icon", $config["gis_default_icon"], "", __('None'), '', true); -$table->data[$row][1] .= " " . html_print_button(__("View"), 'gis_icon_preview', false, '', '', true); +$table_gis->data[$row][1] .= " " . html_print_button(__("View"), 'gis_icon_preview', false, '', '', true); $row++; -//---------------------------------------------------------------------- +echo "
"; +echo "" . __('GIS configuration') . ""; +html_print_table ($table_gis); +echo "
"; +//---------------------------------------------------------------------- //---------------------------------------------------------------------- // FONT AND TEXT CONFIGURATION //---------------------------------------------------------------------- -$table->colspan[$row][0] = 2; -$table->data[$row][0] = __('Font and Text configuration') . '
'; -$row++; +$table_font = new stdClass(); +$table_font->width = '100%'; +$table_font->class = "databox filters"; +$table_font->data = array (); -$table->data[$row][0] = __('Font path'); +$table_font->data[$row][0] = __('Font path'); $fonts = load_fonts(); -$table->data[$row][1] = html_print_select($fonts, 'fontpath', io_safe_output($config["fontpath"]), '', '', 0, true); +$table_font->data[$row][1] = html_print_select($fonts, 'fontpath', io_safe_output($config["fontpath"]), '', '', 0, true); $row++; -$table->data[$row][0] = __('Font size'); +$table_font->data[$row][0] = __('Font size'); $font_size_array = array( 1 => 1, @@ -210,147 +227,152 @@ $font_size_array = array( 14 => 14, 15 => 15); -$table->data[$row][1] = html_print_select($font_size_array, 'font_size', +$table_font->data[$row][1] = html_print_select($font_size_array, 'font_size', $config["font_size"], '', '', 0, true); $row++; -$table->data[$row][0] = __('Agent size text') . ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); -$table->data[$row][1] = __('Small:') . html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true); -$table->data[$row][1] .= ' ' . __('Normal:') . html_print_input_text ('agent_size_text_medium', $config["agent_size_text_medium"], '', 3, 3, true); +$table_font->data[$row][0] = __('Agent size text') . ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); +$table_font->data[$row][1] = __('Small:') . html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true); +$table_font->data[$row][1] .= ' ' . __('Normal:') . html_print_input_text ('agent_size_text_medium', $config["agent_size_text_medium"], '', 3, 3, true); $row++; -$table->data[$row][0] = __('Module size text') . ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); -$table->data[$row][1] = __('Small:') . html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true); -$table->data[$row][1] .= ' ' . __('Normal:') . html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true); +$table_font->data[$row][0] = __('Module size text') . ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); +$table_font->data[$row][1] = __('Small:') . html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true); +$table_font->data[$row][1] .= ' ' . __('Normal:') . html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true); $row++; -$table->data[$row][0] = __('Description size text') . ui_print_help_tip(__('When the description name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); -$table->data[$row][1] = html_print_input_text ('description_size_text', $config["description_size_text"], '', 3, 3, true); +$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('When the description name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); +$table_font->data[$row][1] = html_print_input_text ('description_size_text', $config["description_size_text"], '', 3, 3, true); $row++; -$table->data[$row][0] = __('Item title size text') . +$table_font->data[$row][0] = __('Item title size text') . ui_print_help_tip(__('When the item title name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true); -$table->data[$row][1] = html_print_input_text('item_title_size_text', +$table_font->data[$row][1] = html_print_input_text('item_title_size_text', $config["item_title_size_text"], '', 3, 3, true); $row++; -//---------------------------------------------------------------------- +echo "
"; +echo "" . __('Font and Text configuration') . ""; +html_print_table ($table_font); +echo "
"; +//---------------------------------------------------------------------- //---------------------------------------------------------------------- // CHARS CONFIGURATION //---------------------------------------------------------------------- -$table->colspan[$row][0] = 2; -$table->data[$row][0] = __('Charts configuration') . '
'; +$table_chars = new stdClass(); +$table_chars->width = '100%'; +$table_chars->class = "databox filters"; +$table_chars->data = array (); + +$table_chars->data[$row][0] = __('Graph color (min)'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color (min)'); -$table->data[$row][1] = html_print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color (avg)'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color2', $config["graph_color2"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color (avg)'); -$table->data[$row][1] = html_print_input_text ('graph_color2', $config["graph_color2"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color (max)'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color3', $config["graph_color3"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color (max)'); -$table->data[$row][1] = html_print_input_text ('graph_color3', $config["graph_color3"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #4'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color4', $config["graph_color4"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #4'); -$table->data[$row][1] = html_print_input_text ('graph_color4', $config["graph_color4"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #5'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color5', $config["graph_color5"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #5'); -$table->data[$row][1] = html_print_input_text ('graph_color5', $config["graph_color5"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #6'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color6', $config["graph_color6"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #6'); -$table->data[$row][1] = html_print_input_text ('graph_color6', $config["graph_color6"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #7'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color7', $config["graph_color7"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #7'); -$table->data[$row][1] = html_print_input_text ('graph_color7', $config["graph_color7"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #8'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color8', $config["graph_color8"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #8'); -$table->data[$row][1] = html_print_input_text ('graph_color8', $config["graph_color8"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #9'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color9', $config["graph_color9"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #9'); -$table->data[$row][1] = html_print_input_text ('graph_color9', $config["graph_color9"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph color #10'); +$table_chars->data[$row][1] = html_print_input_text ('graph_color10', $config["graph_color10"], '', 8, 8, true); $row++; -$table->data[$row][0] = __('Graph color #10'); -$table->data[$row][1] = html_print_input_text ('graph_color10', $config["graph_color10"], '', 8, 8, true); +$table_chars->data[$row][0] = __('Graph resolution (1-low, 5-high)'); +$table_chars->data[$row][1] = html_print_input_text ('graph_res', $config["graph_res"], '', 5, 5, true); $row++; -$table->data[$row][0] = __('Graph resolution (1-low, 5-high)'); -$table->data[$row][1] = html_print_input_text ('graph_res', $config["graph_res"], '', 5, 5, true); -$row++; - -$table->data[$row][0] = __('Default line thickness for the Custom Graph.'); -$table->data[$row][1] = html_print_input_text ('custom_graph_width', +$table_chars->data[$row][0] = __('Default line thickness for the Custom Graph.'); +$table_chars->data[$row][1] = html_print_input_text ('custom_graph_width', $config["custom_graph_width"], '', 5, 5, true); $row++; -$table->data[$row][0] = __('Use round corners'); -$table->data[$row][1] = __('Yes').' '.html_print_radio_button ('round_corner', 1, '', $config["round_corner"], true).'  '; -$table->data[$row][1] .= __('No').' '.html_print_radio_button ('round_corner', 0, '', $config["round_corner"], true); +$table_chars->data[$row][0] = __('Use round corners'); +$table_chars->data[$row][1] = __('Yes').' '.html_print_radio_button ('round_corner', 1, '', $config["round_corner"], true).'  '; +$table_chars->data[$row][1] .= __('No').' '.html_print_radio_button ('round_corner', 0, '', $config["round_corner"], true); $row++; -$table->data[$row][0] = __('Interactive charts') . +$table_chars->data[$row][0] = __('Interactive charts') . ui_print_help_tip(__('Whether to use Javascript or static PNG graphs'), true); -$table->data[$row][1] = __('Yes').' ' . +$table_chars->data[$row][1] = __('Yes').' ' . html_print_radio_button ('flash_charts', 1, '', $config["global_flash_charts"], true).'  '; -$table->data[$row][1] .= __('No').' ' . +$table_chars->data[$row][1] .= __('No').' ' . html_print_radio_button ('flash_charts', 0, '', $config["global_flash_charts"], true); $row++; if (!isset($config["short_module_graph_data"])) $config["short_module_graph_data"] = true; -$table->data[$row][0] = __('Shortened module graph data'); -$table->data[$row][0] .= ui_print_help_tip(__('The data number of the module graphs will be rounded and shortened'), true); -$table->data[$row][1] = __('Yes') . ' ' . +$table_chars->data[$row][0] = __('Shortened module graph data'); +$table_chars->data[$row][0] .= ui_print_help_tip(__('The data number of the module graphs will be rounded and shortened'), true); +$table_chars->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('short_module_graph_data', 1, '', $config["short_module_graph_data"], true) . '  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_chars->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('short_module_graph_data', 0, '', $config["short_module_graph_data"], true); $row++; -$table->data[$row][0] = __('Type of module charts'); -$table->data[$row][1] = __('Area').' ' . +$table_chars->data[$row][0] = __('Type of module charts'); +$table_chars->data[$row][1] = __('Area').' ' . html_print_radio_button ('type_module_charts', 'area', '', $config["type_module_charts"] == 'area', true).'  '; -$table->data[$row][1] .= __('Line').' ' . +$table_chars->data[$row][1] .= __('Line').' ' . html_print_radio_button ('type_module_charts', 'line', '', $config["type_module_charts"] != 'area', true); $row++; -//---------------------------------------------------------------------- +echo "
"; +echo "" . __('Charts configuration') . ""; +html_print_table ($table_chars); +echo "
"; +//---------------------------------------------------------------------- //---------------------------------------------------------------------- // OTHER CONFIGURATION //---------------------------------------------------------------------- -$table->colspan[$row][0] = 2; -$table->data[$row][0] = __('Other configuration') . '
'; -$row++; +$table_other = new stdClass(); +$table_other->width = '100%'; +$table_other->class = "databox filters"; +$table_other->data = array (); if (empty($config["vc_line_thickness"])) $config["vc_line_thickness"] = 2; -$table->data[$row][0] = __('Default line thickness for the Visual Console') . ui_print_help_tip(__('This interval will affect to the lines between elements on the Visual Console'), true); -$table->data[$row][1] = html_print_input_text ('vc_line_thickness', $config["vc_line_thickness"], '', 5, 5, true); +$table_other->data[$row][0] = __('Default line thickness for the Visual Console') . ui_print_help_tip(__('This interval will affect to the lines between elements on the Visual Console'), true); +$table_other->data[$row][1] = html_print_input_text ('vc_line_thickness', $config["vc_line_thickness"], '', 5, 5, true); $row++; -// For 5.1 Autohidden menu feature -$table->data['autohidden'][0] = __('Autohidden menu'); -$table->data['autohidden'][1] = html_print_checkbox('autohidden_menu', - 1, $config['autohidden_menu'], true); - // Juanma (07/05/2014) New feature: Table for custom front page for reports -$table->data[$row][0] = __('Custom report front page') . +$table_other->data[$row][0] = __('Custom report front page') . ui_print_help_tip( __('Custom report front page. It will be applied to all reports and templates by default.'), true); -$table->data[$row][1] = html_print_checkbox('custom_report_front', 1, +$table_other->data[$row][1] = html_print_checkbox('custom_report_front', 1, $config['custom_report_front'], true); $row++; //---------------------------------------------------------------------- @@ -393,17 +415,17 @@ foreach ($dirFonts as $entryDir) { } // Font -$table->data['custom_report_front-font'][0] = __('Custom report front') . ' - ' . __('Font family'); -$table->data['custom_report_front-font'][1] = html_print_select ($_fonts, +$table_other->data['custom_report_front-font'][0] = __('Custom report front') . ' - ' . __('Font family'); +$table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts, 'custom_report_front_font', $config['custom_report_front_font'], false, __('Default'), '', true); // Logo -$table->data['custom_report_front-logo'][0] = __('Custom report front') . ' - ' . +$table_other->data['custom_report_front-logo'][0] = __('Custom report front') . ' - ' . __('Custom logo') . ui_print_help_tip( __("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG) in upload tool in console."), true); -$table->data['custom_report_front-logo'][1] = html_print_select( +$table_other->data['custom_report_front-logo'][1] = html_print_select( $customLogos, 'custom_report_front_logo', $config['custom_report_front_logo'], @@ -412,64 +434,64 @@ $table->data['custom_report_front-logo'][1] = html_print_select( '', true); // Preview -$table->data['custom_report_front-preview'][0] = __('Custom report front') . ' - ' . 'Preview'; +$table_other->data['custom_report_front-preview'][0] = __('Custom report front') . ' - ' . 'Preview'; if (empty($config['custom_report_front_logo'])) { $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg'; } -$table->data['custom_report_front-preview'][1] = '' . +$table_other->data['custom_report_front-preview'][1] = '' . html_print_image ($config['custom_report_front_logo'], true) . ''; // Header -$table->data['custom_report_front-header'][0] = __('Custom report front') . ' - ' . __('Header'); -$table->data['custom_report_front-header'][1] = html_print_textarea('custom_report_front_header', 5, 15, +$table_other->data['custom_report_front-header'][0] = __('Custom report front') . ' - ' . __('Header'); +$table_other->data['custom_report_front-header'][1] = html_print_textarea('custom_report_front_header', 5, 15, $config['custom_report_front_header'], 'style="width: 38em;"', true); // First page -$table->data['custom_report_front-first_page'][0] = __('Custom report front') . ' - ' . __('First page'); -$table->data['custom_report_front-first_page'][1] = html_print_textarea('custom_report_front_firstpage', 15, 15, +$table_other->data['custom_report_front-first_page'][0] = __('Custom report front') . ' - ' . __('First page'); +$table_other->data['custom_report_front-first_page'][1] = html_print_textarea('custom_report_front_firstpage', 15, 15, $config['custom_report_front_firstpage'], 'style="width: 38em; height: 20em;"', true); // Footer -$table->data['custom_report_front-footer'][0] = __('Custom report front') . ' - ' . __('Footer'); -$table->data['custom_report_front-footer'][1] = html_print_textarea('custom_report_front_footer', 5, 15, +$table_other->data['custom_report_front-footer'][0] = __('Custom report front') . ' - ' . __('Footer'); +$table_other->data['custom_report_front-footer'][1] = html_print_textarea('custom_report_front_footer', 5, 15, $config['custom_report_front_footer'], 'style="width: 38em;"', true); -$table->data[$row][0] = __('Show QR Code icon in the header'); -$table->data[$row][1] = __('Yes') . ' ' . +$table_other->data[$row][0] = __('Show QR Code icon in the header'); +$table_other->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('show_qr_code_header', 1, '', $config["show_qr_code_header"], true) . '  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_other->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('show_qr_code_header', 0, '', $config["show_qr_code_header"], true); $row++; -$table->data[$row][0] = __('Custom graphviz directory') . +$table_other->data[$row][0] = __('Custom graphviz directory') . ui_print_help_tip (__("Custom directory where the graphviz binaries are stored."), true); -$table->data[$row][1] = html_print_input_text ('graphviz_bin_dir', +$table_other->data[$row][1] = html_print_input_text ('graphviz_bin_dir', $config["graphviz_bin_dir"], '', 50, 255, true); $row++; -$table->data[$row][0] = __('Networkmap max width'); -$table->data[$row][1] = html_print_input_text ('networkmap_max_width', +$table_other->data[$row][0] = __('Networkmap max width'); +$table_other->data[$row][1] = html_print_input_text ('networkmap_max_width', $config["networkmap_max_width"], '', 10, 20, true); $row++; -$table->data[$row][0] = __('Show only the group name'); -$table->data[$row][0] .= ui_print_help_tip( +$table_other->data[$row][0] = __('Show only the group name'); +$table_other->data[$row][0] .= ui_print_help_tip( __('Show the group name instead the group icon.'), true); -$table->data[$row][1] = __('Yes') . ' ' . +$table_other->data[$row][1] = __('Yes') . ' ' . html_print_radio_button ('show_group_name', 1, '', $config["show_group_name"], true) . '  '; -$table->data[$row][1] .= __('No') . ' ' . +$table_other->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('show_group_name', 0, '', $config["show_group_name"], true); $row++; @@ -478,9 +500,9 @@ $row++; -$table->data[$row][0] = __('Date format string') . ui_print_help_icon("date_format", true); -$table->data[$row][1] = ''.__('Example').' '.date ($config["date_format"]); -$table->data[$row][1] .= html_print_input_text ('date_format', $config["date_format"], '', 30, 100, true); +$table_other->data[$row][0] = __('Date format string') . ui_print_help_icon("date_format", true); +$table_other->data[$row][1] = ''.__('Example').' '.date ($config["date_format"]); +$table_other->data[$row][1] .= html_print_input_text ('date_format', $config["date_format"], '', 30, 100, true); $row++; if ($config['prominent_time'] == 'comparation') { @@ -491,44 +513,44 @@ else if ($config['prominent_time'] == 'timestamp') { $timestamp = true; $comparation = false; } -$table->data[$row][0] = __('Timestamp or time comparation') . ui_print_help_icon ("time_stamp-comparation", true); -$table->data[$row][1] = __('Comparation in rollover') . ' '; -$table->data[$row][1] .= html_print_radio_button ('prominent_time', "comparation", '', $comparation, true); -$table->data[$row][1] .= '
'.__('Timestamp in rollover').' '; -$table->data[$row][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $timestamp, true); +$table_other->data[$row][0] = __('Timestamp or time comparation') . ui_print_help_icon ("time_stamp-comparation", true); +$table_other->data[$row][1] = __('Comparation in rollover') . ' '; +$table_other->data[$row][1] .= html_print_radio_button ('prominent_time', "comparation", '', $comparation, true); +$table_other->data[$row][1] .= '
'.__('Timestamp in rollover').' '; +$table_other->data[$row][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $timestamp, true); $row++; //---------------------------------------------------------------------- // CUSTOM VALUES POST PROCESS //---------------------------------------------------------------------- -$table->data[$row][0] = __('Custom values post process'); -$table->data[$row][1] = ""; -$table->data[$row][1] .= __('Value') . ': ' . +$table_other->data[$row][0] = __('Custom values post process'); +$table_other->data[$row][1] = "
"; +$table_other->data[$row][1] .= __('Value') . ': ' . html_print_input_text ('custom_value', '', '', 25, 50, true); -$table->data[$row][1] .= ' ' . __('Text') . ': ' . +$table_other->data[$row][1] .= ' ' . __('Text') . ': ' . html_print_input_text ('custom_text', '', '', 25, 50, true); -$table->data[$row][1] .= " "; -$table->data[$row][1] .= html_print_input_hidden( +$table_other->data[$row][1] .= " "; +$table_other->data[$row][1] .= html_print_input_hidden( 'custom_value_add', '', true); -$table->data[$row][1] .= html_print_button (__('Add'), +$table_other->data[$row][1] .= html_print_button (__('Add'), 'custom_value_add_btn', false, "", 'class="sub next"', true); -$table->data[$row][1] .= '

'; +$table_other->data[$row][1] .= '

'; -$table->data[$row][1] .= __('Delete custom values') . ': '; -$table->data[$row][1] .= html_print_select( +$table_other->data[$row][1] .= __('Delete custom values') . ': '; +$table_other->data[$row][1] .= html_print_select( post_process_get_custom_values(), 'custom_values', "", "", '', '', true); $count_custom_postprocess = post_process_get_custom_values(); -$table->data[$row][1] .= html_print_button (__('Delete'), +$table_other->data[$row][1] .= html_print_button (__('Delete'), 'custom_values_del_btn', empty($count_custom_postprocess), "", 'class="sub cancel"', true); // This hidden field will be filled from jQuery before submit -$table->data[$row][1] .= html_print_input_hidden( +$table_other->data[$row][1] .= html_print_input_hidden( 'custom_value_to_delete', '', true); -$table->data[$row][1] .= "
"; +$table_other->data[$row][1] .= ""; //---------------------------------------------------------------------- @@ -536,7 +558,7 @@ $table->data[$row][1] .= ""; // CUSTOM INTERVAL VALUES //---------------------------------------------------------------------- $row++; -$table->data[$row][0] = __('Interval values'); +$table_other->data[$row][0] = __('Interval values'); $units = array( 1 => __('seconds'), SECONDS_1MINUTE => __('minutes'), @@ -544,26 +566,27 @@ $units = array( SECONDS_1DAY => __('days'), SECONDS_1MONTH => __('months'), SECONDS_1YEAR => __('years')); -$table->data[$row][1] = __('Add new custom value to intervals') . ': '; -$table->data[$row][1] .= html_print_input_text ('interval_value', '', '', 5, 5, true); -$table->data[$row][1] .= html_print_select ($units, 'interval_unit', 1, "", '', '', true, false, false); -$table->data[$row][1] .= html_print_button (__('Add'), 'interval_add_btn', false, "", 'class="sub next"', true); -$table->data[$row][1] .= '

'; +$table_other->data[$row][1] = __('Add new custom value to intervals') . ': '; +$table_other->data[$row][1] .= html_print_input_text ('interval_value', '', '', 5, 5, true); +$table_other->data[$row][1] .= html_print_select ($units, 'interval_unit', 1, "", '', '', true, false, false); +$table_other->data[$row][1] .= html_print_button (__('Add'), 'interval_add_btn', false, "", 'class="sub next"', true); +$table_other->data[$row][1] .= '

'; -$table->data[$row][1] .= __('Delete interval') . ': '; -$table->data[$row][1] .= html_print_select (get_periods(false, false), 'intervals', "", "", '', '', true); -$table->data[$row][1] .= html_print_button (__('Delete'), 'interval_del_btn', empty($config["interval_values"]), "", 'class="sub cancel"', true); +$table_other->data[$row][1] .= __('Delete interval') . ': '; +$table_other->data[$row][1] .= html_print_select (get_periods(false, false), 'intervals', "", "", '', '', true); +$table_other->data[$row][1] .= html_print_button (__('Delete'), 'interval_del_btn', empty($config["interval_values"]), "", 'class="sub cancel"', true); -$table->data[$row][1] .= html_print_input_hidden ('interval_values', $config["interval_values"], true); +$table_other->data[$row][1] .= html_print_input_hidden ('interval_values', $config["interval_values"], true); // This hidden field will be filled from jQuery before submit -$table->data[$row][1] .= html_print_input_hidden ('interval_to_delete', '', true); +$table_other->data[$row][1] .= html_print_input_hidden ('interval_to_delete', '', true); //---------------------------------------------------------------------- $row++; +echo "
"; +echo "" . __('Other configuration') . ""; +html_print_table ($table_other); +echo "
"; -echo ''; -html_print_input_hidden ('update_config', 1); -html_print_table ($table); echo '
'; html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');