diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php index 627c81c27b..1a17f0b2c4 100644 --- a/pandora_console/godmode/events/custom_events.php +++ b/pandora_console/godmode/events/custom_events.php @@ -132,7 +132,7 @@ $table->data[1][1] = '<a href="javascript:">'.html_print_image( [ 'id' => 'right', 'title' => __('Add fields to select'), - 'style' => 'rotate: 180deg; width: 40px', + 'style' => 'rotate: 180deg;', ] ).'</a>'; $table->data[1][1] .= '<br><br><br><br><a href="javascript:">'.html_print_image( @@ -141,7 +141,7 @@ $table->data[1][1] .= '<br><br><br><br><a href="javascript:">'.html_print_image( [ 'id' => 'left', 'title' => __('Delete fields to select'), - 'style' => 'width: 40px', + 'style' => '', ] ).'</a>'; diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php index 1d2bdd48ad..9859cb8022 100644 --- a/pandora_console/godmode/netflow/nf_edit.php +++ b/pandora_console/godmode/netflow/nf_edit.php @@ -211,7 +211,6 @@ $buttons = html_print_submit_button( true ); -// hd($filters); if (empty($filters) === false) { echo '<form id="multiple_delete" method="POST" action="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&pure='.$pure.'">'; html_print_input_hidden('multiple_delete', 1); diff --git a/pandora_console/include/class/ManageNetScanScripts.class.php b/pandora_console/include/class/ManageNetScanScripts.class.php index a65f728ef1..adfedf3e26 100644 --- a/pandora_console/include/class/ManageNetScanScripts.class.php +++ b/pandora_console/include/class/ManageNetScanScripts.class.php @@ -453,7 +453,7 @@ class ManageNetScanScripts extends Wizard 'delete', 'images/delete.svg', 1, - 'width:40px;', + '', true, [ 'title' => __('Delete Script'), diff --git a/pandora_console/include/class/ModuleTemplates.class.php b/pandora_console/include/class/ModuleTemplates.class.php index 2e777bdf4c..bfb02c7ae8 100644 --- a/pandora_console/include/class/ModuleTemplates.class.php +++ b/pandora_console/include/class/ModuleTemplates.class.php @@ -868,7 +868,7 @@ class ModuleTemplates extends HTML 'delete_profile', 'images/delete.svg', $row['id_np'], - 'width:40px', + '', true, [ 'onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;', @@ -1156,7 +1156,7 @@ class ModuleTemplates extends HTML 'del_block_'.$id_group.'_', 'images/delete.svg', 1, - 'width: 40px', + '', true, [ 'title' => __('Delete this block'), @@ -1253,7 +1253,7 @@ class ModuleTemplates extends HTML 'del_module_'.$module['component_id'].'_', 'images/delete.svg', 1, - 'width:40px;', + '', true, [ 'title' => __('Delete this module'), diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 2be81a9800..40b0752d9d 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -4565,12 +4565,6 @@ function html_print_image( // Dont use safe_input here or the performance will dead. $style = ''; - if (empty($options) === false && isset($options['class']) === true) { - $options['class'] .= ' main_menu_icon'; - } else { - $options['class'] = 'main_menu_icon invert_filter'; - } - if (!empty($options)) { // Deprecated or value-less attributes. if (isset($options['align'])) { diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index 944c454747..95ffe898b0 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -352,10 +352,10 @@ function load_modal(settings) { } } else { // No onsumbit configured. Directly close. - d.dialog("close"); if (document.getElementById(settings.form) != undefined) { document.getElementById(settings.form).submit(); } + d.dialog("close"); } }; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index c9711b2240..862bc3d1ef 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -304,6 +304,8 @@ td input[type="checkbox"] { input[type="image"] { border: 0px; background-color: transparent; + height: auto; + padding: 0px; } .container-div-input-password input { @@ -11250,8 +11252,9 @@ img.main_menu_icon[src$=".svg"] { } input.main_menu_icon[src$=".svg"] { - width: 22px; - height: 22px; + width: 20px; + height: 20px; + padding: 0px; } .header_help_icon { diff --git a/pandora_console/index.php b/pandora_console/index.php index a2c9d62167..9ba2482a85 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1524,11 +1524,6 @@ require 'include/php_to_js_values.php'; $(document).ready(scrollFunction()); // When there are less than 5 rows, all rows must be white var theme = "<?php echo $config['style']; ?>"; - if (theme === 'pandora') { - if ($('table.info_table tr').length < 5) { - $('table.info_table tbody > tr').css('background-color', '#fff'); - } - } // When the user scrolls down 400px from the top of the document, show the // button.