tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

This commit is contained in:
Jonathan 2023-03-01 14:17:40 +01:00
parent c4096f7d25 774b32d7a0
commit cc13726718
11 changed files with 156 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -102,7 +102,6 @@ global $config;
// Login check.
check_login();
enterprise_hook('open_meta_frame');
$report_r = check_acl($config['id_user'], 0, 'RR');
$report_w = check_acl($config['id_user'], 0, 'RW');
$report_m = check_acl($config['id_user'], 0, 'RM');
@ -544,42 +543,25 @@ switch ($action) {
break;
}
// Page header for metaconsole.
if ($enterpriseEnable && defined('METACONSOLE')) {
// Bread crumbs.
ui_meta_add_breadcrumb(
// Header.
ui_print_standard_header(
__('List of reports'),
'images/op_reporting.png',
false,
'',
false,
$buttons,
[
[
'link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure,
'text' => __('Reporting'),
]
);
ui_meta_print_page_header($nav_bar);
// Print header.
ui_meta_print_header(__('Reporting'), '', $buttons);
} else {
// Header.
ui_print_standard_header(
__('List of reports'),
'images/op_reporting.png',
false,
'',
false,
$buttons,
'link' => '',
'label' => __('Reporting'),
],
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
);
}
'link' => '',
'label' => __('Custom reports'),
],
]
);
if ($action == 'delete_report') {
$delete = false;
@ -1394,8 +1376,6 @@ switch ($action) {
true
);
}
enterprise_hook('close_meta_frame');
return;
break;
@ -3648,41 +3628,25 @@ switch ($action) {
break;
}
// Page header for metaconsole.
if ($enterpriseEnable && defined('METACONSOLE')) {
// Bread crumbs.
ui_meta_add_breadcrumb(
// Header.
ui_print_standard_header(
$subsection,
'images/op_reporting.png',
false,
'',
false,
$buttons,
[
[
'link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure,
'text' => __('Reporting'),
]
);
ui_meta_print_page_header($nav_bar);
// Print header.
ui_meta_print_header(__('Reporting'), '', $buttons);
} else {
// Header.
ui_print_standard_header(
$subsection,
'images/op_reporting.png',
false,
'',
false,
$buttons,
'link' => '',
'label' => __('Reporting'),
],
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
);
}
'link' => '',
'label' => __('Custom reports'),
],
]
);
reporting_enterprise_select_main_tab($action);
}
@ -3759,44 +3723,28 @@ if ($idReport != 0) {
$textReportName = __('Create Custom Report');
}
// Page header for metaconsole.
if ($enterpriseEnable && defined('METACONSOLE')) {
// Bread crumbs.
ui_meta_add_breadcrumb(
$tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : '';
if ($action !== 'update') {
// Header.
ui_print_standard_header(
$textReportName,
'images/op_reporting.png',
false,
$tab_builder,
false,
$buttons,
[
'link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure,
'text' => __('Reporting'),
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
);
ui_meta_print_page_header($nav_bar);
// Print header.
ui_meta_print_header(__('Reporting').$textReportName, '', $buttons);
} else {
$tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : '';
if ($action !== 'update' && is_metaconsole() === false) {
// Header.
ui_print_standard_header(
$textReportName,
'images/op_reporting.png',
false,
$tab_builder,
false,
$buttons,
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
);
}
}
if ($resultOperationDB !== null) {
@ -3865,5 +3813,3 @@ switch ($activeTab) {
reporting_enterprise_select_tab($activeTab);
break;
}
enterprise_hook('close_meta_frame');

2
pandora_console/images/info@svg.svg
View File

@ -4,7 +4,7 @@
<title>Dark / 14 / info@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-14-/-info" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Icons/Elements/Help-mini" fill="#14524f">
<g id="Icons/Elements/Help-mini" fill="#1d7873">
<path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M7,6 C6.44771525,6 6,6.44771525 6,7 L6,7 L6,10 C6,10.5522847 6.44771525,11 7,11 C7.55228475,11 8,10.5522847 8,10 L8,10 L8,7 C8,6.44771525 7.55228475,6 7,6 Z M7,3 C6.44771525,3 6,3.44771525 6,4 C6,4.55228475 6.44771525,5 7,5 C7.55228475,5 8,4.55228475 8,4 C8,3.44771525 7.55228475,3 7,3 Z" id="Elements-/-Help-mini"></path>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 959 B

1
pandora_console/include/ajax/alert_list.ajax.php
View File

@ -639,6 +639,7 @@ if ($alert_validate === true) {
}
if ($get_agent_alerts_datatable === true) {
hd('holaaaaaaaaaaaaaa', true);
// Datatables offset, limit and order.
$filter_alert = get_parameter('filter', []);
unset($filter_alert[0]);

2
pandora_console/include/functions_html.php
View File

@ -2831,7 +2831,7 @@ function html_print_input_password(
}
}
return html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete);
return '<div class="relative container-div-input-password">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete).'</div>';
}

14
pandora_console/include/styles/pandora.css
View File

@ -299,6 +299,10 @@ input[type="image"] {
background-color: transparent;
}
.container-div-input-password input {
width: 100%;
}
table,
img {
border: 0px;
@ -11362,14 +11366,14 @@ form#satellite_conf_edit > fieldset.full-column {
}
.show-hide-pass {
position: relative;
right: 48px;
top: 14px;
position: absolute;
right: 12px;
top: 4px;
border: 0;
outline: none;
margin: 0;
height: 40px;
width: 40px;
height: 30px;
width: 30px;
cursor: pointer;
display: inline-block;
}

24
pandora_console/include/styles/tables.css
View File

@ -720,10 +720,6 @@ tr.datos2 > td.datos2 > div > div > label {
line-height: 16px;
}
tr.datos2 > td.datos2 > div > div {
margin-top: 10px;
}
.mgn_tp_0_imp {
margin-top: 0px !important;
}
@ -742,3 +738,23 @@ tr.datos2 > td.datos2 > div > div {
#text-vrf_name {
width: 100%;
}
table.filter-table-adv td div.inline-radio-button {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
table.filter-table-adv td div.inline-radio-button input[type="radio"] {
width: 20px;
background-color: #f6f7fb;
border: 2px solid #c0ccdc;
border-radius: 6px;
height: 20px;
font-family: "lato";
font-size: 12px;
color: #333333;
padding-left: 12px;
margin-right: 10px;
}

90
pandora_console/operation/agentes/alerts_status.php
View File

@ -222,70 +222,70 @@ if (empty($free_search) === false) {
$columns = [];
$column_names = [];
if (is_metaconsole() === false) {
if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) {
if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) {
array_unshift(
$column_names,
[
'title' => __('Standby'),
'text' => __('Standby'),
],
);
$columns = array_merge(
['standby'],
$columns
);
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
array_unshift(
$column_names,
[
'title' => __('Standby'),
'text' => __('Standby'),
],
'title' => __('Policy'),
'text' => __('Policy'),
]
);
$columns = array_merge(
['standby'],
['policy'],
$columns
);
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
array_unshift(
$column_names,
[
'title' => __('Policy'),
'text' => __('Policy'),
]
);
$columns = array_merge(
['policy'],
$columns
);
}
if ($print_agent === true) {
array_push(
$column_names,
['text' => 'Agent']
);
$columns = array_merge(
$columns,
['agent_name']
);
}
}
if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) {
if ($print_agent === true) {
array_push(
$column_names,
['text' => 'Module'],
['text' => 'Template'],
['text' => 'Operation'],
['text' => 'Last fired'],
['text' => 'Status']
['text' => 'Agent']
);
$columns = array_merge(
$columns,
['agent_module_name'],
['template_name'],
['operation'],
['last_fired'],
['status']
['agent_name']
);
}
}
if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) {
array_push(
$column_names,
['text' => 'Module'],
['text' => 'Template'],
['text' => 'Operation'],
['text' => 'Last fired'],
['text' => 'Status']
);
$columns = array_merge(
$columns,
['agent_module_name'],
['template_name'],
['operation'],
['last_fired'],
['status']
);
}
if ($print_agent === true) {
array_push(
$column_names,
@ -450,7 +450,7 @@ if ($agent_view_page === true) {
);
}
if ((is_metaconsole() === false) && ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true)) {
if (((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true)) {
if ($agent_view_page === true) {
html_print_div(
[

2
pandora_console/operation/agentes/status_monitor.php
View File

@ -1388,7 +1388,7 @@ if ($autosearch) {
}
if ($count_modules > $config['block_size']) {
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true);
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
}
// Get number of elements of the pagination.

8
pandora_console/operation/messages/message_list.php
View File

@ -68,10 +68,6 @@ $buttons['create_message'] = [
];
if (is_ajax() === false) {
if (is_metaconsole() === true) {
enterprise_hook('open_meta_frame');
}
// Header.
ui_print_standard_header(
$tabSelectedMessage,
@ -323,10 +319,6 @@ if (empty($messages) === false) {
]
);
if (is_ajax() !== true && is_metaconsole() === true) {
enterprise_hook('close_meta_frame');
}
?>
<script type="text/javascript">

50
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -16,7 +16,6 @@ global $config;
check_login();
enterprise_hook('open_meta_frame');
$id_report = (int) get_parameter('id');
if (! $id_report) {
@ -205,36 +204,25 @@ if (!defined('METACONSOLE')) {
}
}
// Page header for metaconsole
if (is_metaconsole()) {
// Bread crumbs
ui_meta_add_breadcrumb(['link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder', 'text' => __('Reporting')]);
ui_meta_print_page_header($nav_bar);
// Print header
ui_meta_print_header(__('Reporting'), '', $options);
} else {
// Header.
ui_print_standard_header(
reporting_get_name($id_report),
'images/op_reporting.png',
false,
'',
false,
$options,
// Header.
ui_print_standard_header(
reporting_get_name($id_report),
'images/op_reporting.png',
false,
'',
false,
$options,
[
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
);
}
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
);
// ------------------- END HEADER ---------------------------------------
// ------------------------ INIT FORM -----------------------------------
@ -427,5 +415,3 @@ if ($datetime === false || $datetime == -1) {
return;
}
enterprise_hook('close_meta_frame');

17
pandora_console/views/dashboard/list.php
View File

@ -36,16 +36,13 @@ if ((bool) \is_metaconsole() === true) {
\ui_require_css_file('meta_dashboards');
}
// Header.
if ((bool) is_metaconsole() === false) {
\ui_print_page_header(
__('Dashboards'),
'',
false,
'',
false
);
}
\ui_print_page_header(
__('Dashboards'),
'',
false,
'',
false
);
if (isset($resultDelete) === true) {
\ui_print_result_message(