';
- $fields_rows[$i] .= '| '.$fdesc.' | ';
+ $fields_rows[$i] .= ''.$fdesc.' | ';
$fields_rows[$i] .= ''.$ffield.' | ';
if ($get_recovery_fields) {
$fields_rows[$i] .= ''.$rfield.' | ';
@@ -575,12 +575,19 @@ if ($update_command) {
if (defined('METACONSOLE')) {
alerts_meta_print_header();
} else {
- ui_print_page_header(
- __('Alerts').' » '.__('Alert commands'),
+ ui_print_standard_header(
+ __('Alerts'),
'images/gm_alerts.png',
false,
'',
- true
+ true,
+ [],
+ [
+ [
+ 'link' => '',
+ 'label' => __('Alert commands'),
+ ],
+ ]
);
}
@@ -811,10 +818,9 @@ foreach ($commands as $command) {
array_push($table->data, $data);
}
-ui_pagination($total_commands, $url);
if (isset($data) === true && count($table->data) > 0) {
html_print_table($table);
- ui_pagination($total_commands, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
+ $pagination = ui_pagination($total_commands, $url, 0, 0, true, 'offset', false, '');
} else {
ui_print_info_message(
[
@@ -826,12 +832,17 @@ if (isset($data) === true && count($table->data) > 0) {
// Commands can only be created by the super administrator.
if (users_is_admin() === true) {
- echo '';
echo '';
- echo '
';
}
?>
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index eb1d6d32ee..de5d93a082 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -68,12 +68,19 @@ if ($al_action !== false) {
if (defined('METACONSOLE')) {
alerts_meta_print_header();
} else {
- ui_print_page_header(
- __('Alerts').' » '.__('Configure alert action'),
+ ui_print_standard_header(
+ __('Alerts'),
'images/gm_alerts.png',
false,
- 'alert_config',
- true
+ '',
+ true,
+ [],
+ [
+ [
+ 'link' => '',
+ 'label' => __('Configure alert action'),
+ ],
+ ]
);
}
} else {
@@ -81,12 +88,19 @@ if ($al_action !== false) {
if (defined('METACONSOLE')) {
alerts_meta_print_header();
} else {
- ui_print_page_header(
- __('Alerts').' » '.__('Configure alert action'),
+ ui_print_standard_header(
+ __('Alerts'),
'images/gm_alerts.png',
false,
- 'alert_config',
- true
+ '',
+ true,
+ [],
+ [
+ [
+ 'link' => '',
+ 'label' => __('Configure alert action'),
+ ],
+ ]
);
}
@@ -290,73 +304,99 @@ $table->data[1][1] = html_print_label_input_block(
)
);
-$table->data[2][0] = html_print_label_input_block(
+$table_macros = new stdClass();
+$table_macros->id = 'table_macros';
+$table_macros->width = '100%';
+$table_macros->class = 'databox filters filter-table-adv';
+$table_macros->style = [];
+$table_macros->size = [];
+$table_macros->size[0] = '20%';
+$table_macros->size[1] = '40%';
+$table_macros->size[2] = '40%';
+$table_macros->data = [];
+
+$table_macros->data[0][0] = '';
+$table_macros->data[0][1] = html_print_label_input_block(
+ __('Triggering'),
+ ''
+);
+
+$table_macros->data[0][2] = html_print_label_input_block(
__('Recovery'),
''
);
-$table->data[2][1] = html_print_label_input_block(
- __('Recovery'),
+$table_macros->data[1][0] = html_print_label_input_block(
+ __('Command preview'),
''
);
-$table->data[5][0] = __('Command preview');
-$table->data[5][1] = html_print_textarea(
- 'command_preview',
- 5,
- 30,
+$table_macros->data[1][1] = html_print_label_input_block(
'',
- 'disabled="disabled"',
- true
+ html_print_textarea(
+ 'command_preview',
+ 5,
+ 30,
+ '',
+ 'disabled="disabled"',
+ true
+ )
);
-$table->data[5][2] = html_print_textarea(
- 'command_recovery_preview',
- 5,
- 30,
+
+$table_macros->data[1][2] = html_print_label_input_block(
'',
- 'disabled="disabled"',
- true
+ html_print_textarea(
+ 'command_recovery_preview',
+ 5,
+ 30,
+ '',
+ 'disabled="disabled"',
+ true
+ )
);
// Selector will work only with Integria activated.
$integriaIdName = 'integria_wu';
-$table->data[$integriaIdName][0] = __('Create workunit on recovery').ui_print_help_tip(
- __('If closed status is set on recovery, a workunit will be added to the ticket in Integria IMS rather that closing the ticket.'),
- true
-);
-$table->data[$integriaIdName][1] = html_print_checkbox_switch_extended(
- 'create_wu_integria',
- 1,
- $create_wu_integria,
- false,
- '',
- $disabled_attr,
- true
+$table_macros->colspan[$integriaIdName][0] = 3;
+$table_macros->data[$integriaIdName][0] = html_print_label_input_block(
+ __('Create workunit on recovery').ui_print_help_tip(
+ __('If closed status is set on recovery, a workunit will be added to the ticket in Integria IMS rather that closing the ticket.'),
+ true
+ ),
+ html_print_checkbox_switch_extended(
+ 'create_wu_integria',
+ 1,
+ $create_wu_integria,
+ false,
+ '',
+ $disabled_attr,
+ true
+ )
);
for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
- $table->data['field'.$i][0] = html_print_image(
+ $table_macros->data['field'.$i][0] = html_print_image(
'images/spinner.gif',
true
);
- $table->data['field'.$i][1] = html_print_image(
+ $table_macros->data['field'.$i][1] = html_print_image(
'images/spinner.gif',
true
);
- $table->data['field'.$i][2] = html_print_image(
+ $table_macros->data['field'.$i][2] = html_print_image(
'images/spinner.gif',
true
);
// Store the value in a hidden to keep it on first execution
- $table->data['field'.$i][1] .= html_print_input_hidden(
+ $table_macros->data['field'.$i][1] .= html_print_input_hidden(
'field'.$i.'_value',
(!empty($action['field'.$i]) || $action['field'.$i] == 0) ? $action['field'.$i] : '',
true,
'',
$disabled_attr
);
- $table->data['field'.$i][2] .= html_print_input_hidden(
+ $table_macros->data['field'.$i][2] .= html_print_input_hidden(
'field'.$i.'_recovery_value',
(!empty($action['field'.$i.'_recovery']) || $action['field'.$i] == 0) ? $action['field'.$i.'_recovery'] : '',
true,
@@ -369,10 +409,12 @@ $offset = (int) get_parameter('offset', 0);
echo '';
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index d598e294c0..95785a0edd 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -738,14 +738,7 @@ if ($tab == 'tree') {
* Group tree view.
*/
- echo html_print_image(
- 'images/spinner.gif',
- true,
- [
- 'class' => 'loading_tree',
- 'style' => 'display: none;',
- ]
- );
+ ui_print_spinner(__('Loading'));
echo "";
} else {
/*
@@ -1042,7 +1035,7 @@ $tab = 'group_edition';
if (typeof treeController.recipient != 'undefined' && treeController.recipient.length > 0)
treeController.recipient.empty();
- $(".loading_tree").show();
+ showSpinner();
var parameters = {};
parameters['page'] = "include/ajax/tree.ajax";
@@ -1066,7 +1059,7 @@ $tab = 'group_edition';
data: parameters,
success: function(data) {
if (data.success) {
- $(".loading_tree").hide();
+ hideSpinner();
treeController.init({
recipient: $("div#tree-controller-recipient"),
diff --git a/pandora_console/godmode/modules/manage_inventory_modules.php b/pandora_console/godmode/modules/manage_inventory_modules.php
index 5422ae451b..a8faa13a66 100644
--- a/pandora_console/godmode/modules/manage_inventory_modules.php
+++ b/pandora_console/godmode/modules/manage_inventory_modules.php
@@ -332,14 +332,16 @@ if ($result === false) {
if ($management_allowed === true) {
// Update module.
- $data[4] = '';
- $data[4] .= html_print_image('images/config.png', true, ['border' => '0', 'title' => __('Update'), 'class' => 'invert_filter']).'';
+ $data[4] = '';
}
array_push($table->data, $data);
@@ -349,22 +351,50 @@ if ($result === false) {
html_print_input_hidden('multiple_delete', 1);
html_print_table($table);
echo '';
- $tablePagination = ui_pagination($total_modules, 'index.php?sec='.$sec.'&sec2=godmode/modules/manage_inventory_modules', $offset, 0, true, 'offset', false);
- $actionButtons = [];
+ echo '';
?>
@@ -180,21 +274,21 @@ echo '';
var mode = ;
if (mode == 1) {
- $('#table1-6').show();
- $('#table1-7').hide();
+ $('.script_path_inventory_modules').show();
+ $('.code_inventory_modules').hide();
} else {
- $('#table1-7').show();
- $('#table1-6').hide();
+ $('.code_inventory_modules').show();
+ $('.script_path_inventory_modules').hide();
}
$('input[type=radio][name=script_mode]').change(function() {
if (this.value == 1) {
- $('#table1-6').show();
- $('#table1-7').hide();
+ $('.script_path_inventory_modules').show();
+ $('.code_inventory_modules').hide();
}
else if (this.value == 2) {
- $('#table1-7').show();
- $('#table1-6').hide();
+ $('.code_inventory_modules').show();
+ $('.script_path_inventory_modules').hide();
}
});
});
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index 44d35d3f06..7ef20ca385 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -615,18 +615,6 @@ $url = ui_get_url_refresh(
true,
false
);
-$name_url = 'index.php?sec=templates&sec2=godmode/modules/manage_network_components';
-$table = new stdClass();
-$table->width = '100%';
-$table->class = 'databox filters';
-
-$table->style = [];
-$table->style[0] = 'font-weight: bold';
-$table->style[2] = 'font-weight: bold';
-
-$table->data = [];
-
-$table->data[0][0] = __('Group');
$component_groups = network_components_get_groups();
@@ -656,54 +644,81 @@ foreach ($component_groups as $component_group_key => $component_group_val) {
}
}
-$table->data[0][1] = html_print_select(
- $component_groups,
- 'search_id_group',
- $search_id_group,
+$name_url = 'index.php?sec=templates&sec2=godmode/modules/manage_network_components';
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'filter-table-adv';
+
+$table->style = [];
+$table->style[0] = 'font-weight: bold';
+$table->style[2] = 'font-weight: bold';
+
+$table->data = [];
+
+$table->data[0][] = html_print_label_input_block(
+ __('Group'),
+ html_print_select(
+ $component_groups,
+ 'search_id_group',
+ $search_id_group,
+ '',
+ __('All'),
+ 0,
+ true,
+ false,
+ false,
+ '',
+ false,
+ 'width: 100%'
+ )
+);
+
+$table->data[0][] = html_print_label_input_block(
+ __('Free Search'),
+ html_print_input_text(
+ 'search_string',
+ $search_string,
+ '',
+ 25,
+ 255,
+ true
+ ).ui_print_input_placeholder(
+ __('Search by name, description, tcp send or tcp rcv, list matches.'),
+ true
+ )
+);
+
+$toggleFilters = '';
+
+ui_toggle(
+ $toggleFilters,
+ '',
+ 'filter_form',
'',
- __('All'),
- 0,
true,
false,
- false
-);
-$table->data[0][2] = __('Free Search').ui_print_help_tip(
- __('Search by name, description, tcp send or tcp rcv, list matches.'),
- true
-);
-$table->data[0][3] = html_print_input_text(
- 'search_string',
- $search_string,
'',
- 25,
- 255,
- true
+ 'white-box-content',
+ 'box-flat white_table_graph fixed_filter_bar'
);
-if (is_metaconsole() === true) {
- $table->data[0][4] = '';
-} else {
- $table->data[0][4] = '
';
-}
-
-$table->data[0][4] .= html_print_submit_button(
- __('Search'),
- 'search',
- false,
- 'class="sub search"',
- true
-);
-$table->data[0][4] .= '
';
-
-if (is_metaconsole() === true) {
- $filter = '
';
- ui_toggle($filter, __('Show Options'));
-} else {
- echo '
';
-}
$filter = [];
if ($search_id_group) {
@@ -721,7 +736,6 @@ $total_components = network_components_get_network_components(
);
$total_components = $total_components[0]['total'];
$offset_delete = ($offset >= ($total_components - 1)) ? ($offset - $config['block_size']) : $offset;
-ui_pagination($total_components, $name_url);
$filter['offset'] = (int) get_parameter('offset');
$filter['limit'] = (int) $config['block_size'];
$components = network_components_get_network_components(
@@ -935,30 +949,20 @@ html_print_action_buttons(
?>