diff --git a/pandora_console/include/ajax/audit_log.php b/pandora_console/include/ajax/audit_log.php index 3bf5e09d24..4d92704852 100644 --- a/pandora_console/include/ajax/audit_log.php +++ b/pandora_console/include/ajax/audit_log.php @@ -135,18 +135,15 @@ if ($load_filter_modal) { $table->width = '100%'; $table->cellspacing = 4; $table->cellpadding = 4; - $table->class = 'databox'; + $table->class = 'databox no_border'; if (is_metaconsole()) { $table->cellspacing = 0; $table->cellpadding = 0; - $table->class = 'databox filters'; + $table->class = 'databox filters no_border'; } $table->styleTable = 'font-weight: bold; color: #555; text-align:left;'; - $filter_id_width = '200px'; - if (is_metaconsole()) { - $filter_id_width = '150px'; - } + $filter_id_width = 'w100p'; $data = []; $table->rowid[3] = 'update_filter_row1'; @@ -165,11 +162,17 @@ if ($load_filter_modal) { false, 'margin-left:5px; width:'.$filter_id_width.';' ); + + $table->rowclass[] = 'display-grid'; $data[1] = html_print_submit_button( __('Load filter'), 'load_filter', false, - 'class="sub upd" onclick="load_filter_values()"', + [ + 'class' => 'mini w25p', + 'style' => 'margin-left: 73%', + 'onclick' => 'load_filter_values();', + ], true ); $data[1] .= html_print_input_hidden('load_filter', 1, true); @@ -186,7 +189,7 @@ function show_filter() { draggable: true, modal: false, closeOnEscape: true, - width: 450 + width: 500 }); } @@ -238,7 +241,7 @@ $(document).ready (function() { if ($save_filter_modal) { - echo '
'; + echo '
'; if (check_acl($config['id_user'], 0, 'EW') === 1 || check_acl($config['id_user'], 0, 'EM') === 1) { echo '
'; @@ -247,9 +250,9 @@ if ($save_filter_modal) { $table->width = '100%'; $table->cellspacing = 4; $table->cellpadding = 4; - $table->class = 'databox'; + $table->class = 'databox no_border'; if (is_metaconsole()) { - $table->class = 'databox filters'; + $table->class = 'databox filters no_border'; $table->cellspacing = 0; $table->cellpadding = 0; } @@ -289,7 +292,11 @@ if ($save_filter_modal) { __('Save filter'), 'save_filter', false, - 'class="sub wand" onclick="save_new_filter();"', + [ + 'class' => 'mini w25p', + 'style' => 'margin-left: 56%', + 'onclick' => 'save_new_filter();', + ], true ); @@ -317,11 +324,16 @@ if ($save_filter_modal) { 0, true ); + $table->rowclass[] = 'display-grid'; $data[1] = html_print_submit_button( __('Update filter'), 'update_filter', false, - 'class="sub upd" onclick="save_update_filter();"', + [ + 'class' => 'mini w25p', + 'style' => 'margin-left: 56%', + 'onclick' => 'save_update_filter();', + ], true ); @@ -359,7 +371,8 @@ function show_save_filter() { resizable: true, draggable: true, modal: false, - closeOnEscape: true + closeOnEscape: true, + width: 380 }); } diff --git a/pandora_console/include/class/AuditLog.class.php b/pandora_console/include/class/AuditLog.class.php index 31120b7014..93f391ee73 100644 --- a/pandora_console/include/class/AuditLog.class.php +++ b/pandora_console/include/class/AuditLog.class.php @@ -437,7 +437,7 @@ class AuditLog extends HTML $('#audit_logs').css('width','95% !important'); }); - $('#save-filter').click(function() { + $('#button-save-filter').click(function() { if ($('#save-filter-select').length) { $('#save-filter-select').dialog({ width: "20%", @@ -495,7 +495,7 @@ class AuditLog extends HTML }); /* Filter management */ - $('#load-filter').click(function (){ + $('#button-load-filter').click(function (){ if($('#load-filter-select').length) { $('#load-filter-select').dialog({width: "20%", maxWidth: "25%", diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index e86c728fa7..e93910ec15 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -588,7 +588,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) $hashdata = md5($hashdata); if ((bool) $grants_on_node === true && (bool) $user_access_node !== false) { - $urlAgent = 'sendHash(\''.$server_data['server_url'].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'\')'; + $urlAgent = $server_data['server_url'].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente']; } else { $urlAgent = ''; } diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 4c5811b746..dc32be4b9b 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -855,7 +855,7 @@ function flot_slicesbar_graph( $full_legend_date = false; } - if (!$date_to) { + if (!$date_to || $date_to === '1') { $date_to = get_system_time(); } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 2fe3af8f9e..8c2768f356 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -86,6 +86,43 @@ font-weight: 900; } +/* +@font-face { + font-family: "lato-italic"; + src: url("../fonts/Lato-Italic.woff") format("woff"); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: "lato"; + src: url("../fonts/Lato-LightItalic.woff") format("woff"); + font-weight: 300; + font-style: italic; +} + +@font-face { + font-family: "lato"; + src: url("../fonts/Lato-ThinItalic.woff") format("woff"); + font-weight: 100; + font-style: italic; +} + +@font-face { + font-family: "lato"; + src: url("../fonts/Lato-BoldItalic.woff") format("woff"); + font-weight: 700; + font-style: italic; +} + +@font-face { + font-family: "lato"; + src: url("../fonts/Lato-BlackItalic.woff") format("woff"); + font-weight: 900; + font-style: italic; +} +*/ + @font-face { font-family: "source-code"; src: url("../fonts/SourceCodePro.woff") format("woff"); diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index a5c1b4f056..80b5288146 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -650,10 +650,6 @@ td#save_filter_form-1-0 > b { line-height: 16px; } -tr#save_filter_row1 { - display: flex !important; -} - td#save_filter_form-0-0, td#save_filter_form-0-1, td#save_filter_form-1-0 > input#text-id_name, diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 0054361e07..25b696a69e 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -27,11 +27,7 @@ */ // Begin. -if (is_metaconsole() === true) { - ui_require_css_file('tree_meta'); -} else { - ui_require_css_file('tree'); -} +ui_require_css_file('tree'); ui_require_css_file('fixed-bottom-box'); @@ -168,10 +164,6 @@ switch ($tab) { break; } -if (is_metaconsole() === true) { - $tabs = []; -} - if (!$strict_acl) { $header_title = $header_title.' » '.$header_sub_title; } @@ -373,11 +365,7 @@ html_print_input_hidden('tag-id', $tag_id); ui_include_time_picker(); ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/'); -if (is_metaconsole() === true) { - ui_require_javascript_file('TreeControllerMeta', 'include/javascript/tree/'); -} else { - ui_require_javascript_file('TreeController', 'include/javascript/tree/'); -} +ui_require_javascript_file('TreeController', 'include/javascript/tree/'); ui_print_spinner(__('Loading')); @@ -388,10 +376,6 @@ html_print_div( ] ); -if (is_metaconsole() === true) { - echo '
'; -} - $infoHeadTitle = 'Sombra oscura'; ?> @@ -505,7 +489,7 @@ $infoHeadTitle = 'Sombra oscura'; emptyMessage: "", foundMessage: foundMessage, tree: data.tree, - baseURL: "", + baseURL: "", ajaxURL: "", filter: parameters['filter'], counterTitles: { diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 33bec21130..bfcb4d1582 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -4206,3 +4206,17 @@ CREATE TABLE `tevent_sound` ( `sound` TEXT NULL, `active` TINYINT NOT NULL DEFAULT '1', PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- --------------------------------------------------------------------- +-- Table `tsesion_filter` +-- --------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tsesion_filter` ( + `id_filter` INT NOT NULL AUTO_INCREMENT, + `id_name` TEXT NULL, + `text` TEXT NULL, + `period` TEXT NULL, + `ip` TEXT NULL, + `type` TEXT NULL, + `user` TEXT NULL, + PRIMARY KEY (`id_filter`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file