From 30320b789754efadfeab1f645fd62814a1d31481 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 30 May 2019 11:12:37 +0200 Subject: [PATCH 1/2] Fixed login button style and removed help icons from agent_management --- pandora_console/general/login_page.php | 6 +++--- .../godmode/agentes/agent_manager.php | 18 +++++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index d8e28223c6..880f1531a1 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -186,7 +186,7 @@ switch ($login_screen) { echo ''; echo ''; echo '
'; @@ -226,7 +226,7 @@ switch ($login_screen) { ); echo '
'; echo '
'; - html_print_submit_button(__('Login'), 'login_button', false, 'class="sub next_login"'); + html_print_submit_button(__('Login'), 'login_button', false, 'class="next_login"'); echo '
'; } break; @@ -245,7 +245,7 @@ switch ($login_screen) { html_print_input_text_extended('auth_code', '', 'auth_code', '', '', '', false, '', 'class="login login_password" placeholder="'.__('Authentication code').'"', false, true); echo ''; echo '
'; - html_print_submit_button(__('Check code').'  >', 'login_button', false, 'class="sub next_login"'); + html_print_submit_button(__('Check code').'  >', 'login_button', false, 'class="next_login"'); echo '
'; break; diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 93bf1931b5..dfdd7390c3 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -219,14 +219,6 @@ if (!$new_agent && $alias != '') { // Delete link from here. $table_agent_name .= "".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).''; - // Help link. - $table_agent_name .= ui_print_help_icon( - $help_header, - true, - '', - 'images/help_g.png' - ); - // Remote configuration available. if (isset($filename)) { if (file_exists($filename['md5'])) { @@ -393,7 +385,7 @@ $table_server .= html_print_select( __('None'), 0, true -).'
'.ui_print_help_icon('agent_server', true).'
'; +).'
'; // Description. $table_description = '

'.__('Description').':

'; @@ -421,7 +413,7 @@ echo '
'; if (enterprise_installed()) { $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]); - $table_adv_secondary_groups = '

'.__('Secondary groups').': '.ui_print_help_icon('secondary_groups', true).'

'; + $table_adv_secondary_groups = '

'.__('Secondary groups').':

'; $table_adv_secondary_groups_left = html_print_select_groups( false, // Use the current user to select the groups. @@ -576,7 +568,7 @@ if (enterprise_installed()) { $cps_html = '
'; $cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true); - $cps_html .= __('Cascade protection services').' '.ui_print_help_icon('cascade_protection', true); + $cps_html .= __('Cascade protection services').' '; $cps_html .= ui_print_help_tip( __('Alerts and events will be managed by the service joined by this agent.'), true @@ -607,7 +599,7 @@ if (enterprise_installed()) { 1, $cascade_protection, true - ).__('Cascade protection').' '.ui_print_help_icon('cascade_protection', true); + ).__('Cascade protection').' '; } $table_adv_parent .= __('Module').' '.html_print_select( @@ -621,7 +613,7 @@ $table_adv_parent .= __('Module').' '.html_print_select( ).'
'; // Learn mode / Normal mode. -$table_adv_module_mode = '

'.__('Module definition').': '.ui_print_help_icon('module_definition', true).'

'; +$table_adv_module_mode = '

'.__('Module definition').':

'; $table_adv_module_mode .= '
'; $table_adv_module_mode .= html_print_radio_button_extended( 'modo', From 94153b823f5635b1e663ed9687dcef0026f83f71 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 30 May 2019 11:25:09 +0200 Subject: [PATCH 2/2] Help links --- pandora_console/godmode/agentes/configurar_agente.php | 3 +-- pandora_console/include/functions.php | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index eaf65771fd..22410b0e23 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -700,8 +700,7 @@ if ($id_agente) { agents_get_alias($id_agente), 'images/setup.png', false, - // Previous: $help_header. - '', + $help_header, true, $onheader, false, diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index a5f1d92a7a..f299153da6 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -4946,6 +4946,14 @@ function get_help_info($section_name) } break; + case 'create_agent': + if ($es) { + $result .= 'Intro_Monitorizacion&printable=yes#Configuraci.C3.B3n_del_agente_en_consola'; + } else { + $result .= 'Intro_Monitoring&printable=yes#Agent_configuration_in_the_console'; + } + break; + case 'agent_snmp_explorer_tab': if ($es) { $result .= 'Monitorizacion_remota&printable=yes#Wizard_SNMP';