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

fixed styles

This commit is contained in:
daniel 2023-03-01 13:44:01 +01:00
parent 7b1d8a535a
commit 69d1bdd908
4 changed files with 78 additions and 157 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');

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(