tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

some changes in the clippy

Browse Source 
2014-09-02  Miguel de Dios <miguel.dedios@artica.es>

	* 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.
This commit is contained in:
mdtrooper 2014-09-02 16:42:59 +02:00
parent 6efed27e16
commit 6a74af80ec
7 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2014-09-02 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es> 2014-09-01 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/include/functions_graph.php, * pandora_console/include/functions_graph.php,

13
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -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 //Hack to hook the bubble dialog of clippy in any place, the intro.js
//fails with new elements in the dom from javascript code //fails with new elements in the dom from javascript code
//---------------------------------------------------------------------- //----------------------------------------------------------------------
/*
$table_html = str_replace(
"</table>",
"</div>",
$table_html);
$table_html = str_replace( $table_html = str_replace(
'<tr id="table_macros-field1" style="" class="datos2">', '<tr id="table_macros-field1" style="" class="datos2">',
"</tbody> "</tbody></table>
<tbody id=\"clippy_fields\"> <div id=\"clippy_fields\">
<table>
<tbody>
<tr id=\"table_macros-field1\" class=\"datos\">", <tr id=\"table_macros-field1\" class=\"datos\">",
$table_html); $table_html);
*/
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
echo $table_html; echo $table_html;

14
pandora_console/include/functions_clippy.php
View File

@ -154,6 +154,16 @@ function clippy_write_javascript_helps_steps($tours) {
$show_step_numbers = (int)$conf['show_step_numbers']; $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; $help_context = false;
?> ?>
@ -169,8 +179,8 @@ function clippy_write_javascript_helps_steps($tours) {
showStepNumbers: <?php echo $show_step_numbers; ?>, showStepNumbers: <?php echo $show_step_numbers; ?>,
nextLabel: "<?php echo __('Next &rarr;'); ?>", nextLabel: "<?php echo __('Next &rarr;'); ?>",
prevLabel: "<?php echo __('&larr; Back'); ?>", prevLabel: "<?php echo __('&larr; Back'); ?>",
skipLabel: "<?php echo __('Skip'); ?>", skipLabel: "<?php echo $skipLabel; ?>",
doneLabel: "<?php echo __('Done'); ?>", doneLabel: "<?php echo $doneLabel; ?>",
exitOnOverlayClick: false, exitOnOverlayClick: false,
exitOnEsc: true, //false, exitOnEsc: true, //false,
}) })

4
pandora_console/include/help/clippy/godmode_agentes_configurar_agente.php
View File

@ -101,7 +101,8 @@ function clippy_start_page() {
); );
$return_tours['tours']['monitoring_server_step_5']['steps'][] = array( $return_tours['tours']['monitoring_server_step_5']['steps'][] = array(
'element'=> "input[name='crtbutton']", 'element'=> "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'] = array();
$return_tours['tours']['monitoring_server_step_5']['conf']['show_bullets'] = 0; $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'] = array();
$return_tours['tours']['monitoring_server_step_6']['conf']['show_bullets'] = 0; $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']['show_step_numbers'] = 0;
$return_tours['tours']['monitoring_server_step_6']['conf']['done_label'] = __('Done');
//================================================================== //==================================================================
//================================================================== //==================================================================

12
pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php
View File

@ -48,18 +48,18 @@ function clippy_start_page() {
ui_print_help_icon ('action_threshold', true, '', 'images/help.png') ui_print_help_icon ('action_threshold', true, '', 'images/help.png')
); );
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array( $return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> '#clippy_fields', 'element'=> '#table_macros',
'position' => 'top', '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.') '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( $return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> '#clippy_fields', 'element'=> '#table_macros',
'position' => 'top', 'position' => 'bottom',
'intro' => __('In the "Subject" field you can use the macros _agent_ or _module_ for each name.') '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( $return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> '#clippy_fields', 'element'=> '#table_macros',
'position' => 'top', 'position' => 'bottom',
'intro' => __('In the text field, you can also use macros. Get more information about the macros by clicking on the help icon.') . '<br />' . 'intro' => __('In the text field, you can also use macros. Get more information about the macros by clicking on the help icon.') . '<br />' .
ui_print_help_icon ('alert_config', true, '', 'images/help.png') ui_print_help_icon ('alert_config', true, '', 'images/help.png')
); );

6
pandora_console/include/help/clippy/homepage.php
View File

@ -57,13 +57,15 @@ function clippy_start_page_homepage() {
'intro' => 'intro' =>
'<div style="text-align: left; padding-left: 20px; padding-right: 20px;">'. '<div style="text-align: left; padding-left: 20px; padding-right: 20px;">'.
__('Hi, can I help you?') . '<br/><br/>' . __('Hi, can I help you?') . '<br/><br/>' .
__('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.') .
'<br /> ' . '<br /> ' .
'<br /> ' . '<br /> ' .
'<div style="font-size: 7pt;">' .
html_print_checkbox_extended html_print_checkbox_extended
('clippy_is_annoying', 1, $clippy_is_annoying, false, ('clippy_is_annoying', 1, $clippy_is_annoying, false,
'set_clippy_annoying()', '', true) . 'set_clippy_annoying()', '', true) .
__('Close this annoying clippy right now.') . __('Close this wizard and don\'t open it again.') .
'</div>' .
'</div>' . '</div>' .
'<div style="position:relative;"> '<div style="position:relative;">
<div id="pandorin" style="' . $style . '">' . <div id="pandorin" style="' . $style . '">' .

4
pandora_console/include/help/clippy/operation_agentes_ver_agente.php
View File

@ -33,11 +33,13 @@ function clippy_start_page() {
$return_tours['tours']['email_alert_module_step_10']['steps'][] = array( $return_tours['tours']['email_alert_module_step_10']['steps'][] = array(
'element'=> '#table8', 'element'=> '#table8',
'position' => 'top', '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.') . '<br />' .
__('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'] = array();
$return_tours['tours']['email_alert_module_step_10']['conf']['show_bullets'] = 0; $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']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_10']['conf']['done_label'] = __('Done');
//================================================================== //==================================================================
return $return_tours; return $return_tours;