From 47257d74ff86d5759f74071f1f86cf49c98f39d8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Sep 2015 15:09:56 +0200
Subject: [PATCH] user navigation overview: Display the type of a navigation
 item

refs #5600
---
 application/controllers/NavigationController.php | 1 +
 application/views/scripts/navigation/index.phtml | 4 ++++
 2 files changed, 5 insertions(+)

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 @@
     <table class="action alternating">
         <thead>
             <th><?= $this->translate('Navigation'); ?></th>
+            <th style="width: 10em"><?= $this->translate('Type'); ?></th>
             <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
         </thead>
         <tbody>
@@ -23,6 +24,9 @@
                         'title' => sprintf($this->translate('Edit navigation item %s'), $name)
                     )
                 ); ?></td>
+                <td><?= $item->type && isset($types[$item->type])
+                    ? $this->escape($types[$item->type])
+                    : $this->escape($this->translate('Unknown')); ?></td>
                 <td><?= $this->qlink(
                     '',
                     'navigation/remove',