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-7908-error-visual-grave-menu-principal-consola' into 'develop' 

Fix issue with initial visual problems

See merge request artica/pandorafms!4363
This commit is contained in:
Daniel Rodriguez 2021-08-19 08:21:08 +00:00
parent 38c044f2ae 20c0d87165
commit ffa2aa717b
2 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/include/functions_menu.php
View File

@ -39,11 +39,14 @@ if (is_ajax() === true && empty(get_parameter('menuType')) === false) {
/** /**
* Prints a complete menu structure. * Prints a complete menu structure.
* *
* @param array Menu structure to print. * @param array $menu Menu structure to print.
*
* @return void
*/ */
function menu_print_menu(&$menu) function menu_print_menu(&$menu)
{ {
global $config; global $config;
global $menuTypeClass;
static $idcounter = 0; static $idcounter = 0;
echo '<div class="menu">'; echo '<div class="menu">';
@ -108,7 +111,7 @@ function menu_print_menu(&$menu)
$submenu = false; $submenu = false;
if ($_SESSION['menu_type'] === 'classic') { if ($menuTypeClass === 'classic') {
$classes = [ $classes = [
'menu_icon', 'menu_icon',
'no_hidden_menu', 'no_hidden_menu',
@ -120,12 +123,12 @@ function menu_print_menu(&$menu)
]; ];
} }
if (isset($main['sub'])) { if (isset($main['sub']) === true) {
$classes[] = ''; $classes[] = '';
$submenu = true; $submenu = true;
} }
if (!isset($main['refr'])) { if (isset($main['refr']) === false) {
$main['refr'] = 0; $main['refr'] = 0;
} }
@ -409,23 +412,14 @@ function menu_print_menu(&$menu)
// Print out the first level. // Print out the first level.
$output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">'; $output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
// onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
$length = strlen(__($main['text']));
$padding_top = ( $length >= 18) ? 6 : 12;
if ($_SESSION['menu_type'] === 'classic') { $output .= sprintf('<div id="title_menu" class="title_menu_%s">%s</div>', $menuTypeClass, $main['text']);
$output .= '<div id="title_menu" class="title_menu_classic">'.$main['text'].'</div>';
} else {
$output .= '<div id="title_menu" class="title_menu_collapsed">'.$main['text'].'</div>';
}
// Add the notification ball if defined // Add the notification ball if defined.
if (isset($main['notification'])) { if (isset($main['notification']) === true) {
$output .= '<div class="notification_ball">'.$main['notification'].'</div>'; $output .= '<div class="notification_ball">'.$main['notification'].'</div>';
} }
$padding_top = 0;
$length = 0;
if ($submenu_output != '') { if ($submenu_output != '') {
// WARNING: IN ORDER TO MODIFY THE VISIBILITY OF MENU'S AND SUBMENU'S (eg. with cookies) YOU HAVE TO ADD TO THIS ELSEIF. DON'T MODIFY THE CSS. // WARNING: IN ORDER TO MODIFY THE VISIBILITY OF MENU'S AND SUBMENU'S (eg. with cookies) YOU HAVE TO ADD TO THIS ELSEIF. DON'T MODIFY THE CSS.
if ($visible || in_array('selected', $classes)) { if ($visible || in_array('selected', $classes)) {
@ -436,10 +430,7 @@ function menu_print_menu(&$menu)
$visible = false; $visible = false;
} }
// $output .= '<ul id="subicon_'.$id.'" class="submenu'.($visible ? '' : ' invisible').'">'; $output .= sprintf('<ul id="subicon_%s" class="submenu">%s</ul>', $id, $submenu_output);
$output .= '<ul id="subicon_'.$id.'" class="submenu">';
$output .= $submenu_output;
$output .= '</ul>';
} }
$config['count_main_menu']++; $config['count_main_menu']++;

15
pandora_console/include/styles/menu.css
View File

@ -418,6 +418,9 @@ ul li {
.menu_full_classic .title_menu_classic { .menu_full_classic .title_menu_classic {
display: flex !important; display: flex !important;
} }
.menu_icon_collapsed {
background-position: 50% 50%;
}
.menu_full_collapsed .title_menu_collapsed { .menu_full_collapsed .title_menu_collapsed {
display: none !important; display: none !important;
@ -474,15 +477,3 @@ ul li {
.header_table_collapsed { .header_table_collapsed {
padding-left: 80px; /* 60 + 35 */ padding-left: 80px; /* 60 + 35 */
} }
.title_menu_classic {
display: flex;
}
.title_menu_collapsed {
display: none;
}
.menu_icon_collapsed {
background-position: 50% 50%;
}