';
include 'general/header.php';
@@ -1524,17 +1528,6 @@ require 'include/php_to_js_values.php';
}
}
- //$('.button_collapse').on('click', menuActionButtonResizing());
-
- // Cursor change for show a spinner. Experimental.
- /*
- $('.buttonButton').not('.dialog_opener').on('click', function(){
- $('*').css('cursor', 'wait');
- });
- $('.submitButton').not('.dialog_opener').on('click', function(){
- $('*').css('cursor', 'wait');
- });
-*/
// When the user scrolls down 400px from the top of the document, show the
// button.
window.onscroll = function() {
@@ -1545,10 +1538,6 @@ require 'include/php_to_js_values.php';
scrollFunction()
};
- function menuActionButtonResizing() {
- $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width())+'px;');
- }
-
function first_time_identification() {
jQuery.post("ajax.php", {
"page": "general/register",
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 2a7bde9bb0..c3b7a890f7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
';
}
@@ -1254,12 +1254,12 @@ foreach ($agents as $agent) {
$fb64 = base64_encode(json_encode($agent_event_filter));
$data[11] = '
'.html_print_image(
- 'images/lightning.png',
+ 'images/event.svg',
true,
[
'align' => 'middle',
'title' => __('Agent events'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 6e518c17a1..8aaa7ed60a 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -401,7 +401,7 @@ $buttonsRefreshAgent = html_print_button(
__('Refresh data'),
'refresh_data',
false,
- 'window.location.assign(\'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&refr=60\')',
+ 'window.location.assign("index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&refr=60")',
[ 'mode' => 'link' ],
true
);
@@ -411,7 +411,7 @@ if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') === true) {
__('Force checks'),
'force_checks',
false,
- 'window.location.assign(\'index.php?sec=estado&sec2=operation/agentes/ver_agente&flag_agent=1&id_agente='.$id_agente.'\')',
+ 'window.location.assign("index.php?sec=estado&sec2=operation/agentes/ver_agente&flag_agent=1&id_agente='.$id_agente.'")',
[ 'mode' => 'link' ],
true
);
diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php
index 604131d888..910a46acb2 100644
--- a/pandora_console/operation/agentes/exportdata.php
+++ b/pandora_console/operation/agentes/exportdata.php
@@ -1,10 +1,10 @@
'',
+ 'label' => __('Tools'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Export data'),
+ ],
+ ]
+);
$group = get_parameter_post('group', 0);
$agentName = get_parameter_post('agent', 0);
@@ -220,48 +242,10 @@ if (!empty($export_btn) && !empty($module)) {
}
if (empty($export_btn) || $show_form) {
- echo '
';
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 3e602658df..f2ebbedbcf 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -289,12 +289,12 @@ if (empty($result_groups) === false) {
echo "
";
if (!isset($data['_is_tag_']) && check_acl($config['id_user'], $data['_id_'], 'AW')) {
echo ''.html_print_image(
- 'images/target.png',
+ 'images/change-active.svg',
true,
[
'border' => '0',
'title' => __('Force'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
}
diff --git a/pandora_console/operation/heatmap.php b/pandora_console/operation/heatmap.php
index a9ab10ed47..1f7337aa39 100644
--- a/pandora_console/operation/heatmap.php
+++ b/pandora_console/operation/heatmap.php
@@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -64,11 +64,11 @@ if ($group_sent === true) {
$is_ajax = is_ajax();
if ($is_ajax === false && $pure === false) {
$viewtab['config'] = ''.html_print_image(
- 'images/setup.png',
+ 'images/configuration@svg.svg',
true,
[
'title' => __('Config'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
@@ -81,11 +81,11 @@ if ($is_ajax === false && $pure === false) {
);
$viewtab['full_screen'] = ''.html_print_image(
- 'images/full_screen.png',
+ 'images/fullscreen@svg.svg',
true,
[
'title' => __('Full screen'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
@@ -208,11 +208,11 @@ if ($is_ajax === false && $pure === true) {
echo '';
echo html_print_image(
- 'images/normal_screen.png',
+ 'images/exit_fullscreen@svg.svg',
true,
[
'title' => __('Back to normal mode'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
);
echo '';
diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php
index 105a9560de..0e232788e7 100644
--- a/pandora_console/operation/messages/message_edit.php
+++ b/pandora_console/operation/messages/message_edit.php
@@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ $buttons['message_list'] = [
true,
[
'title' => __('Received messages'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
];
@@ -64,7 +64,7 @@ $buttons['sent_messages'] = [
true,
[
'title' => __('Sent messages'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
];
@@ -76,7 +76,7 @@ $buttons['create_message'] = [
true,
[
'title' => __('Create message'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
];
@@ -218,11 +218,8 @@ if ($read_message) {
true
);
- html_print_div(
- [
- 'class' => 'action-buttons',
- 'content' => $outputButtons,
- ],
+ html_print_action_buttons(
+ $outputButtons
);
return;
@@ -264,18 +261,6 @@ if ($send_mes === true) {
// User info.
$own_info = get_user_info($config['id_user']);
-$table = new stdClass();
-$table->width = '100%';
-$table->class = 'databox filters';
-
-$table->data = [];
-
-$table->data[0][0] = __('Sender');
-
-$table->data[0][1] = (empty($own_info['fullname']) === false) ? $own_info['fullname'] : $config['id_user'];
-
-$table->data[1][0] = __('Destination');
-
$is_admin = (bool) db_get_value(
'is_admin',
'tusuario',
@@ -305,15 +290,29 @@ foreach ($users_full as $user_id => $user_info) {
$users[$user_info['id_user']] = (empty($user_info['fullname']) === true) ? $user_info['id_user'] : $user_info['fullname'];
}
+$table = new stdClass();
+$table->id = 'send_message_table';
+$table->width = '100%';
+$table->class = 'databox max_floating_element_size filter-table-adv';
+$table->style = [];
+$table->style[0] = 'width: 30%';
+$table->style[1] = 'width: 70%';
+$table->data = [];
+
+$table->data[0][] = html_print_label_input_block(
+ __('Sender'),
+ ''.((empty($own_info['fullname']) === false) ? $own_info['fullname'] : $config['id_user']).''
+);
+
// Check if the user to reply is in the list, if not add reply user.
if ($reply === true) {
- $table->data[1][1] = (array_key_exists($dst_user, $users) === true) ? $users[$dst_user] : $dst_user;
- $table->data[1][1] .= html_print_input_hidden(
+ $destinationInputs = (array_key_exists($dst_user, $users) === true) ? $users[$dst_user] : $dst_user;
+ $destinationInputs .= html_print_input_hidden(
'dst_user',
$dst_user,
true
);
- $table->data[1][1] .= html_print_input_hidden(
+ $destinationInputs .= html_print_input_hidden(
'replied',
'1',
true
@@ -324,21 +323,27 @@ if ($reply === true) {
$groups = users_get_groups($config['id_user'], 'AR');
// Get a list of all groups.
- $table->data[1][1] = html_print_select(
- $users,
- 'dst_user',
- $dst_user,
- 'changeStatusOtherSelect(\'dst_user\', \'dst_group\')',
- __('Select user'),
- false,
- true,
- false,
- ''
- );
- $table->data[1][1] .= ' '.__('OR').' ';
- $table->data[1][1] .= html_print_div(
+ $destinationInputs = html_print_div(
[
- 'class' => 'w250px inline',
+ 'class' => 'select_users mrgn_right_5px',
+ 'content' => html_print_select(
+ $users,
+ 'dst_user',
+ $dst_user,
+ 'changeStatusOtherSelect(\'dst_user\', \'dst_group\')',
+ __('Select user'),
+ false,
+ true,
+ false,
+ ''
+ ),
+ ],
+ true
+ );
+ $destinationInputs .= __('OR');
+ $destinationInputs .= html_print_div(
+ [
+ 'class' => 'mrgn_lft_5px',
'content' => html_print_select_groups(
$config['id_user'],
'AR',
@@ -355,24 +360,41 @@ if ($reply === true) {
);
}
-$table->data[2][0] = __('Subject');
-$table->data[2][1] = html_print_input_text(
- 'subject',
- $subject,
- '',
- 50,
- 70,
- true
+$table->data[0][] = html_print_label_input_block(
+ __('Destination'),
+ html_print_div(
+ [
+ 'class' => 'flex-content-left',
+ 'content' => $destinationInputs,
+ ],
+ true
+ )
);
-$table->data[3][0] = __('Message');
-$table->data[3][1] = html_print_textarea(
- 'message',
- 15,
- 255,
- $message,
- '',
- true
+$table->colspan[1][] = 2;
+$table->data[1][] = html_print_label_input_block(
+ __('Subject'),
+ html_print_input_text(
+ 'subject',
+ $subject,
+ '',
+ 50,
+ 70,
+ true
+ )
+);
+
+$table->colspan[2][] = 2;
+$table->data[2][] = html_print_label_input_block(
+ __('Message'),
+ html_print_textarea(
+ 'message',
+ 15,
+ 50,
+ $message,
+ '',
+ true
+ )
);
$jsOutput = '';
@@ -396,17 +418,14 @@ echo '';
- html_print_div(
- [
- 'class' => 'action-buttons',
- 'content' => $outputButton,
- ]
+ html_print_action_buttons(
+ $outputButton
);
?>
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 5c3ce7a73b..26e16c7f37 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -226,77 +226,52 @@ ui_print_standard_header(
// ------------------- END HEADER ---------------------------------------
// ------------------------ INIT FORM -----------------------------------
-$table = new stdClass();
-$table->id = 'controls_table';
-$table->width = '100%';
-$table->class = 'filter-table-adv';
+$table2 = new stdClass();
+$table2->id = 'controls_table';
+$table2->size[2] = '50%';
+$table2->size[3] = '50%';
+$table2->style[0] = 'text-align:center';
+$table2->style[1] = 'text-align:center';
+$table2->styleTable = 'border:none';
+
if (defined('METACONSOLE')) {
- $table->width = '100%';
- $table->class = 'databox filters';
+ $table2->width = '100%';
+ $table2->class = 'databox filters';
- $table->head[0] = __('View Report');
- $table->head_colspan[0] = 5;
- $table->headstyle[0] = 'text-align: center';
+ $table2->head[0] = __('View Report');
+ $table2->head_colspan[0] = 5;
+ $table2->headstyle[0] = 'text-align: center';
}
-$table->style = [];
-$table->style[0] = 'vertical-align: middle';
-$table->rowspan[0][0] = 2;
-
// Set initial conditions for these controls, later will be modified by javascript
if (!$enable_init_date) {
- $table->style[1] = 'display: none';
- $table->style[2] = 'display: flex;align-items: baseline;';
$display_to = 'none';
$display_item = '';
} else {
- $table->style[1] = 'display: "block"';
- $table->style[2] = 'display: flex;align-items: baseline;';
$display_to = '';
$display_item = 'none';
}
-$table->size = [];
-$table->colspan[0][1] = 2;
-$table->data = [];
-$table->data[0][0] = html_print_image(
- 'images/reporting32.png',
- true,
- [
- 'width' => '32',
- 'height' => '32',
- ]
-);
-
-if (reporting_get_description($id_report)) {
- $table->data[0][1] = ' '.reporting_get_description($id_report).' ';
-} else {
- $table->data[0][1] = ''.reporting_get_name($id_report).' ';
-}
-
-$table->data[0][1] .= ''.__('Set initial date').html_print_checkbox('enable_init_date', 1, $enable_init_date, true).'';
-
$html_menu_export = enterprise_hook('reporting_print_button_export');
if ($html_menu_export === ENTERPRISE_NOT_HOOK) {
$html_menu_export = '';
}
-$table->data[0][1] .= ' ';
-$table->data[0][1] .= $html_menu_export;
+$table2->data[0][2] = ''.__('Set initial date').'
'.html_print_checkbox_switch('enable_init_date', 1, $enable_init_date, true).'
';
+$table2->data[0][2] .= ''.__('From').': ';
+$table2->data[0][2] .= html_print_input_text('date_init', $date_init, '', 12, 10, true).' ';
+$table2->data[0][2] .= html_print_input_text('time_init', $time_init, '', 10, 7, true).' ';
+$table2->data[0][2] .= ' '.__('Items period before').': ';
+$table2->data[0][2] .= ''.__('to').': ';
+$table2->data[0][2] .= html_print_input_text('date', $date, '', 12, 10, true).' ';
+$table2->data[0][2] .= html_print_input_text('time', $time, '', 10, 7, true).' ';
+$table2->data[0][3] = $html_menu_export;
-$table->data[1][1] = ''.__('From').': ';
-$table->data[1][1] .= html_print_input_text('date_init', $date_init, '', 12, 10, true).' ';
-$table->data[1][1] .= html_print_input_text('time_init', $time_init, '', 10, 7, true).' ';
-$table->data[1][2] = ''.__('Items period before').': ';
-$table->data[1][2] .= ''.__('to').': ';
-$table->data[1][2] .= html_print_input_text('date', $date, '', 12, 10, true).' ';
-$table->data[1][2] .= html_print_input_text('time', $time, '', 10, 7, true).' ';
-
$searchForm = ' |