From fd56631ae4d2d9f4ed866f6283a3c0530300b5e6 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Fri, 14 Jul 2023 13:07:04 +0200 Subject: [PATCH] #11713 Fix action button title --- .../godmode/alerts/alert_commands.php | 6 +-- .../godmode/alerts/alert_list.list.php | 20 +++++++-- pandora_console/godmode/setup/links.php | 5 ++- pandora_console/godmode/setup/os.list.php | 10 ++++- .../godmode/snmpconsole/snmp_alert.php | 43 ++++++++++--------- .../include/functions_filemanager.php | 13 +++++- pandora_console/include/functions_html.php | 12 ++++++ 7 files changed, 78 insertions(+), 31 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 771a842cc3..5efd9f0e6a 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -807,12 +807,12 @@ foreach ($commands as $command) { // (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group. if ($is_management_allowed === true && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) { if (is_user_admin($config['id_user']) === true) { - $data['action'] = ''; + $data['action'] = ''; $data['action'] .= ''.html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter']).''; + onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter ', 'title' => 'Duplicate']).''; $data['action'] .= ''.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).''; + onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter', 'title' => 'Delete']).''; $data['action'] .= ''; } } diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 3dd8a831f9..e20d784fcc 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -912,7 +912,10 @@ foreach ($simple_alerts as $alert) { 1, 'padding:0px; width: 22px; height: 22px;', true, - ['class' => 'invert_filter main_menu_icon'] + [ + 'class' => 'invert_filter main_menu_icon', + 'title' => __('Enable'), + ] ); $data[4] .= html_print_input_hidden('enable_alert', 1, true); } else { @@ -922,7 +925,10 @@ foreach ($simple_alerts as $alert) { 1, 'padding:0px; width: 22px; height: 22px;', true, - ['class' => 'main_menu_icon'] + [ + 'class' => 'main_menu_icon', + 'title' => __('Disable'), + ] ); $data[4] .= html_print_input_hidden('disable_alert', 1, true); } @@ -940,7 +946,10 @@ foreach ($simple_alerts as $alert) { 1, 'padding:0px; width: 22px; height: 22px;', true, - ['class' => 'invert_filter main_menu_icon'] + [ + 'class' => 'invert_filter main_menu_icon', + 'title' => __('Standby off'), + ] ); $data[4] .= html_print_input_hidden('standbyon_alert', 1, true); } else { @@ -950,7 +959,10 @@ foreach ($simple_alerts as $alert) { 1, 'padding:0px; width: 22px; height: 22px;', true, - ['class' => 'invert_filter main_menu_icon'] + [ + 'class' => 'invert_filter main_menu_icon', + 'title' => __('Standby on'), + ] ); $data[4] .= html_print_input_hidden('standbyoff_alert', 1, true); } diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index b830ede88a..fc27454b48 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -210,7 +210,10 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) { echo ''.html_print_image( 'images/delete.svg', true, - ['class' => 'invert_filter'] + [ + 'class' => 'invert_filter main_menu_icon', + 'title' => __('Delete'), + ] ).''; } diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php index ddf2145212..330071353f 100644 --- a/pandora_console/godmode/setup/os.list.php +++ b/pandora_console/godmode/setup/os.list.php @@ -132,7 +132,15 @@ foreach ($osList as $os) { $data[] = html_print_anchor( [ 'href' => $hrefDelete, - 'content' => html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']), + 'content' => html_print_image( + 'images/delete.svg', + true, + [ + 'alt' => __('Delete'), + 'title' => __('Delete'), + 'class' => 'main_menu_icon invert_filter', + ] + ), ], true ); diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index dd0190f1ae..f969cc3618 100755 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -2002,6 +2002,7 @@ if ($create_alert || $update_alert) { 'alt' => __('Update'), 'border' => 0, 'class' => 'main_menu_icon', + 'title' => __('Edit'), ] ), ], @@ -2170,24 +2171,11 @@ if ($create_alert || $update_alert) { echo ''; } - echo '
'; - echo '
'; - html_print_input_hidden('create_alert', 1); - $submitButton = html_print_submit_button( - __('Create'), - 'alert', - false, - ['icon' => 'wand'], - true - ); - html_print_action_buttons($submitButton.$deleteButton, ['right_content' => $pagination]); - echo '
'; - - $legend = '
'; - $legend .= '
'; - $priorities = get_priorities(); - $half = (count($priorities) / 2); - $count = 0; + $legend = ''; + $legend .= '
'; + $legend .= '
'; + $priorities = get_priorities(); + $half = (count($priorities) / 2); + $count = 0; foreach ($priorities as $num => $name) { if ($count == $half) { $legend .= '
'; @@ -2198,11 +2186,24 @@ if ($create_alert || $update_alert) { $count++; } - $legend .= '
'; - ui_toggle($legend, __('Legend')); + ui_toggle($legend, __('Legend')); - unset($table); + unset($table); + + echo '
'; + echo '
'; + html_print_input_hidden('create_alert', 1); + $submitButton = html_print_submit_button( + __('Create'), + 'alert', + false, + ['icon' => 'wand'], + true + ); + html_print_action_buttons($submitButton.$deleteButton, ['right_content' => $pagination]); + echo '
'; } ui_require_javascript_file('pandora', 'include/javascript/', true); diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php index 1611cd705a..50ca449123 100644 --- a/pandora_console/include/functions_filemanager.php +++ b/pandora_console/include/functions_filemanager.php @@ -766,7 +766,18 @@ function filemanager_file_explorer( && ($readOnly === false) ) { $data[4] .= '
'; - $data[4] .= ''; + $data[4] .= html_print_input_image( + 'delete', + 'images/delete.svg', + 1, + 'margin-top: 2px;height:21px', + true, + [ + 'title' => __('Delete'), + 'class' => 'invert_filter main_menu_icon', + 'onclick' => 'if (!confirm(\' '.__('Are you sure?').'\')) return false;', + ] + ); $data[4] .= html_print_input_hidden('filename', $fileinfo['realpath'], true); $data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'].$config['server_unique_identifier']), true); $data[4] .= html_print_input_hidden('delete_file', 1, true); diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index be33311352..68892247d9 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -3329,6 +3329,18 @@ function html_print_input_image($name, $src, $value, $style='', $return=false, $ 'disabled', ]; + if (isset($options['title']) && $options['title'] != '') { + if (isset($options['class'])) { + $options['class'] .= ' forced_title'; + } else { + $options['class'] = 'forced_title'; + } + + // New way to show the force_title (cleaner and better performance). + $output .= 'data-title="'.io_safe_input_html($options['title']).'" '; + $output .= 'data-use_title_for_force_title="1" '; + } + foreach ($attrs as $attribute) { if (isset($options[$attribute])) { $output .= ' '.$attribute.'="'.io_safe_input_html($options[$attribute]).'"';