1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

Admin-ui: Improved adminMenu highlighting when custom uri in use.

Plugin Builder: added menu divider example.
This commit is contained in:
Cameron 2018-05-23 16:29:37 -07:00
parent d512035eb6
commit d7e3caae83
2 changed files with 24 additions and 3 deletions

View File

@ -5122,7 +5122,9 @@ $text .= "
"; ";
} }
$text .= " $text .= "
// 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P') // 'main/div0' => array('divider'=> true),
// 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P'),
); );
protected \$adminMenuAliases = array( protected \$adminMenuAliases = array(

View File

@ -1479,6 +1479,7 @@ class e_admin_dispatcher
$tp = e107::getParser(); $tp = e107::getParser();
$var = array(); $var = array();
$selected = false; $selected = false;
foreach($this->adminMenu as $key => $val) foreach($this->adminMenu as $key => $val)
{ {
@ -1516,6 +1517,12 @@ class e_admin_dispatcher
case 'uri': case 'uri':
$k2 = 'link'; $k2 = 'link';
$v = $tp->replaceConstants($v, 'abs'); $v = $tp->replaceConstants($v, 'abs');
if(!empty($v) && (e_REQUEST_URI === $v))
{
$selected = $key;
}
break; break;
default: default:
@ -1880,6 +1887,8 @@ class e_admin_controller
$data = $_dispatcher->getPageTitles(); $data = $_dispatcher->getPageTitles();
$search = $this->getMode().'/'.$this->getAction(); $search = $this->getMode().'/'.$this->getAction();
if(isset($data[$search])) if(isset($data[$search]))
{ {
$res['caption'] = $data[$search]; $res['caption'] = $data[$search];
@ -2152,9 +2161,9 @@ class e_admin_controller
return $response; return $response;
} }
if($action != 'Prefs' && $action != 'Create' && $action !='Edit' && $action != 'List') // Custom Page method in use, so add the title. if($action != 'Prefs' && $action != 'Create' && $action !='Edit' && $action != 'List') // Custom Page method in use, so add the title.
{ {
$this->addTitle(); $this->addTitle();
} }
@ -2164,6 +2173,9 @@ class e_admin_controller
{ {
$this->addTitle('#'.$this->getId()); // Inform user of which record is being edited. $this->addTitle('#'.$this->getId()); // Inform user of which record is being edited.
} }
ob_start(); //catch any output ob_start(); //catch any output
$ret = $this->{$actionName}(); $ret = $this->{$actionName}();
@ -5478,6 +5490,13 @@ class e_admin_ui extends e_admin_controller_ui
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load(); $this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load();
$this->addTitle(); $this->addTitle();
if($this->getQuery('filter_options'))
{
// var_dump($this);
// $this->addTitle("to-do"); // display filter option when active.
}
} }
/** /**