diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fc41eb4a63..292f1a4e52 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2011-02-22 Sancho Lerena + + * include/functions_extensions.php: Extension menu entries text not + being stripped. + + * operation/menu.php: Extension menu entries for visualconsole a bit + wider. + + * godmode/reporting/visual_console_builder.data.php: Show a hint on + first letter of Visualconsole map to put the name in the menu. + Shortened input box, to avoid people enter long names and later be + cutted off. + 2011-02-22 Sancho Lerena * include/streams.php: Fixed bug 3184746. diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index 7ae15f8dba..00f71771a6 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -44,8 +44,9 @@ switch ($action) { $table->width = '70%'; $table->data = array (); -$table->data[0][0] = __('Name:'); -$table->data[0][1] = print_input_text ('name', $visualConsoleName, '', 15, 50, true); +$table->data[0][0] = __('Name:'). print_help_tip (__("Use [ or ( as first character, for example '[*] Map name', to render this map name in main menu"), true); + +$table->data[0][1] = print_input_text ('name', $visualConsoleName, '', 21, 30, true); $table->data[1][0] = __('Group:'); $groups = get_user_groups ($config['id_user']); diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php index 9efba76e1b..d8178f951a 100644 --- a/pandora_console/include/functions_extensions.php +++ b/pandora_console/include/functions_extensions.php @@ -297,7 +297,8 @@ function add_operation_menu_option ($name, $fatherId = null, $icon = null) { /* $config['extension_file'] is set in load_extensions(), since that function must be called before any function the extension call, we are sure it will be set. */ - $option_menu['name'] = mb_substr ($name, 0, 15); + $option_menu['name'] = $name; + $extension = &$config['extensions'][$extension_file]; $option_menu['sec2'] = $extension['dir'].'/'.mb_substr ($extension_file, 0, -4); $option_menu['fatherId'] = $fatherId; @@ -321,7 +322,7 @@ function add_godmode_menu_option ($name, $acl, $fatherId = null, $icon = null) { be called before any function the extension call, we are sure it will be set. */ $option_menu['acl'] = $acl; - $option_menu['name'] = mb_substr ($name, 0, 15); + $option_menu['name'] = $name; $extension = &$config['extensions'][$extension_file]; $option_menu['sec2'] = $extension['dir'].'/'.mb_substr ($extension_file, 0, -4); $option_menu['fatherId'] = $fatherId; diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 4fdb1bb7a5..0e693fdb1e 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -122,7 +122,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { if (!in_array($firstLetter, $firstLetterNameVisualToShow)) { continue; } - $sub["operation/visual_console/render_view&id=".$layout["id"]]["text"] = mb_substr ($name, 0, 15); + $sub["operation/visual_console/render_view&id=".$layout["id"]]["text"] = mb_substr ($name, 0, 19); $sub["operation/visual_console/render_view&id=".$layout["id"]]["title"] = $name; $sub["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = 0; }