From b5424462c91b71dd4aaf11a49abb83564f30ce88 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 3 Mar 2017 17:30:12 -0800
Subject: [PATCH] Moved non-superadmin settings into sidebar

---
 config/permissions.php                    | 108 ++++++++++++++++------
 resources/views/layouts/default.blade.php |  75 ++++++++-------
 2 files changed, 121 insertions(+), 62 deletions(-)

diff --git a/config/permissions.php b/config/permissions.php
index 48918ead51..8c5a02ae38 100644
--- a/config/permissions.php
+++ b/config/permissions.php
@@ -336,34 +336,88 @@ return array(
             ),
         ),
 
-
-
-        'Suppliers' => array(
-            array(
-                'permission' => 'suppliers.view',
-                'label'      => 'View ',
-                'note'       => '',
-                'display'    => true,
-            ),
-            array(
-                'permission' => 'suppliers.create',
-                'label'      => 'Create ',
-                'note'       => '',
-                'display'    => true,
-            ),
-            array(
-                'permission' => 'suppliers.edit',
-                'label'      => 'Edit  ',
-                'note'       => '',
-                'display'    => true,
-            ),
-            array(
-                'permission' => 'suppliers.delete',
-                'label'      => 'Delete ',
-                'note'       => '',
-                'display'    => true,
-            ),
+    'Status Labels' => array(
+        array(
+            'permission' => 'statuslabels.view',
+            'label'      => 'View ',
+            'note'       => '',
+            'display'    => true,
         ),
+        array(
+            'permission' => 'statuslabels.create',
+            'label'      => 'Create ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'statuslabels.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'statuslabels.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
+            'display'    => true,
+        ),
+    ),
+
+    'Custom Fields' => array(
+        array(
+            'permission' => 'customfields.view',
+            'label'      => 'View',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'customfields.create',
+            'label'      => 'Create',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'customfields.edit',
+            'label'      => 'Edit',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'customfields.delete',
+            'label'      => 'Delete',
+            'note'       => '',
+            'display'    => true,
+        ),
+    ),
+
+
+
+    'Suppliers' => array(
+        array(
+            'permission' => 'suppliers.view',
+            'label'      => 'View ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'suppliers.create',
+            'label'      => 'Create ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'suppliers.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'suppliers.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
+            'display'    => true,
+        ),
+    ),
 
 
     'Manufacturers' => array(
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 0d22a135e7..ee5f35d485 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -328,12 +328,6 @@
                    </a>
                    <ul class="dropdown-menu">
 
-                       <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
-                           <a href="{{ route('statuslabels.index') }}">
-                               <i class="fa fa-list fa-fw"></i> @lang('general.status_labels')
-                           </a>
-                       </li>
-
                        <li {!! (Request::is('groups*') ? ' class="active"' : '') !!}>
                            <a href="{{ route('groups.index') }}">
                                <i class="fa fa-group fa-fw"></i> @lang('general.groups')
@@ -344,11 +338,7 @@
                                <i class="fa fa-download fa-fw"></i> @lang('admin/settings/general.backups')
                            </a>
                        </li>
-                       <li {!! (Request::is('custom_fields*') ? ' class="active"' : '') !!}>
-                           <a href="{{ route('fields.index') }}">
-                               <i class="fa fa-wrench fa-fw"></i> @lang('admin/custom_fields/general.custom_fields')
-                           </a>
-                       </li>
+
                        @can('settings.api')
                            <li>
                                <a href="{{ route('settings.api') }}">
@@ -490,30 +480,8 @@
                 </li>
             @endcan
 
-            @can('reports.view')
-            <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
-                <a href="{{ url('reports') }}"  class="dropdown-toggle">
-                    <i class="fa fa-bar-chart"></i>
-                    <span>@lang('general.reports')</span>
-                    <i class="fa fa-angle-left pull-right"></i>
-                </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="{{ 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>
-                    <li><a href="{{ url('reports/asset_maintenances') }}" {{ (Request::is('reports/asset_maintenances') ? ' class="active"' : '') }} >@lang('general.asset_maintenance_report')</a></li>
-                    <li><a href="{{ url('reports/assets') }}" {{ (Request::is('reports/assets') ? ' class="active"' : '') }}>@lang('general.asset_report')</a></li>
-                    <li><a href="{{ url('reports/unaccepted_assets') }}" {{ (Request::is('reports/unaccepted_assets') ? ' class="active"' : '') }} >@lang('general.unaccepted_asset_report')</a></li>
-                    <li><a href="{{ url('reports/accessories') }}" {{ (Request::is('reports/accessories') ? ' class="active"' : '') }}>@lang('general.accessory_report')</a></li>
-                    <li><a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>@lang('general.custom_report')</a></li>
-                </ul>
-            </li>
-            @endcan
-
             @can('manage', \App\Models\Setting::class)
-                <li{!! (Request::is('hardware/import*') ? ' class="active"' : '') !!}>
+                <li>
                     <a href="#">
                         <i class="fa fa-gear"></i>
                         <span>@lang('general.settings')</span>
@@ -521,8 +489,24 @@
                     </a>
 
                     <ul class="treeview-menu">
+                        @can('view', \App\Models\Customfield::class)
+                            <li {!! (Request::is('custom_fields*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('fields.index') }}">
+                                    {{ trans('admin/custom_fields/general.custom_fields') }}
+                                </a>
+                            </li>
+                        @endcan
+
+                        @can('view', \App\Models\Statuslabel::class)
+                            <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('statuslabels.index') }}">
+                                    {{ trans('general.status_labels') }}
+                                </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>
+                            <li><a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }} >@lang('general.companies')</a></li>
                         @endcan
 
                         @can('view', \App\Models\Manufacturer::class)
@@ -550,6 +534,27 @@
                 </li>
             @endcan
 
+            @can('reports.view')
+            <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
+                <a href="{{ url('reports') }}"  class="dropdown-toggle">
+                    <i class="fa fa-bar-chart"></i>
+                    <span>@lang('general.reports')</span>
+                    <i class="fa fa-angle-left pull-right"></i>
+                </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="{{ 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>
+                    <li><a href="{{ url('reports/asset_maintenances') }}" {{ (Request::is('reports/asset_maintenances') ? ' class="active"' : '') }} >@lang('general.asset_maintenance_report')</a></li>
+                    <li><a href="{{ url('reports/assets') }}" {{ (Request::is('reports/assets') ? ' class="active"' : '') }}>@lang('general.asset_report')</a></li>
+                    <li><a href="{{ url('reports/unaccepted_assets') }}" {{ (Request::is('reports/unaccepted_assets') ? ' class="active"' : '') }} >@lang('general.unaccepted_asset_report')</a></li>
+                    <li><a href="{{ url('reports/accessories') }}" {{ (Request::is('reports/accessories') ? ' class="active"' : '') }}>@lang('general.accessory_report')</a></li>
+                    <li><a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>@lang('general.custom_report')</a></li>
+                </ul>
+            </li>
+            @endcan
 
             @can('viewRequestable', \App\Models\Asset::class)
             <li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>