From d21b8108c88b33dbef465c7afc07613ab6466751 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 20 May 2014 11:06:09 +0200 Subject: [PATCH] Fixed navigation order --- apps/files/index.php | 5 +++++ apps/files_sharing/appinfo/app.php | 4 ++-- apps/files_trashbin/appinfo/app.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/files/index.php b/apps/files/index.php index e24c535cb20..95ae7977ecc 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -74,7 +74,12 @@ if (OC_App::isEnabled('files_encryption')) { $nav = new OCP\Template('files', 'appnavigation', ''); +function sortNavigationItems($item1, $item2) { + return $item1['order'] - $item2['order']; +} + $navItems = \OCA\Files\App::getNavigationManager()->getAll(); +usort($navItems, 'sortNavigationItems'); $nav->assign('navigationItems', $navItems); $contentItems = array(); diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 1756fc2f50e..21b2646c5ea 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -28,7 +28,7 @@ OC_FileProxy::register(new OCA\Files\Share\Proxy()); "id" => 'sharingin', "appname" => 'files_sharing', "script" => 'list.php', - "order" => 3, + "order" => 10, "name" => $l->t('Shared with you') ) ); @@ -37,7 +37,7 @@ OC_FileProxy::register(new OCA\Files\Share\Proxy()); "id" => 'sharingout', "appname" => 'files_sharing', "script" => 'list.php', - "order" => 4, + "order" => 15, "name" => $l->t('Shared with others') ) ); diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index b8900ee0de3..383115b8e63 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -9,7 +9,7 @@ array( "id" => 'trashbin', "appname" => 'files_trashbin', "script" => 'list.php', - "order" => 1, + "order" => 50, "name" => $l->t('Deleted files') ) ); -- 2.39.5