From a3ebd008764e17b7f6c3d6cb5c2c957a22976fa7 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 9 May 2018 13:12:03 +0200 Subject: [PATCH] [Rebranding] Node setup and footer --- pandora_console/general/footer.php | 4 +-- pandora_console/general/login_required.php | 2 +- pandora_console/godmode/setup/setup_auth.php | 2 +- .../godmode/setup/setup_general.php | 27 ++++++------------- .../godmode/setup/setup_visuals.php | 12 ++++----- pandora_console/include/functions_config.php | 6 ++--- 6 files changed, 20 insertions(+), 33 deletions(-) diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index 99cebe8f2d..33c8493e26 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -45,11 +45,11 @@ else{ $build_package_version = $current_package; } -echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"])); +echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config["MR"])); echo '
'; echo ''. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here -echo '
'.__("® Ártica ST").''; +echo '
® '.get_copyright_notice().''; if (isset ($config['debug'])) { $cache_info = array(); diff --git a/pandora_console/general/login_required.php b/pandora_console/general/login_required.php index 5cb52604c5..e6486665ea 100644 --- a/pandora_console/general/login_required.php +++ b/pandora_console/general/login_required.php @@ -83,7 +83,7 @@ echo '
data[0][0] = __('Language code for Pandora'); +$table->data[0][0] = __('Language code'); $table->data[0][1] = html_print_select_from_sql ( 'SELECT id_language, name FROM tlanguage', 'language', $current_system_lang , '', '', '', true); @@ -72,7 +72,7 @@ $table->data[10][1] = __('Yes').'   '.html_print_radio_button ('a $table->data[10][1] .= __('No').'   '.html_print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true); $table->data[11][0] = __('Enforce https'); -$table->data[11][1] = __('Yes').'   '.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'  '; +$table->data[11][1] = __('Yes').'   '.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to %s Console. Do you want to continue?', get_product_name()) . "')) return false", '', true) .'  '; $table->data[11][1] .= __('No').'   '.html_print_radio_button ('https', 0, '', $config["https"], true); $table->data[12][0] = __('Use cert of SSL'); @@ -99,7 +99,7 @@ $table->data[16][0] = __('API password') . ui_print_help_tip (__("Please be careful if you put a password put https access."), true); $table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true); -$table->data[17][0] = __('Enable GIS features in Pandora Console'); +$table->data[17][0] = __('Enable GIS features'); $table->data[17][1] = __('Yes').'   '.html_print_radio_button ('activate_gis', 1, '', $config["activate_gis"], true).'  '; $table->data[17][1] .= __('No').'   '.html_print_radio_button ('activate_gis', 0, '', $config["activate_gis"], true); @@ -141,7 +141,6 @@ $table->data[23][1] .= ''.html_print_image ('images/penc $table->data[23][1] .= "  ". html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true); $table->data[23][1] .= "  ". html_print_select($timezone_n, 'timezone', $config["timezone"], '', '', '', true); - $sounds = get_sounds(); $table->data[24][0] = __('Sound for Alert fired'); $table->data[24][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true); @@ -159,12 +158,12 @@ $table->data[26][1] .= ' ' . ht $table->data[26][1] .= '
'; $table->data[28][0] = __('Public URL'); -$table->data[28][0] .= ui_print_help_tip(__('Set this value when your PandoraFMS across inverse proxy or for example with mod_proxy of Apache.') . - ' '.__('Without the index.php such as http://domain/pandora_url/'), true); +$table->data[28][0] .= ui_print_help_tip(__('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()) . + ' '.__('Without the index.php such as http://domain/console_url/'), true); $table->data[28][1] = html_print_input_text ('public_url', $config['public_url'], '', 40, 255, true); $table->data[29][0] = __('Referer security'); -$table->data[29][0] .= ui_print_help_tip(__('When it is set as "yes" in some important sections check if the user have gone from url Pandora.'), true); +$table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true); $table->data[29][1] = __('Yes') . '   ' . html_print_radio_button ('referer_security', 1, '', $config["referer_security"], true) . '  '; @@ -281,20 +280,10 @@ function show_timezone () { } $(document).ready (function () { - + $("#zone").attr("hidden", true); $("#timezone").attr("hidden", true); - - $("input[name='acl_enterprise']").click(function() { - flag = $(this).is(':checked'); - if (flag == true) { - - } - }); - - + $("#change_timezone").click(function () { $("#zone").attr("hidden", false); $("#timezone").attr("hidden", false); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index bbe0e20d27..3e7eda10f1 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -386,7 +386,7 @@ $table_font->data[$row][1] = html_print_select($font_size_array, 'font_size', $row++; $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); + ui_print_help_tip(__('When the agent name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), 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:') . @@ -394,19 +394,19 @@ $table_font->data[$row][1] .= ' ' . __('Normal:') . $row++; $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); + ui_print_help_tip(__('When the module name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), 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_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][0] = __('Description size text') . ui_print_help_tip(__('If the description name has a lot of characters, in some places in %s Console it is necessary to truncate it to N characters.', get_product_name()), true); $table_font->data[$row][1] = html_print_input_text ('description_size_text', $config["description_size_text"], '', 3, 3, true); $row++; $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); + ui_print_help_tip(__('When the item title name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console.', get_product_name()), true); $table_font->data[$row][1] = html_print_input_text('item_title_size_text', $config["item_title_size_text"], '', 3, 3, true); $row++; @@ -488,7 +488,7 @@ if (!enterprise_installed()) { $disabled_graph_precision = true; } -$table_chars->data[$row][0] = __('Data precision in PandoraFMS'); +$table_chars->data[$row][0] = __('Data precision'); $table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true); $table_chars->data[$row][1] = html_print_input_text ('graph_precision', $config["graph_precision"], '', 5, 5, true, $disabled_graph_precision, false, "onChange=\"change_precision()\""); $row++; @@ -665,7 +665,7 @@ $table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts, $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 AND PNG) in upload tool in console."), true); + __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true); $table_other->data['custom_report_front-logo'][1] = html_print_select( $customLogos, 'custom_report_front_logo', diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 4f78bdf79d..776a0e5b03 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -126,7 +126,7 @@ function config_update_config () { switch ($section_setup) { case 'general': if (!config_update_value ('language', (string) get_parameter ('language'))) - $error_update[] = __('Language code for Pandora'); + $error_update[] = __('Language settings'); if (!config_update_value ('remote_config', (string) get_parameter ('remote_config'))) $error_update[] = __('Remote config directory'); if (!config_update_value ('loginhash_pwd', io_input_password((string) get_parameter ('loginhash_pwd')))) @@ -149,9 +149,7 @@ function config_update_config () { if (!config_update_value ('api_password', io_input_password(get_parameter('api_password')))) $error_update[] = __('API password'); if (!config_update_value ('activate_gis', (bool) get_parameter ('activate_gis'))) - $error_update[] = __('Enable GIS features in Pandora Console'); - if (!config_update_value ('integria_enabled', get_parameter ('integria_enabled'))) - $error_update[] = __('Enable Integria incidents in Pandora Console'); + $error_update[] = __('Enable GIS features'); if (!config_update_value ('integria_inventory', get_parameter ('integria_inventory'))) $error_update[] = __('Integria inventory'); if (!config_update_value ('integria_api_password', io_input_password(get_parameter ('integria_api_password'))))