diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php index acad48487..558a24deb 100644 --- a/application/controllers/NavigationController.php +++ b/application/controllers/NavigationController.php @@ -66,6 +66,7 @@ class NavigationController extends Controller $userConfig = $user->loadNavigationConfig(); $sharedConfig = Config::app('navigation'); + $this->view->types = $this->listItemTypes(); $this->view->items = array_merge( $sharedConfig->select()->where('owner', $user->getUsername())->fetchAll(), iterator_to_array($userConfig) diff --git a/application/views/scripts/navigation/index.phtml b/application/views/scripts/navigation/index.phtml index 6bf60eb3c..0914821f9 100644 --- a/application/views/scripts/navigation/index.phtml +++ b/application/views/scripts/navigation/index.phtml @@ -10,6 +10,7 @@
= $this->translate('Navigation'); ?> | += $this->translate('Type'); ?> | = $this->translate('Remove'); ?> | @@ -23,6 +24,9 @@ 'title' => sprintf($this->translate('Edit navigation item %s'), $name) ) ); ?> += $item->type && isset($types[$item->type]) + ? $this->escape($types[$item->type]) + : $this->escape($this->translate('Unknown')); ?> | = $this->qlink( '', 'navigation/remove', |
---|