tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Jose Gonzalez 2023-03-13 13:26:03 +01:00
parent 5466cb5995 0643b4e0ba
commit 7bedd86e25
11 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/class/Diagnostics.class.php
View File

@ -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'),

4
pandora_console/include/functions_menu.php
View File

@ -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'),

37
pandora_console/include/functions_ui.php
View File

@ -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 .= '</script>';
// Order.
$info_msg_arr = [];
$info_msg_arr['message'] = $emptyTable;
$info_msg_arr['div_class'] = 'info_box_container invisible_important';
$info_msg = '<div>'.ui_print_info_message($info_msg_arr).'</div>';
$err_msg = '<div id="error-'.$table_id.'"></div>';
$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');

1
pandora_console/include/styles/pandora.css
View File

@ -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 {

14
pandora_console/include/styles/pandora_black.css
View File

@ -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;
}

4
pandora_console/include/styles/tables.css
View File

@ -798,3 +798,7 @@ div[id^="auto-os-"] > img {
width: 20px;
height: 20px;
}
.dataTables_paginate {
margin-right: 10px;
}

2
pandora_console/operation/agentes/stat_win.php
View File

@ -97,7 +97,7 @@ ui_print_message_dialog(
$conn_title,
$conn_text,
'connection',
'/images/error_1.png'
'/images/fail@svg.svg'
);
?>

2
pandora_console/operation/events/sound_events.php
View File

@ -173,7 +173,7 @@ ui_print_message_dialog(
$conn_title,
$conn_text,
'connection',
'/images/error_1.png'
'/images/fail@svg.svg'
);
$inputs = [];

2
pandora_console/operation/gis_maps/public_console.php
View File

@ -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

2
pandora_console/operation/visual_console/legacy_public_view.php
View File

@ -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';

2
pandora_console/operation/visual_console/public_view.php
View File

@ -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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";