Update template.php

This commit is contained in:
FusionPBX 2019-11-23 15:19:03 -07:00 committed by GitHub
parent 9c7dad151f
commit 0160ede505
1 changed files with 16 additions and 19 deletions

View File

@ -748,17 +748,18 @@ if (!$default_login) {
echo "</nav>\n"; echo "</nav>\n";
} }
//get the menu array and save it to the session
//determine menu configuration if (!isset($_SESSION['menu']['array'])) {
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
$menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; $_SESSION['menu']['array'] = $menu->menu_array();
$menu_array = $menu->menu_array(); unset($menu);
unset($menu); }
//get the menu style and position
$menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed'; $menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed';
$menu_position = ($_SESSION['theme']['menu_position']['text'] != '') ? $_SESSION['theme']['menu_position']['text'] : 'top'; $menu_position = ($_SESSION['theme']['menu_position']['text'] != '') ? $_SESSION['theme']['menu_position']['text'] : 'top';
//show the menu style
switch ($menu_style) { switch ($menu_style) {
case 'inline': case 'inline':
$logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left'; $logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left';
@ -769,14 +770,14 @@ if (!$default_login) {
echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px; ".$logo_style."'></a>"; echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px; ".$logo_style."'></a>";
} }
show_menu($menu_array, $menu_style, $menu_position); show_menu($_SESSION['menu']['array'], $menu_style, $menu_position);
break; break;
case 'static': case 'static':
echo "<div class='container-fluid' style='padding: 0;' align='center'>\n"; echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
show_menu($menu_array, $menu_style, $menu_position); show_menu($_SESSION['menu']['array'], $menu_style, $menu_position);
break; break;
case 'fixed': case 'fixed':
show_menu($menu_array, $menu_style, $menu_position); show_menu($_SESSION['menu']['array'], $menu_style, $menu_position);
echo "<div class='container-fluid' style='padding: 0;' align='center'>\n"; echo "<div class='container-fluid' style='padding: 0;' align='center'>\n";
break; break;
case 'side': case 'side':
@ -826,8 +827,8 @@ if (!$default_login) {
} }
//main menu items //main menu items
if (is_array($menu_array) && sizeof($menu_array) != 0) { if (is_array($_SESSION['menu']['array']) && sizeof($_SESSION['menu']['array']) != 0) {
foreach ($menu_array as $menu_index_main => $menu_item_main) { foreach ($_SESSION['menu']['array'] as $menu_index_main => $menu_item_main) {
echo " <a class='menu_side_item_main' ".($menu_item_main['menu_item_link'] != '' ? "href='".$menu_item_main['menu_item_link']."'" : "onclick=\"menu_side_expand(); $('#sub_".$menu_item_main['menu_item_uuid']."').slideToggle(180, function() { if (!$(this).is(':hidden')) { $('.menu_side_sub').not($(this)).slideUp(180); } });\"")." title=\"".$menu_item_main['menu_language_title']."\">"; echo " <a class='menu_side_item_main' ".($menu_item_main['menu_item_link'] != '' ? "href='".$menu_item_main['menu_item_link']."'" : "onclick=\"menu_side_expand(); $('#sub_".$menu_item_main['menu_item_uuid']."').slideToggle(180, function() { if (!$(this).is(':hidden')) { $('.menu_side_sub').not($(this)).slideUp(180); } });\"")." title=\"".$menu_item_main['menu_language_title']."\">";
if ($menu_item_main['menu_item_icon'] != '') { if ($menu_item_main['menu_item_icon'] != '') {
echo "<i class='fas ".$menu_item_main['menu_item_icon']." fa-fw' style='z-index: 99800; margin-right: 8px;'></i>"; echo "<i class='fas ".$menu_item_main['menu_item_icon']." fa-fw' style='z-index: 99800; margin-right: 8px;'></i>";
@ -884,12 +885,9 @@ if (!$default_login) {
echo "</div>\n"; echo "</div>\n";
echo "</div>\n"; //initial div from switch statement above echo "</div>\n"; //initial div from switch statement above
} }
// default login being used
else { else {
// default login being used
if ($_SESSION['theme']['logo_login']['text'] != '') { if ($_SESSION['theme']['logo_login']['text'] != '') {
$logo = $_SESSION['theme']['logo_login']['text']; $logo = $_SESSION['theme']['logo_login']['text'];
} }
@ -909,10 +907,9 @@ else {
echo "</div>\n"; echo "</div>\n";
unset($_SESSION['background_image']); unset($_SESSION['background_image']);
} }
echo "</body>\n"; echo "</body>\n";
echo "</html>\n"; echo "</html>\n";
?> ?>