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:
Jose Gonzalez 2023-02-28 10:39:42 +01:00
commit 825b937958
5 changed files with 45 additions and 44 deletions

View File

@ -2279,7 +2279,7 @@ if ($process_buffers === true) {
'', '',
true, true,
true, true,
'white_box white_box_opened', 'white_box white_box_opened fixed_filter_bar',
'no-border flex-row' 'no-border flex-row'
); );

View File

@ -4937,13 +4937,13 @@ function ui_print_standard_header(
true true
); );
// Create the header. // Create the header.
if (is_metaconsole() === true) { // if (is_metaconsole() === true) {
$output = ui_meta_print_header( // $output = ui_meta_print_header(
$title, // $title,
false, // false,
$options // $options
); // );
} else { // } else {
$output = ui_print_page_header( $output = ui_print_page_header(
$title, $title,
$icon, $icon,
@ -4957,8 +4957,7 @@ function ui_print_standard_header(
'', '',
$headerInformation->printHeader(true) $headerInformation->printHeader(true)
); );
} // }
if ($return !== true) { if ($return !== true) {
echo $output; echo $output;
} else { } else {

View File

@ -1806,6 +1806,7 @@ div.title_line {
#menu_tab { #menu_tab {
margin-right: 20px; margin-right: 20px;
margin-top: 50px;
} }
#menu_tab .mn, #menu_tab .mn,

View File

@ -74,7 +74,8 @@ $readonly = false;
ui_require_css_file('events'); ui_require_css_file('events');
ui_require_css_file('tables'); ui_require_css_file('tables');
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
ui_require_css_file('tables_meta', ENTERPRISE_DIR.'/include/styles/'); ui_require_css_file('meta_tables', ENTERPRISE_DIR.'/meta/styles/');
ui_require_css_file('meta_events', ENTERPRISE_DIR.'/meta/styles/');
} }
// Load extra javascript. // Load extra javascript.
@ -1418,7 +1419,7 @@ if ($pure) {
} else { } else {
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
// Load metaconsole frame. // Load metaconsole frame.
enterprise_hook('open_meta_frame'); // enterprise_hook('open_meta_frame');
} }
// Header. // Header.
@ -1567,7 +1568,12 @@ if ($pure) {
break; break;
} }
if (is_metaconsole() === false) { if (is_metaconsole() === true) {
unset($onheader['rss']);
unset($onheader['sound_event']);
unset($onheader['fullscreen']);
}
unset($onheader['history']); unset($onheader['history']);
ui_print_standard_header( ui_print_standard_header(
__('Events list'), __('Events list'),
@ -1583,12 +1589,6 @@ if ($pure) {
], ],
] ]
); );
} else {
unset($onheader['rss']);
unset($onheader['sound_event']);
unset($onheader['fullscreen']);
ui_meta_print_header(__('Events'), $section_string, $onheader);
}
} }
if (enterprise_installed() === true) { if (enterprise_installed() === true) {
@ -2578,8 +2578,7 @@ if (check_acl(
} }
// Close viewer. // Close viewer.
enterprise_hook('close_meta_frame'); // enterprise_hook('close_meta_frame');
// Datepicker requirements. // Datepicker requirements.
ui_require_css_file('datepicker'); ui_require_css_file('datepicker');
ui_include_time_picker(); ui_include_time_picker();

View File

@ -170,7 +170,10 @@ switch ($tab) {
break; break;
} }
if (is_metaconsole() === false) { if (is_metaconsole() === true) {
$tabs = [];
}
if (!$strict_acl) { if (!$strict_acl) {
$header_title = $header_title.' » '.$header_sub_title; $header_title = $header_title.' » '.$header_sub_title;
} }
@ -193,7 +196,6 @@ if (is_metaconsole() === false) {
], ],
] ]
); );
}
// ---------------------Tabs ------------------------------------------- // ---------------------Tabs -------------------------------------------
// --------------------- form filter ----------------------------------- // --------------------- form filter -----------------------------------