Moved non-superadmin settings into sidebar

This commit is contained in:
snipe 2017-03-03 17:30:12 -08:00
parent dc38e575d9
commit b5424462c9
2 changed files with 121 additions and 62 deletions

View file

@ -336,34 +336,88 @@ return array(
), ),
), ),
'Status Labels' => array(
array(
'Suppliers' => array( 'permission' => 'statuslabels.view',
array( 'label' => 'View ',
'permission' => 'suppliers.view', 'note' => '',
'label' => 'View ', 'display' => true,
'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,
),
), ),
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( 'Manufacturers' => array(

View file

@ -328,12 +328,6 @@
</a> </a>
<ul class="dropdown-menu"> <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"' : '') !!}> <li {!! (Request::is('groups*') ? ' class="active"' : '') !!}>
<a href="{{ route('groups.index') }}"> <a href="{{ route('groups.index') }}">
<i class="fa fa-group fa-fw"></i> @lang('general.groups') <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') <i class="fa fa-download fa-fw"></i> @lang('admin/settings/general.backups')
</a> </a>
</li> </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') @can('settings.api')
<li> <li>
<a href="{{ route('settings.api') }}"> <a href="{{ route('settings.api') }}">
@ -490,30 +480,8 @@
</li> </li>
@endcan @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) @can('manage', \App\Models\Setting::class)
<li{!! (Request::is('hardware/import*') ? ' class="active"' : '') !!}> <li>
<a href="#"> <a href="#">
<i class="fa fa-gear"></i> <i class="fa fa-gear"></i>
<span>@lang('general.settings')</span> <span>@lang('general.settings')</span>
@ -521,8 +489,24 @@
</a> </a>
<ul class="treeview-menu"> <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) @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 @endcan
@can('view', \App\Models\Manufacturer::class) @can('view', \App\Models\Manufacturer::class)
@ -550,6 +534,27 @@
</li> </li>
@endcan @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) @can('viewRequestable', \App\Models\Asset::class)
<li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}> <li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>