diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 3ce49b646a..5651b0fb30 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -142,6 +142,8 @@ $('#button_collapse').on('click', function() {
$('div#page').toggleClass('page_classic page_collapsed');
$('#header_table').toggleClass('header_table_classic header_table_collapsed');
$('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed");
+ // Special feature for action buttons.
+ $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width() + 36)+'px;');
});
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 4299c41f09..b2b8f6e1fa 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -299,7 +299,7 @@ if (enterprise_installed() === true) {
// Parent agents.
$paramsParentAgent = [];
$paramsParentAgent['return'] = true;
- $paramsParentAgent['show_helptip'] = true;
+ $paramsParentAgent['show_helptip'] = false;
$paramsParentAgent['input_name'] = 'id_parent';
$paramsParentAgent['print_hidden_input_idagent'] = true;
$paramsParentAgent['hidden_input_idagent_name'] = 'id_agent_parent';
@@ -308,7 +308,7 @@ if (enterprise_installed() === true) {
$paramsParentAgent['selectbox_id'] = 'cascade_protection_module';
$paramsParentAgent['javascript_is_function_select'] = true;
$paramsParentAgent['cascade_protection'] = true;
- $paramsParentAgent['class'] = 'w540px';
+ $paramsParentAgent['input_style'] = 'width: 540px;';
if ($id_agente !== 0) {
// Deletes the agent's offspring.
@@ -355,6 +355,7 @@ $tableAgent->rowspan = [];
// Agent name.
if ($new_agent === false) {
$tableAgent->data['caption_name'][0] = __('Agent name');
+ $tableAgent->rowclass['name'] = 'w540px';
$tableAgent->data['name'][0] = html_print_input_text('agente', $nombre_agente, '', 76, 100, true, false, false, '', 'w540px');
$tableAgent->data['name'][0] .= html_print_div(
[
@@ -369,15 +370,17 @@ if ($new_agent === false) {
// Alias.
$tableAgent->data['caption_alias'][0] = __('Alias');
+$tableAgent->rowclass['alias'] = 'w540px';
$tableAgent->data['alias'][0] = html_print_input_text('alias', $alias, '', 50, 100, true, false, true, '', 'w540px');
if ($new_agent === true) {
$tableAgent->rowclass['additional_alias'] = 'subinput';
$tableAgent->data['additional_alias'][0] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true);
$tableAgent->data['additional_alias'][1] = __('Use alias as name');
} else {
- $tableAgent->data['alias'][1] = html_print_anchor(
+ $tableAgent->data['alias'][0] .= html_print_anchor(
[
'href' => 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$id_agente.'&disk_conf='.$agent_md5,
+ 'class' => 'mrgn_lft_5px',
'content' => html_print_image(
'images/application_edit.png',
true,
@@ -394,6 +397,7 @@ if ($new_agent === true) {
// Ip adress.
$tableAgent->data['caption_ip_address'] = __('IP Address');
+$tableAgent->rowclass['ip_address'] = 'w540px';
$tableAgent->data['ip_address'][0] = html_print_input_text('direccion', $direccion_agente, '', 16, 100, true, false, false, '', 'w540px');
$tableAgent->rowclass['additional_ip_address'] = 'subinput';
@@ -423,26 +427,37 @@ if ($new_agent === false) {
// Select primary group.
$tableAgent->data['caption_primary_group'][0] = __('Primary group');
if (isset($groups[$grupo]) === true || $new_agent === true) {
+ $tableAgent->rowclass['primary_group'] = 'w540px';
// Cannot change primary group if user have not permission for that group.
- $tableAgent->data['primary_group'][0] = html_print_input(
- [
- 'type' => 'select_groups',
- 'class' => 'w540px',
- 'returnAllGroup' => false,
- 'name' => 'grupo',
- 'selected' => $grupo,
- 'return' => true,
- 'required' => true,
- 'privilege' => 'AW',
- 'option_style' => 'width: 540px;',
- ]
+ $tableAgent->data['primary_group'][0] = html_print_select_groups(
+ false,
+ 'AW',
+ false,
+ 'grupo',
+ $grupo,
+ '',
+ '',
+ 0,
+ true,
+ false,
+ true,
+ '',
+ false,
+ '',
+ '',
+ false,
+ 'id_grupo',
+ false,
+ false,
+ false,
+ '540px',
);
} else {
- $tableAgent->data['primary_group'][1] .= groups_get_name($grupo);
- $tableAgent->data['primary_group'][1] .= html_print_input_hidden('grupo', $grupo, true);
+ $tableAgent->data['primary_group'][0] .= groups_get_name($grupo);
+ $tableAgent->data['primary_group'][0] .= html_print_input_hidden('grupo', $grupo, true);
}
-$tableAgent->data['primary_group'][1] .= html_print_div(
+$tableAgent->data['primary_group'][0] .= html_print_div(
[
'content' => ui_print_group_icon(
$grupo,
@@ -455,7 +470,8 @@ $tableAgent->data['primary_group'][1] .= html_print_div(
);
$tableAgent->data['caption_interval'][0] = __('Interval');
-$tableAgent->rowstyle['interval'] = 'width: 260px';
+// $tableAgent->rowstyle['interval'] = 'width: 260px';
+$tableAgent->rowclass['interval'] = 'w540px';
$tableAgent->data['interval'][0] = html_print_extended_select_for_time(
'intervalo',
$intervalo,
@@ -474,6 +490,7 @@ if ($intervalo < SECONDS_5MINUTES) {
}
$tableAgent->data['caption_os'][0] = __('OS');
+$tableAgent->rowclass['os'] = 'w540px';
$tableAgent->data['os'][0] = html_print_select_from_sql(
'SELECT id_os, name FROM tconfig_os',
'id_os',
@@ -501,6 +518,7 @@ $tableAgent->data['os'][0] .= html_print_div(
);
$tableAgent->data['caption_server'][0] = __('Server');
+$tableAgent->rowclass['server'] = 'w540px';
$tableAgent->data['server'][0] = html_print_select(
$servers,
'server_name',
@@ -511,11 +529,14 @@ $tableAgent->data['server'][0] = html_print_select(
true,
false,
true,
- 'w540px'
+ 'w540px',
+ false,
+ 'width: 540px;'
);
// Description.
$tableAgent->data['caption_description'][0] = __('Description');
+$tableAgent->rowclass['description'] = 'w540px';
$tableAgent->data['description'][0] = html_print_textarea(
'comentarios',
3,
@@ -586,6 +607,7 @@ $tableAdvancedAgent->data['secondary_groups'][0] = html_print_select_agent_secon
);
// Parent agent.
$tableAdvancedAgent->data['caption_parent_agent'][0] = __('Parent');
+$tableAdvancedAgent->rowclass['parent_agent'] = 'w540px';
$tableAdvancedAgent->data['parent_agent'][0] = ui_print_agent_autocomplete_input($paramsParentAgent);
if (enterprise_installed() === true) {
$tableAdvancedAgent->data['caption_cascade_protection'][0] = __('Cascade protection modules');
@@ -710,8 +732,8 @@ if (enterprise_installed() === true) {
true,
false,
false,
- 'w540px',
'',
+ 'w540px',
'',
// Autocomplete.
'new-password'
@@ -743,18 +765,23 @@ $tableAdvancedAgent->data['agent_quiet'][0] = html_print_checkbox_switch('quiet'
// Remote configuration.
if ($new_agent === false && isset($filename) === true && file_exists($filename['md5']) === true) {
$tableAdvancedAgent->data['caption_remote_configuration'][0] = __('Remote configuration');
+ $tableAdvancedAgent->rowclass['remote_configuration'] = 'w540px';
$tableAdvancedAgent->data['remote_configuration'][0] = html_print_input_text(
'remote_file_timestamp',
date('F d Y H:i:s', fileatime($filename['md5'])),
'',
- 45,
+ 68,
255,
true,
- true
+ true,
+ false,
+ '',
+ ''
);
$tableAdvancedAgent->data['remote_configuration'][0] .= html_print_anchor(
[
'href' => 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&disk_conf_delete=1&id_agente='.$id_agente,
+ 'class' => 'mrgn_lft_5px',
'content' => html_print_image(
'images/cross.png',
true,
@@ -896,34 +923,33 @@ if ($modo == 0) {
echo clippy_context_help('modules_not_learning_mode');
echo '';
-
if ($new_agent === false) {
- $submitButton = html_print_submit_button(
+ $actionButtons = html_print_submit_button(
__('Update'),
'updbutton',
false,
[ 'icon' => 'update'],
true
);
- $submitButton .= html_print_input_hidden('update_agent', 1);
- $submitButton .= html_print_input_hidden('id_agente', $id_agente);
+ $actionButtons .= html_print_input_hidden('update_agent', 1);
+ $actionButtons .= html_print_input_hidden('id_agente', $id_agente);
if (is_management_allowed() === true) {
- $submitButton .= html_print_button(
+ $actionButtons .= html_print_button(
__('Delete agent'),
'deleteAgent',
false,
'deleteAgentDialog('.$id_agente.')',
[
'icon' => 'delete',
- 'mode' => 'secondary',
+ 'mode' => 'secondary dialog_opener',
],
true
);
}
} else {
- $submitButton = html_print_input_hidden('create_agent', 1);
- $submitButton .= html_print_submit_button(
+ $actionButtons = html_print_input_hidden('create_agent', 1);
+ $actionButtons .= html_print_submit_button(
__('Create'),
'crtbutton',
false,
@@ -932,13 +958,13 @@ if ($new_agent === false) {
);
}
-$submitButton .= html_print_go_back_button(
+$actionButtons .= html_print_go_back_button(
'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente',
['button_class' => ''],
true
);
-html_print_action_buttons($submitButton);
+html_print_action_buttons($actionButtons, ['type' => 'form_action']);
echo '';
echo '';
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index bcc33bdc4c..b1aa96fd7e 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -956,6 +956,7 @@ if ($agents !== false) {
if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
// Create agent button.
echo '';
}
diff --git a/pandora_console/include/class/ExternalTools.class.php b/pandora_console/include/class/ExternalTools.class.php
index 96b3a3591c..002642c5a9 100644
--- a/pandora_console/include/class/ExternalTools.class.php
+++ b/pandora_console/include/class/ExternalTools.class.php
@@ -64,8 +64,8 @@ class ExternalTools extends HTML
}
// Capture needed parameter for agent form.
- $this->id_agente = (int) get_parameter('id_agente', 0);
- $this->operation = get_parameter('operation', 0);
+ $this->id_agente = (int) get_parameter('id_agente');
+ $this->operation = (int) get_parameter('operation');
$this->community = (string) get_parameter('community', 'public');
$this->ip = (string) get_parameter('select_ips');
$this->snmp_version = (string) get_parameter('select_version');
@@ -722,7 +722,7 @@ class ExternalTools extends HTML
$output .= sprintf('%s
', $caption);
}
- $output .= '';
+ $output .= '';
// Only perform an execution if command is passed. Avoid errors.
if (empty($command) === false) {
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 146c53b1a9..1f95da6158 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2178,7 +2178,7 @@ function html_print_extended_select_for_time(
false,
$class,
$readonly,
- 'padding: 7px 3px;height: 32px;margin-top: -2px;width: 100px;'.$select_style,
+ 'padding: 0px 5px; height: 42px; margin-top: -6px; width: 140px;'.$select_style,
false,
false,
false,
@@ -3324,20 +3324,63 @@ function html_print_input_color($name, $value, $id='', $class=false, $return=fal
/**
* Action buttons.
*
- * @param string $buttons Buttons for add.
- * @param boolean $return Return.
- * @param boolean $principal Principal Action buttons.
- * @param string $class Special classes.
+ * @param string $content HTML content. Usually must be buttons.
+ * @param array $parameters Parameters for create the action buttons.
+ * $var['type'] => Type of action-buttons:
+ * 'form_action' => Fits into form size (fixed size).
+ * 'data_table' => Fits into browser window.
+ * $var['class'] => Added class for action-buttons container.
+ * $var['id'] => Customize Id. By default `principal_action_buttons` (Handled by JS).
+ * $var['background_mask'] => Boolean. True by default. Set a background for action buttons.
+ * $var['background_mask_style'] => String. Empty by default. Set a manual style.
+ * @param boolean $return Return formed string if is true.
*
* @return mixed.
*/
-function html_print_action_buttons(string $buttons, bool $return=false, bool $principal=true, string $class='fixed_action_buttons fixed_action_buttons_size')
+function html_print_action_buttons(string $content, array $parameters=[], bool $return=false)
{
+ $typeClass = 'fixed_action_buttons ';
+ switch (($parameters['type'] ?? '')) {
+ case 'form_action':
+ case 'fixed_size':
+ $typeClass .= 'fixed_action_buttons_size';
+ break;
+
+ default:
+ case 'data_table':
+ // For fill.
+ break;
+ }
+
+ if (isset($parameters['background_mask']) === false || $parameters['background_mask'] !== false) {
+ $backgroundId = 'backgroundMaskId';
+
+ $content .= html_print_div(
+ [
+ 'id' => $backgroundId,
+ 'class' => 'action_buttons_background_mask',
+ 'content' => '',
+ 'style' => ($parameters['background_mask_style'] ?? ''),
+ ],
+ true
+ );
+ }
+
+ // Optional content.
+ $content .= html_print_div(
+ [
+ 'class' => 'action_buttons_right_content',
+ 'content' => ($parameters['right_content'] ?? ''),
+ ],
+ true
+ );
+
return html_print_div(
[
- 'id' => ($principal === true) ? 'principal_action_buttons' : 'action_buttons_'.rand(),
- 'class' => 'action-buttons '.$class,
- 'content' => $buttons,
+ 'id' => ($parameters['id'] ?? 'principal_action_buttons'),
+ 'class' => 'action-buttons '.$typeClass.' '.($parameters['class'] ?? ''),
+ 'content' => $content,
+ 'style' => 'z-index: 100',
],
$return
);
@@ -6353,6 +6396,7 @@ function html_print_go_back_button(string $url, array $options=[], bool $return=
],
true
),
+ 'style' => ($options['style'] ?? 'z-index: 100'),
],
$return
);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b425aeaa21..509dfeebdf 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3549,7 +3549,7 @@ function ui_print_datatable(array $parameters)
pageLength: '.$parameters['default_pagination'].',
searching: false,
responsive: true,
- dom: "plfrtiBp",
+ dom: "lfrtiBp",
language: {
processing:"'.$processing.'",
zeroRecords:"'.$zeroRecords.'",
@@ -3577,10 +3577,11 @@ function ui_print_datatable(array $parameters)
url: "'.ui_get_full_url('ajax.php', false, false, false).'",
type: "POST",
dataSrc: function (json) {
- if($("#'.$form_id.'_search_bt") != undefined) {
+ if($("#button-'.$form_id.'_search_bt") != undefined) {
$("#'.$form_id.'_loading").remove();
}
+ $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
if (json.error) {
console.error(json.error);
$("#error-'.$table_id.'").html(json.error);
@@ -3627,7 +3628,7 @@ function ui_print_datatable(array $parameters)
}
},
data: function (data) {
- if($("#'.$form_id.'_search_bt") != undefined) {
+ if($("#button-'.$form_id.'_search_bt") != undefined) {
var loading = \''.html_print_image(
'images/spinner.gif',
true,
@@ -3636,7 +3637,7 @@ function ui_print_datatable(array $parameters)
'class' => 'loading-search-datatables-button',
]
).'\';
- $("#'.$form_id.'_search_bt").parent().append(loading);
+ $("#button-'.$form_id.'_search_bt").parent().append(loading);
}
inputs = $("#'.$form_id.' :input");
@@ -3682,9 +3683,12 @@ function ui_print_datatable(array $parameters)
dt_'.$table_id.' = $("#'.$table_id.'").DataTable(settings_datatable);
- $("#'.$form_id.'_search_bt").click(function (){
+ $("#button-'.$form_id.'_search_bt").click(function (){
dt_'.$table_id.'.draw().page(0)
- });';
+ });
+
+ //$(".action_buttons_right_content").html($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
+ ';
if (isset($parameters['caption']) === true
&& empty($parameters['caption']) === false
@@ -4046,7 +4050,7 @@ function ui_toggle(
}
// Link to toggle.
- $output = '';
+ $output = '
';
$output .= '