';
-} else {
- echo '
';
echo '';
enterprise_hook('close_meta_frame');
diff --git a/pandora_console/godmode/groups/configure_modu_group.php b/pandora_console/godmode/groups/configure_modu_group.php
index 548f711f6f..ef93882d14 100644
--- a/pandora_console/godmode/groups/configure_modu_group.php
+++ b/pandora_console/godmode/groups/configure_modu_group.php
@@ -26,9 +26,26 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
return;
}
-if (!is_metaconsole()) {
+if (is_metaconsole() === false) {
// Header
- ui_print_page_header(__('Module group management'), 'images/module_group.png', false, '', true, '');
+ ui_print_standard_header(
+ __('Module group management'),
+ 'images/module_group.png',
+ false,
+ '',
+ true,
+ [],
+ [
+ [
+ 'link' => '',
+ 'label' => __('Resources'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Module groups'),
+ ],
+ ]
+ );
}
// Init vars
@@ -60,33 +77,54 @@ if ($id_group) {
}
$table = new stdClass();
-$table->width = '100%';
-$table->class = 'databox filters';
+$table->class = 'databox m2020';
$table->style[0] = 'font-weight: bold';
$table->data = [];
$table->data[0][0] = __('Name');
-$table->data[0][1] = html_print_input_text('name', $name, '', 35, 100, true);
+$table->data[1][0] = html_print_input_text('name', $name, '', 35, 100, true);
echo '';
-if (is_metaconsole()) {
- echo '
';
enterprise_hook('close_meta_frame');
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index cbd9a4c0d5..876dedad72 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.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
@@ -66,13 +66,23 @@ if (is_ajax() === true) {
if (is_metaconsole() === false) {
// Header.
- ui_print_page_header(
- __('Module groups defined in %s', get_product_name()),
+ ui_print_standard_header(
+ __('Module groups list'),
'images/module_group.png',
false,
'',
true,
- ''
+ [],
+ [
+ [
+ 'link' => '',
+ 'label' => __('Resources'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Module groups'),
+ ],
+ ]
);
}
@@ -243,8 +253,7 @@ $sql = 'SELECT *
$groups = db_get_all_rows_sql($sql);
$table = new stdClass();
-$table->width = '100%';
-$table->class = 'info_table';
+$table->class = 'info_table m2020';
if (empty($groups) === false) {
$table->head = [];
@@ -254,6 +263,8 @@ if (empty($groups) === false) {
$table->head[2] = __('Delete');
}
+ $table->size[0] = '5%';
+
$table->align = [];
$table->align[1] = 'left';
if ($is_management_allowed === true) {
@@ -270,10 +281,10 @@ if (empty($groups) === false) {
if ($is_management_allowed === true) {
$data[1] = '
'.ui_print_truncate_text($id_group['name'], GENERIC_SIZE_TEXT).'';
if (is_metaconsole() === true) {
- $data[2] = '
'.html_print_image('images/cross.png', true, ['border' => '0']).'';
+ $data[2] = '
'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).'';
} else {
$table->cellclass[][2] = 'table_action_buttons';
- $data[2] = '
'.html_print_image('images/cross.png', true, ['border' => '0']).'';
+ $data[2] = '
'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).'';
}
} else {
$data[1] = '
';
@@ -284,9 +295,8 @@ if (empty($groups) === false) {
array_push($table->data, $data);
}
- ui_pagination($total_groups, $url, $offset);
html_print_table($table);
- ui_pagination($total_groups, $url, $offset, 0, false, 'offset', true, 'pagination-bottom');
+ $tablePagination = ui_pagination($total_groups, $url, $offset, 0, true, 'offset', false);
} else {
ui_print_info_message(
[
@@ -298,16 +308,17 @@ if (empty($groups) === false) {
if ($is_management_allowed === true) {
echo '';
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 60d72aea79..fc25be5cd1 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -1,17 +1,32 @@
'',
+ 'label' => __('Resources'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Component groups'),
+ ],
+ ]
);
$sec = 'gmodules';
}
@@ -234,12 +260,11 @@ foreach ($groups as $group_key => $group_val) {
$groups = component_groups_get_groups_tree_recursive($groups_clean, 0, 0);
$table = new stdClass();
-$table->width = '100%';
-$table->class = 'info_table';
+$table->class = 'info_table m2020';
$table->head = [];
$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
$table->head[0] = __('Name');
-if (is_management_allowed() === true || is_metaconsole()) {
+if (is_management_allowed() === true || is_metaconsole() === true) {
$table->head[1] = __('Action');
}
@@ -272,8 +297,14 @@ foreach ($groups as $group) {
$table->cellclass[][1] = 'table_action_buttons';
if (is_management_allowed() === true || is_metaconsole()) {
- $data[1] = "".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'';
+ $data[1] = html_print_anchor(
+ [
+ 'onClick' => 'if(confirm(\"'.__('Are you sure?').'\")) return true; else return false;',
+ 'href' => 'index.php?sec='.$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg'].'&offset=0',
+ 'content' => html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon']),
+ ],
+ true
+ );
}
array_push($table->data, $data);
@@ -296,35 +327,63 @@ if (is_management_allowed() === false && is_metaconsole() === false) {
);
}
-if (isset($data)) {
- echo "';
} else {
ui_print_info_message(['no_close' => true, 'message' => __('There are no defined component groups') ]);
}
if (is_management_allowed() === true || is_metaconsole()) {
- echo '';
+ // Create action button.
+ $actionButtons[] = html_print_submit_button(
+ __('Create'),
+ 'crt',
+ false,
+ [
+ 'icon' => 'wand',
+ 'form' => 'create_form',
+ ],
+ true
+ );
+ // Delete action button.
+ if (isset($data) === true) {
+ $actionButtons[] = html_print_input_hidden(
+ 'multiple_delete',
+ 1,
+ false,
+ false,
+ 'form="multiple_delete_form"'
+ );
+ $actionButtons[] = html_print_submit_button(
+ __('Delete'),
+ 'delete_btn',
+ false,
+ [
+ 'icon' => 'delete',
+ 'mode' => 'secondary',
+ 'form' => 'multiple_delete_form',
+ ],
+ true
+ );
+ }
}
+html_print_action_buttons(
+ implode('', $actionButtons),
+ ['type' => 'form_action']
+);
+
enterprise_hook('close_meta_frame');
?>
diff --git a/pandora_console/godmode/modules/manage_nc_groups_form.php b/pandora_console/godmode/modules/manage_nc_groups_form.php
index 01beca52ed..3342c06e03 100644
--- a/pandora_console/godmode/modules/manage_nc_groups_form.php
+++ b/pandora_console/godmode/modules/manage_nc_groups_form.php
@@ -1,17 +1,32 @@
width = '100%';
-$table->class = 'databox filters';
+$table->class = 'databox m2020';
-if (defined('METACONSOLE')) {
+if (is_metaconsole() === true) {
$table->class = 'databox data';
- if ($id) {
- $table->head[0] = __('Update Group Component');
- } else {
- $table->head[0] = __('Create Group Component');
- }
-
+ $table->head[0] = ($id) ? __('Update Group Component') : __('Create Group Component');
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
}
$table->style = [];
-$table->style[0] = 'font-weight: bold';
-$table->style[2] = 'font-weight: bold';
+$table->style[0] = 'width: 0';
+$table->style[1] = 'width: 0';
+
$table->data = [];
-
$table->data[0][0] = __('Name');
-$table->data[0][1] = html_print_input_text('name', $name, '', 15, 255, true);
-
-$table->data[0][2] = __('Parent');
-$table->data[0][3] = html_print_select(
+$table->data[0][1] = __('Parent');
+$table->data[1][0] = html_print_input_text('name', $name, '', 0, 255, true, false, false, '', 'w100p');
+$table->data[1][1] = html_print_select(
network_components_get_groups(),
'parent',
$parent,
@@ -81,17 +84,39 @@ $table->data[0][3] = html_print_select(
false
);
-echo '';
diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php
index f8c07d7848..9372d3c8c7 100644
--- a/pandora_console/godmode/modules/module_list.php
+++ b/pandora_console/godmode/modules/module_list.php
@@ -1,17 +1,32 @@
'',
+ 'label' => __('Resources'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Module types'),
+ ],
+ ]
+);
+
$update_module = (bool) get_parameter_post('update_module');
// Update
-if ($update_module) {
+if ($update_module === true) {
$name = get_parameter_post('name');
$id_type = get_parameter_post('id_type');
$description = get_parameter_post('description');
@@ -54,43 +87,33 @@ if ($update_module) {
}
}
+$table = new stdClass();
+$table->id = 'module_type_list';
+$table->class = 'info_table m2020';
+$table->size = [];
+$table->size[0] = '5%';
+$table->size[1] = '5%';
+$table->head = [];
+$table->head[0] = __('ID');
+$table->head[1] = __('Icon');
+$table->head[2] = __('Name');
+$table->head[3] = __('Description');
-echo "";
-echo '';
-echo '| '.__('Icon').' | ';
-echo ''.__('ID').' | ';
-echo ''.__('Name').' | ';
-echo ''.__('Description').' | ';
-echo 'data = [];
-$rows = db_get_all_rows_sql('SELECT * FROM ttipo_modulo ORDER BY nombre');
+$rows = db_get_all_rows_sql('SELECT * FROM ttipo_modulo ORDER BY id_tipo');
if ($rows === false) {
$rows = [];
}
-$color = 0;
foreach ($rows as $row) {
- if ($color == 1) {
- $tdcolor = 'datos';
- $color = 0;
- } else {
- $tdcolor = 'datos2';
- $color = 1;
- }
+ $data[0] = $row['id_tipo'];
+ $data[1] = html_print_image('images/'.$row['icon'], true, ['class' => 'main_menu_icon invert_filter']);
+ $data[2] = $row['nombre'];
+ $data[3] = $row['descripcion'];
- echo "
-
- | ".html_print_image('images/'.$row['icon'], true, ['border' => '0', 'class' => 'invert_filter'])." |
-
- ".$row['id_tipo']."
- |
-
- ".$row['nombre']."
- |
-
- ".$row['descripcion'].'
- |
-
';
+ array_push($table->data, $data);
}
-echo '
';
+html_print_table($table);
+// $tablePagination = ui_pagination($total_groups, $url, $offset, 0, true, 'offset', false);
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index f8ba6a865a..1fd8b57348 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -62,23 +62,23 @@ if (is_management_allowed() === false) {
$table = new stdClass();
// $table->width = '100%';
-$table->styleTable = 'margin: 10px 10px 0';
-$table->class = 'info_table';
+// $table->styleTable = 'margin: 10px 10px 0';
+$table->class = 'info_table m2020';
-$table->head[0] = '';
-$table->head[1] = __('ID');
+$table->head[0] = __('ID');
+$table->head[1] = __('Icon');
$table->head[2] = __('Name');
$table->head[3] = __('Description');
if ($is_management_allowed === true) {
$table->head[4] = '';
}
-$table->align[0] = 'center';
+$table->align[1] = 'center';
if ($is_management_allowed === true) {
$table->align[4] = 'center';
}
-$table->size[0] = '20px';
+$table->size[0] = '5%';
if ($is_management_allowed === true) {
$table->size[4] = '20px';
}
@@ -103,14 +103,22 @@ if ($osList === false) {
$table->data = [];
foreach ($osList as $os) {
$data = [];
- $data[] = html_print_div(['class' => 'main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true);
$data[] = $os['id_os'];
+ $data[] = html_print_div(['class' => 'main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true);
if ($is_management_allowed === true) {
if (is_metaconsole() === true) {
- $data[] = ''.io_safe_output($os['name']).'';
+ $osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os='.$os['id_os'];
} else {
- $data[] = ''.io_safe_output($os['name']).'';
+ $osNameUrl = 'index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=builder&id_os='.$os['id_os'];
}
+
+ $data[] = html_print_anchor(
+ [
+ 'href' => $osNameUrl,
+ 'content' => io_safe_output($os['name']),
+ ],
+ true
+ );
} else {
$data[] = io_safe_output($os['name']);
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 88eb27d931..54d271ff5a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1982,15 +1982,17 @@ div#agent_wizard_subtabs {
}
table.databox {
- background-color: #f9faf9;
+ background-color: #fff;
border-spacing: 0px;
- -moz-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%);
- -webkit-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%);
- box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%);
- border-radius: 4px;
- border: 1px solid #e2e2e2;
+ border-radius: 6px;
+ /*-moz-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%);*/
+ /* -webkit-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%); */
+ /* box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%); */
+ border: 2px solid #c0ccdc;
padding: 20px;
margin-bottom: 20px;
+ width: -webkit-fill-available;
+ width: -moz-available;
}
.databox > tbody > tr > td {
@@ -3717,7 +3719,7 @@ table#policy_modules td * {
}
.tactical_table > thead > tr span {
- line-height: 26px;
+ /*line-height: 26px;*/
}
.info_table thead th .sort_arrow,
@@ -6746,10 +6748,6 @@ div.graph div.legend table {
margin: 0px;
}
-.mrgn_5px_a0 {
- margin: 5px auto 0;
-}
-
.mrgn_10px {
margin: 10px;
}
@@ -7022,6 +7020,17 @@ div.graph div.legend table {
margin-bottom: 80px;
}
+.m1010 {
+ margin: 10px;
+}
+
+.m1020 {
+ margin: 10px 20px;
+}
+
+.m2020 {
+ margin: 20px;
+}
.snmp_view_div {
float: left;
padding-left: 30px;
@@ -9887,7 +9896,8 @@ div#err_msg_centralised {
.inputFile {
background-color: #f6f7fb;
height: 16px;
- font: normal normal normal 13px Pandora-Light;
+ font-family: "Pandora-Regular";
+ font-size: 12px;
padding: 5.5pt 20pt;
cursor: pointer;
color: #14524f;
@@ -9908,12 +9918,13 @@ input,
textarea,
select {
background-color: #f6f7fb;
- height: 38px;
border: 2px solid #c0ccdc;
border-radius: 6px;
+ height: 38px;
+ font-family: "Pandora-Regular";
+ font-size: 12px;
+ color: #333333;
padding-left: 12px;
- font: normal normal normal 14px Pandora-Light;
- color: #2b3332;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@@ -10593,7 +10604,8 @@ tr.bring_next_field {
-moz-box-sizing: border-box !important;
box-sizing: border-box !important;
cursor: pointer;
- font: normal normal normal 12px Pandora-Light !important;
+ font-family: "Pandora-Regular" !important;
+ font-size: 12px !important;
}
.select2-container .select2-selection--single {
@@ -10891,7 +10903,7 @@ pre.external_tools_output {
.fixed_filter_bar {
position: sticky;
top: 114px;
- margin-bottom: 10px;
+ /*margin-bottom: 10px;*/
border: 1px solid #e5e9ed;
background-color: #fff;
z-index: 1;
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index a726e6ecb9..ed0d219d12 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -91,11 +91,13 @@
.info_table,
.filter_table {
background-color: #fff;
- /* margin-bottom: 10px; */
border-spacing: 0;
- border-collapse: collapse;
overflow: hidden;
- border-radius: 5px;
+ border-radius: 6px;
+ border: 2px solid #c0ccdc;
+ width: -webkit-fill-available;
+ width: -moz-available;
+ margin-bottom: 50px !important;
}
.info_table > tbody > tr:nth-child(even) {
@@ -111,20 +113,20 @@
}*/
.info_table > tbody > tr > th,
.info_table > thead > tr > th {
- border-top: 1px solid #c0ccdc;
+ /*border-top: 1px solid #c0ccdc;*/
}
.info_table tr > td:first-child,
.info_table tr > th:first-child {
/*padding-left: 5px;*/
padding-left: 10px;
- border-left: 1px solid #c0ccdc;
+ /*border-left: 1px solid #c0ccdc;*/
}
.info_table tr > td:last-child,
.info_table tr > th:last-child {
/*padding-right: 5px;*/
padding-right: 10px;
- border-right: 1px solid #c0ccdc;
+ /*border-right: 1px solid #c0ccdc;*/
}
.info_table tr:first-child > th {
@@ -155,8 +157,9 @@
}
.info_table > thead > tr * {
- font-size: 10pt;
- font-family: "Pandora-Regular";
+ font-size: 12px;
+ font-family: "Pandora-Bold";
+ line-height: 23px;
}
/* Radius top */
@@ -186,12 +189,14 @@
/*margin-left: 0.5em;*/
}
-.info_table > tbody > tr {
+.info_table > tbody > tr:last-child {
/*border-bottom: 1px solid #e2e2e2;*/
border-top: 0;
- border-bottom: 1px solid #c0ccdc;
+ /*border-bottom: 1px solid #c0ccdc;*/
+ /*
border-left: 1px solid #c0ccdc;
border-right: 1px solid #c0ccdc;
+ */
}
.info_table > tbody > tr > th,
.info_table > thead > tr > th,