From cfb7a3a88e52e20a4bdaa4dfa00cd62c0a0d1107 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 16 Feb 2017 15:40:56 +0100 Subject: [PATCH] fixed tabs in reports --- pandora_console/extensions/dbmanager.php | 1 + pandora_console/godmode/reporting/reporting_builder.php | 2 +- pandora_console/include/functions_ui.php | 4 ++-- pandora_console/operation/reporting/reporting_viewer.php | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index 27337e97b9..c74332b1eb 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -181,6 +181,7 @@ function dbmgr_extension_main () { } echo "
"; + $table = new stdClass(); $table->width = '100%'; $table->class = 'databox data'; $table->head = array_keys ($result[0]); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 97e3d0858e..4893107dba 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -1980,7 +1980,7 @@ if ($enterpriseEnable and defined('METACONSOLE')) { else { ui_print_page_header(__('Reporting') . $textReportName, "images/op_reporting.png", false, - "reporting_" . $activeTab . "_tab", false, $buttons); + "reporting_" . $activeTab . "_tab", false, $buttons,false,'',80); } if ($resultOperationDB !== null) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d416860c0d..3d365076d1 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2390,7 +2390,7 @@ function ui_get_full_url ($url = '', $no_proxy = false, $add_name_php_file = fal * @return string Header HTML */ -function ui_print_page_header ($title, $icon = "", $return = false, $help = "", $godmode = false, $options = "",$modal = false, $message = "") { +function ui_print_page_header ($title, $icon = "", $return = false, $help = "", $godmode = false, $options = "",$modal = false, $message = "", $numChars = GENERIC_SIZE_TEXT) { $title = io_safe_input_html($title); if (($icon == "") && ($godmode == true)) { $icon = "images/gm_setup.png"; @@ -2422,7 +2422,7 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "", } $buffer .= '' . - ui_print_truncate_text($title, 'item_title'); + ui_print_truncate_text($title, $numChars); if ($modal && !enterprise_installed()){ $buffer .= " diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 17b4a55a1e..4de4754b36 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -127,10 +127,8 @@ else { ui_print_page_header ( __('Reporting') . " » " . - __('Custom reporting') . - " - " . reporting_get_name($id_report), - "images/op_reporting.png", false, "", false, $options); + "images/op_reporting.png", false, "", false, $options,false,'',80); } //------------------- END HEADER ---------------------------------------