diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8df47750ab..3ae30dc732 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2014-09-02 Miguel de Dios + + * pandora_console/godmode/alerts/configure_alert_action.php, + pandora_console/include/functions_clippy.php, + pandora_console/include/help/clippy/godmode_agentes_configurar_agente.php, + pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php, + pandora_console/include/help/clippy/homepage.php, + pandora_console/include/help/clippy/operation_agentes_ver_agente.php: + some changes in the clippy. + 2014-09-01 Miguel de Dios * pandora_console/include/functions_graph.php, diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index c42af92ef2..549fa29c29 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -155,13 +155,20 @@ $table_html = html_print_table ($table, true); //Hack to hook the bubble dialog of clippy in any place, the intro.js //fails with new elements in the dom from javascript code //---------------------------------------------------------------------- +/* +$table_html = str_replace( + "", + "", + $table_html); $table_html = str_replace( '', - " - + " +
+ + ", $table_html); - +*/ //////////////////////////////////////////////////////////////////////// echo $table_html; diff --git a/pandora_console/include/functions_clippy.php b/pandora_console/include/functions_clippy.php index 01fd742e12..c550b5072c 100644 --- a/pandora_console/include/functions_clippy.php +++ b/pandora_console/include/functions_clippy.php @@ -154,6 +154,16 @@ function clippy_write_javascript_helps_steps($tours) { $show_step_numbers = (int)$conf['show_step_numbers']; } + $doneLabel = __('End wizard'); + if (!empty($conf['done_label'])) { + $doneLabel = $conf['done_label']; + } + + $skipLabel = __('End wizard'); + if (!empty($conf['skip_label'])) { + $skipLabel = $conf['skip_label']; + } + $help_context = false; ?> @@ -169,20 +179,20 @@ function clippy_write_javascript_helps_steps($tours) { showStepNumbers: , nextLabel: "", prevLabel: "", - skipLabel: "", - doneLabel: "", + skipLabel: "", + doneLabel: "", exitOnOverlayClick: false, exitOnEsc: true, //false, }) .oncomplete(function(value) { - ; - }) + ; + }) .onexit(function(value) { - ; - - exit = confirm(""); - return exit; - }); + ; + + exit = confirm(""); + return exit; + }); "input[name='crtbutton']", - 'intro' => __('And only to finish it is clicking this button.') + 'intro' => __('And only to finish it is clicking this button.'), + 'position' => 'left' ); $return_tours['tours']['monitoring_server_step_5']['conf'] = array(); $return_tours['tours']['monitoring_server_step_5']['conf']['show_bullets'] = 0; @@ -122,6 +123,7 @@ function clippy_start_page() { $return_tours['tours']['monitoring_server_step_6']['conf'] = array(); $return_tours['tours']['monitoring_server_step_6']['conf']['show_bullets'] = 0; $return_tours['tours']['monitoring_server_step_6']['conf']['show_step_numbers'] = 0; + $return_tours['tours']['monitoring_server_step_6']['conf']['done_label'] = __('Done'); //================================================================== //================================================================== diff --git a/pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php b/pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php index 86082d6285..da143da6e1 100644 --- a/pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php +++ b/pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php @@ -48,18 +48,18 @@ function clippy_start_page() { ui_print_help_icon ('action_threshold', true, '', 'images/help.png') ); $return_tours['tours']['email_alert_module_step_3']['steps'][] = array( - 'element'=> '#clippy_fields', - 'position' => 'top', + 'element'=> '#table_macros', + 'position' => 'bottom', 'intro' => __('In the first field enter the email address/addresses where you want to receive the email alerts separated with comas ( , ) or white spaces.') ); $return_tours['tours']['email_alert_module_step_3']['steps'][] = array( - 'element'=> '#clippy_fields', - 'position' => 'top', + 'element'=> '#table_macros', + 'position' => 'bottom', 'intro' => __('In the "Subject" field you can use the macros _agent_ or _module_ for each name.') ); $return_tours['tours']['email_alert_module_step_3']['steps'][] = array( - 'element'=> '#clippy_fields', - 'position' => 'top', + 'element'=> '#table_macros', + 'position' => 'bottom', 'intro' => __('In the text field, you can also use macros. Get more information about the macros by clicking on the help icon.') . '
' . ui_print_help_icon ('alert_config', true, '', 'images/help.png') ); diff --git a/pandora_console/include/help/clippy/homepage.php b/pandora_console/include/help/clippy/homepage.php index 2681ab75ad..b166adcb2e 100644 --- a/pandora_console/include/help/clippy/homepage.php +++ b/pandora_console/include/help/clippy/homepage.php @@ -57,13 +57,15 @@ function clippy_start_page_homepage() { 'intro' => '
'. __('Hi, can I help you?') . '

' . - __('Let me introduce my self: I am Pandorin, the annoying clippy of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') . + __('Let me introduce my self: I am Pandorin, the annoying assistant of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') . '
' . '
' . - html_print_checkbox_extended - ('clippy_is_annoying', 1, $clippy_is_annoying, false, - 'set_clippy_annoying()', '', true) . - __('Close this annoying clippy right now.') . + '
' . + html_print_checkbox_extended + ('clippy_is_annoying', 1, $clippy_is_annoying, false, + 'set_clippy_annoying()', '', true) . + __('Close this wizard and don\'t open it again.') . + '
' . '
' . '
' . diff --git a/pandora_console/include/help/clippy/operation_agentes_ver_agente.php b/pandora_console/include/help/clippy/operation_agentes_ver_agente.php index b3df29487d..3393265944 100644 --- a/pandora_console/include/help/clippy/operation_agentes_ver_agente.php +++ b/pandora_console/include/help/clippy/operation_agentes_ver_agente.php @@ -33,11 +33,13 @@ function clippy_start_page() { $return_tours['tours']['email_alert_module_step_10']['steps'][] = array( 'element'=> '#table8', 'position' => 'top', - 'intro' => __('The last step is to check the alert created. Click on the round icon to force the action execution and after a few minutes you will receive the alert in your email.') + 'intro' => __('The last step is to check the alert created. Click on the round icon to force the action execution and after a few minutes you will receive the alert in your email.') . '
' . + __('And restart your pandora server to read again general configuration tokens.') ); $return_tours['tours']['email_alert_module_step_10']['conf'] = array(); $return_tours['tours']['email_alert_module_step_10']['conf']['show_bullets'] = 0; $return_tours['tours']['email_alert_module_step_10']['conf']['show_step_numbers'] = 0; + $return_tours['tours']['email_alert_module_step_10']['conf']['done_label'] = __('Done'); //================================================================== return $return_tours;