From af6f208c43ab560593e77ec4889b8758a6be619a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 25 Aug 2017 10:03:05 -0700
Subject: [PATCH] Reordered settings nav

---
 resources/views/layouts/default.blade.php | 34 +++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index cdd372774a..b437c79d41 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -487,8 +487,13 @@
                             </li>
                         @endcan
 
-                        @can('view', \App\Models\Company::class)
-                            <li><a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }} >@lang('general.companies')</a></li>
+                        @can('view', \App\Models\AssetModel::class)
+                            <li><a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }} >@lang('general.asset_models')</a></li>
+                        @endcan
+
+
+                        @can('view', \App\Models\Category::class)
+                            <li><a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }} >@lang('general.categories')</a></li>
                         @endcan
 
                         @can('view', \App\Models\Manufacturer::class)
@@ -499,18 +504,6 @@
                             <li><a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }} >@lang('general.suppliers')</a></li>
                         @endcan
 
-                        @can('view', \App\Models\Category::class)
-                            <li><a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }} >@lang('general.categories')</a></li>
-                        @endcan
-
-                        @can('view', \App\Models\AssetModel::class)
-                            <li><a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }} >@lang('general.asset_models')</a></li>
-                        @endcan
-
-                        @can('view', \App\Models\Depreciation::class)
-                            <li><a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }} >@lang('general.depreciation')</a></li>
-                        @endcan
-
                         @can('view', \App\Models\Department::class)
                             <li><a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }} >@lang('general.departments')</a></li>
                         @endcan
@@ -519,6 +512,14 @@
                             <li><a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }} >@lang('general.locations')</a></li>
                         @endcan
 
+                        @can('view', \App\Models\Company::class)
+                            <li><a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }} >@lang('general.companies')</a></li>
+                        @endcan
+
+                        @can('view', \App\Models\Depreciation::class)
+                            <li><a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }} >@lang('general.depreciation')</a></li>
+                        @endcan
+
                     </ul>
 
                 </li>
@@ -533,7 +534,10 @@
                 </a>
 
                 <ul class="treeview-menu">
-	                 <li><a href="{{ url('reports/activity') }}" {{ (Request::is('reports/activity') ? ' class="active"' : '') }} >@lang('general.activity_report')</a></li>
+	                 <li><a href="{{ route('reports.activity') }}" {{ (Request::is('reports/activity') ? ' class="active"' : '') }} >@lang('general.activity_report')</a></li>
+
+                    <li><a href="{{ route('reports.audit') }}" {{ (Request::is('reports.audit') ? ' class="active"' : '') }} >@lang('general.audit_report')</a></li>
+
 
                     <li><a href="{{ url('reports/depreciation') }}" {{ (Request::is('reports/depreciation') ? ' class="active"' : '') }}>@lang('general.depreciation_report')</a></li>
                     <li><a href="{{ url('reports/licenses') }}" {{ (Request::is('reports/licenses') ? ' class="active"' : '') }}>@lang('general.license_report')</a></li>