diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php index 8c5ac019e..da33a5291 100644 --- a/application/controllers/NavigationController.php +++ b/application/controllers/NavigationController.php @@ -88,8 +88,9 @@ class NavigationController extends Controller public function sharedAction() { $this->assertPermission('config/application/navigation'); - $this->view->items = Config::app('navigation'); - $this->view->types = $this->listItemTypes(); + $config = Config::app('navigation'); + $config->getConfigObject()->setKeyColumn('name'); + $query = $config->select(); $removeForm = new Form(); $removeForm->setUidDisabled(); @@ -110,7 +111,10 @@ class NavigationController extends Controller 'label' => $this->view->icon('trash'), 'title' => $this->translate('Unshare this navigation item') )); + $this->view->removeForm = $removeForm; + $this->view->types = $this->listItemTypes(); + $this->view->items = $query; $this->getTabs()->add( 'navigation/shared', @@ -120,6 +124,14 @@ class NavigationController extends Controller 'url' => 'navigation/shared' ) )->activate('navigation/shared'); + $this->setupSortControl( + array( + 'name' => $this->translate('Shared Navigation'), + 'type' => $this->translate('Type'), + 'owner' => $this->translate('Owner') + ), + $query + ); } /** diff --git a/application/views/scripts/navigation/shared.phtml b/application/views/scripts/navigation/shared.phtml index d28378653..8d52fd7b5 100644 --- a/application/views/scripts/navigation/shared.phtml +++ b/application/views/scripts/navigation/shared.phtml @@ -1,10 +1,14 @@ compact): ?>
tabs; ?> + sortBox; ?> + limiter; ?> + paginator; ?> + filterEditor; ?>
-isEmpty()): ?> + translate('There are currently no navigation items being shared'); ?>