diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index aeb5a46400..2a041e63e8 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -1831,7 +1831,7 @@ class Diagnostics extends Wizard if ($items[$key]['status'] === 2) { $items[$key]['value'] = html_print_image( - 'images/icono-warning.png', + 'images/alert-yellow@svg.svg', true, [ 'title' => __('Warning'), @@ -1840,7 +1840,7 @@ class Diagnostics extends Wizard ); } else if ($items[$key]['status'] === 1) { $items[$key]['value'] = html_print_image( - 'images/exito.png', + 'images/validate.svg', true, [ 'title' => __('Successfully'), @@ -1849,7 +1849,7 @@ class Diagnostics extends Wizard ); } else { $items[$key]['value'] = html_print_image( - 'images/error_1.png', + 'images/fail@svg.svg', true, [ 'title' => __('Error'), diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 2708b8016e..1d567af5cc 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -842,7 +842,7 @@ if (is_ajax()) { $fragmentation_status = ''; if ($db_fragmentation->data->tablesFragmentationStatus->status === 1) { $fragmentation_status = html_print_image( - 'images/exito.png', + 'images/validate.svg', true, [ 'title' => __('Successfully'), @@ -851,7 +851,7 @@ if (is_ajax()) { ); } else { $fragmentation_status = html_print_image( - 'images/error_1.png', + 'images/fail@svg.svg', true, [ 'title' => __('Error'), diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 8df6dc2fa1..a44b604970 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -385,7 +385,12 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t $messageCreated = html_print_table($messageTable, true); $autocloseTime = ((int) $config['notification_autoclose_time'] * 1000); - $classes[] = 'info_box_container'; + if (empty($message['div_class']) === false) { + $classes[] = $message['div_class']; + } else { + $classes[] = 'info_box_container'; + } + $classes[] = (($autoclose === true) && ($autocloseTime > 0)) ? ' info_box_autoclose' : ''; // This session var is defined in index. @@ -3873,6 +3878,29 @@ function ui_print_datatable(array $parameters) }'; } + $js .= 'if ($("#'.$table_id.' tr td").length == 1) { + $("div[id^=info_box_]").show(); + $("div[id^=info_box_]").removeClass(\'invisible_important\'); + $("table#'.$table_id.'").hide(); + $("div.dataTables_paginate").hide(); + $("div.dataTables_info").hide(); + $("div.dataTables_length").hide(); + + if (dt_'.$table_id.'.page.info().pages > 1) { + $(".dataTables_paginate.paging_simple_numbers").show() + } + } else { + $("div[id^=info_box_]").hide(); + $("table#'.$table_id.'").show(); + $("div.dataTables_paginate").show(); + $("div.dataTables_info").show(); + $("div.dataTables_length").show(); + + if (dt_'.$table_id.'.page.info().pages == 1) { + $(".dataTables_paginate.paging_simple_numbers").hide() + } + }'; + if (isset($parameters['drawCallback'])) { $js .= $parameters['drawCallback']; } @@ -3996,8 +4024,13 @@ function ui_print_datatable(array $parameters) $js .= ''; // Order. + $info_msg_arr = []; + $info_msg_arr['message'] = $emptyTable; + $info_msg_arr['div_class'] = 'info_box_container invisible_important'; + + $info_msg = '
'.ui_print_info_message($info_msg_arr).'
'; $err_msg = '
'; - $output = $err_msg.$filter.$extra.$table.$js; + $output = $info_msg.$err_msg.$filter.$extra.$table.$js; if (is_ajax() === false) { ui_require_css_file('datatables.min', 'include/styles/js/'); ui_require_css_file('tables'); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 4d8f807bdb..0bb3b0e80c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -5843,6 +5843,7 @@ div.switch_radio_button label { margin-right: -1px; border: 1px solid #cbcbcb; transition: all 0.1s ease-in-out; + background: transparent; } div.switch_radio_button label:first-of-type { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 9d5185fd9f..62af20b92f 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1249,8 +1249,7 @@ a.pandora_pagination:hover { background-color: #555 !important; } .dt-button.buttons-csv.buttons-html5 { - filter: invert(100%); - background-color: transparent; + box-shadow: 0px 3px 6px #111; } .info_table.events > tbody > tr > td { @@ -1494,7 +1493,7 @@ div.white_box.white_box_opened.no_border { border-radius: 0px; } -table.filter-table-adv td > div label { +table.filter-table-adv td > div label:not(.inputFile) { color: white !important; } @@ -1507,3 +1506,12 @@ div.fixed-bottom-box > div.fixed-bottom-box-head-body { background-color: #111111 !important; } + +.filter_table, +.white_table_graph_fixed table { + background-color: transparent; +} + +span.select2 { + border-radius: 6px; +} diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 1aeaa479e7..9fdd4fa1cf 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -798,3 +798,7 @@ div[id^="auto-os-"] > img { width: 20px; height: 20px; } + +.dataTables_paginate { + margin-right: 10px; +} diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 1dc0030eeb..8c39ad8b8d 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -97,7 +97,7 @@ ui_print_message_dialog( $conn_title, $conn_text, 'connection', - '/images/error_1.png' + '/images/fail@svg.svg' ); ?> diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 6ce7a31c3a..956282b045 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -173,7 +173,7 @@ ui_print_message_dialog( $conn_title, $conn_text, 'connection', - '/images/error_1.png' + '/images/fail@svg.svg' ); $inputs = []; diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php index 1070443ed1..b301754a1e 100755 --- a/pandora_console/operation/gis_maps/public_console.php +++ b/pandora_console/operation/gis_maps/public_console.php @@ -278,7 +278,7 @@ if ($layers != false) { $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); ui_require_javascript_file('connection_check'); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); - ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); + ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); } // Resize GIS map on fullscreen diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php index 40ae10e4bc..e8edbae7db 100644 --- a/pandora_console/operation/visual_console/legacy_public_view.php +++ b/pandora_console/operation/visual_console/legacy_public_view.php @@ -56,7 +56,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); $conn_title = __('Connection with server has been lost'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); -ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); require_once 'include/functions_visual_map.php'; diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index 265b3183c6..496a34f3a6 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -37,7 +37,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); $conn_title = __('Connection with server has been lost'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); -ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); echo ''."\n"; echo ''."\n";