mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

#5473 Refined active page against sub-link.

Browse Source
This commit is contained in:
camer0n
2025-04-19 09:01:14 -07:00
parent 29963c248d
commit e1e471ab73
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
e107_handlers/admin_ui.php
View File

@@ -1579,6 +1579,7 @@ class e_admin_dispatcher
$var = array(); $var = array();
$selected = false; $selected = false;
foreach($this->adminMenu as $key => $val) foreach($this->adminMenu as $key => $val)
{ {
if(isset($val['perm']) && $val['perm'] !== '' && !getperms($val['perm'])) if(isset($val['perm']) && $val['perm'] !== '' && !getperms($val['perm']))
@@ -1632,6 +1633,12 @@ class e_admin_dispatcher
} }
} }
if(!$selected)
{
$request = $this->getRequest();
$selected = $request->getMode() . '/' . $request->getAction();
}
// Handle links and collapse attributes // Handle links and collapse attributes
foreach($var as $key => &$item) foreach($var as $key => &$item)
{ {
@@ -1647,22 +1654,16 @@ class e_admin_dispatcher
$item['caret'] = true; // Indicate caret for sub-menu parents $item['caret'] = true; // Indicate caret for sub-menu parents
// Check if any sub-item is active to expand the parent // Check if any sub-item is active to expand the parent
$isSubItemActive = false;
foreach($item['sub'] as $subKey => &$subItem) foreach($item['sub'] as $subKey => &$subItem)
{ {
$fullSubPath = $key; if($selected === $subKey && !empty($subItem['group']))
if($selected === $key)
{ {
$subItem['selected'] = $subKey; // Mark sub-item as active $parent = $subItem['group'];
$isSubItemActive = true; $var[$parent]['link_data']['aria-expanded'] = 'true';
} }
} }
// Expand the parent if a sub-item is active or if the parent itself is selected
if($selected === $key || $isSubItemActive || strpos($selected, $key . '/') === 0)
{
$item['link_data']['aria-expanded'] = 'true';
}
} }
elseif(!isset($item['link'])) elseif(!isset($item['link']))
{ {
@@ -1676,11 +1677,6 @@ class e_admin_dispatcher
return ''; return '';
} }
$request = $this->getRequest();
if(!$selected)
{
$selected = $request->getMode() . '/' . $request->getAction();
}
$selected = vartrue($this->adminMenuAliases[$selected], $selected); $selected = vartrue($this->adminMenuAliases[$selected], $selected);
@@ -1699,8 +1695,9 @@ class e_admin_dispatcher
$var['_extras_'] = array('icon' => $icon, 'return' => true); $var['_extras_'] = array('icon' => $icon, 'return' => true);
//e107::getMessage()->addInfo(print_a($var, true)); // e107::getMessage()->addDebug(print_a($var, true));
return $toggle . e107::getNav()->admin($this->menuTitle, $selected, $var); return $toggle . e107::getNav()->admin($this->menuTitle, $selected, $var);
} }
/** /**