mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 07:45:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #18449 - small sidenav improvements for selected contexts

Browse Source
This commit is contained in:
snipe
2026-01-16 12:48:28 +00:00
parent 7c136b6f57
commit 05c998227a
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Helpers/Helper.php
View File

@ -1385,7 +1385,19 @@ class Helper
* @return string[] * @return string[]
*/ */
public static function SettingUrls(){ public static function SettingUrls(){
$settings=['#','fields.index', 'statuslabels.index', 'models.index', 'categories.index', 'manufacturers.index', 'suppliers.index', 'departments.index', 'locations.index', 'companies.index', 'depreciations.index']; $settings=[
'#',
'fields*',
'statuslabels*',
'models*',
'categories*',
'manufacturers*',
'suppliers*',
'departments*',
'locations*',
'companies*',
'depreciations*'
];
return $settings; return $settings;
} }

25
resources/views/layouts/default.blade.php
View File

@ -340,6 +340,8 @@
.modal-danger, .modal-danger,
.modal-danger h2, .modal-danger h2,
.modal-warning h2, .modal-warning h2,
.modal-danger h4,
.modal-warning h4,
.bg-maroon, .bg-maroon,
.bg-maroon:hover, .bg-maroon:hover,
.bg-maroon:focus, .bg-maroon:focus,
@ -350,6 +352,7 @@
color: white !important; color: white !important;
} }
.btn-selected, .btn-selected,
.btn-selected a, .btn-selected a,
.btn-selected:hover, .btn-selected:hover,
@ -1291,7 +1294,7 @@
</li> </li>
@endcan @endcan
@can('index', \App\Models\Asset::class) @can('index', \App\Models\Asset::class)
<li class="treeview{{ ((request()->is('statuslabels/*') || request()->is('hardware*')) ? ' active' : '') }}"> <li class="treeview{{ ((request()->is('statuslabels/*') || request()->is(['hardware*', 'maintenances*'])) ? ' active' : '') }}">
<a href="#"> <a href="#">
<x-icon type="assets" class="fa-fw" /> <x-icon type="assets" class="fa-fw" />
<span>{{ trans('general.assets') }}</span> <span>{{ trans('general.assets') }}</span>
@ -1411,7 +1414,7 @@
@endcan @endcan
@can('create', \App\Models\Asset::class) @can('create', \App\Models\Asset::class)
<li{!! (Request::query('Deleted') ? ' class="active"' : '') !!}> <li{!! (request()->query('status') == 'Deleted' ? ' class="active"' : '') !!}>
<a href="{{ url('hardware?status=Deleted') }}"> <a href="{{ url('hardware?status=Deleted') }}">
{{ trans('general.deleted') }} {{ trans('general.deleted') }}
</a> </a>
@ -1538,7 +1541,7 @@
@endcan @endcan
@can('backend.interact') @can('backend.interact')
<li id="settings-sidenav-option" class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}"> <li id="settings-sidenav-option" class="treeview {!! (request()->is(App\Helpers\Helper::SettingUrls()) ? ' active' : '') !!}">
<a href="#" id="settings"> <a href="#" id="settings">
<x-icon type="settings" class="fa-fw" /> <x-icon type="settings" class="fa-fw" />
<span>{{ trans('general.settings') }}</span> <span>{{ trans('general.settings') }}</span>
@ -1563,7 +1566,7 @@
@endcan @endcan
@can('view', \App\Models\AssetModel::class) @can('view', \App\Models\AssetModel::class)
<li {{!! (request()->is('models') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('models*') ? ' class="active"' : '') !!}}>
<a href="{{ route('models.index') }}"> <a href="{{ route('models.index') }}">
{{ trans('general.asset_models') }} {{ trans('general.asset_models') }}
</a> </a>
@ -1571,7 +1574,7 @@
@endcan @endcan
@can('view', \App\Models\Category::class) @can('view', \App\Models\Category::class)
<li {{!! (request()->is('categories') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('categories*') ? ' class="active"' : '') !!}}>
<a href="{{ route('categories.index') }}"> <a href="{{ route('categories.index') }}">
{{ trans('general.categories') }} {{ trans('general.categories') }}
</a> </a>
@ -1579,7 +1582,7 @@
@endcan @endcan
@can('view', \App\Models\Manufacturer::class) @can('view', \App\Models\Manufacturer::class)
<li {{!! (request()->is('manufacturers') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('manufacturers*') ? ' class="active"' : '') !!}}>
<a href="{{ route('manufacturers.index') }}"> <a href="{{ route('manufacturers.index') }}">
{{ trans('general.manufacturers') }} {{ trans('general.manufacturers') }}
</a> </a>
@ -1587,7 +1590,7 @@
@endcan @endcan
@can('view', \App\Models\Supplier::class) @can('view', \App\Models\Supplier::class)
<li {{!! (request()->is('suppliers') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('suppliers*') ? ' class="active"' : '') !!}}>
<a href="{{ route('suppliers.index') }}"> <a href="{{ route('suppliers.index') }}">
{{ trans('general.suppliers') }} {{ trans('general.suppliers') }}
</a> </a>
@ -1595,7 +1598,7 @@
@endcan @endcan
@can('view', \App\Models\Department::class) @can('view', \App\Models\Department::class)
<li {{!! (request()->is('departments') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('departments*') ? ' class="active"' : '') !!}}>
<a href="{{ route('departments.index') }}"> <a href="{{ route('departments.index') }}">
{{ trans('general.departments') }} {{ trans('general.departments') }}
</a> </a>
@ -1603,7 +1606,7 @@
@endcan @endcan
@can('view', \App\Models\Location::class) @can('view', \App\Models\Location::class)
<li {{!! (request()->is('locations') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('locations*') ? ' class="active"' : '') !!}}>
<a href="{{ route('locations.index') }}"> <a href="{{ route('locations.index') }}">
{{ trans('general.locations') }} {{ trans('general.locations') }}
</a> </a>
@ -1611,7 +1614,7 @@
@endcan @endcan
@can('view', \App\Models\Company::class) @can('view', \App\Models\Company::class)
<li {{!! (request()->is('companies') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('companies*') ? ' class="active"' : '') !!}}>
<a href="{{ route('companies.index') }}"> <a href="{{ route('companies.index') }}">
{{ trans('general.companies') }} {{ trans('general.companies') }}
</a> </a>
@ -1619,7 +1622,7 @@
@endcan @endcan
@can('view', \App\Models\Depreciation::class) @can('view', \App\Models\Depreciation::class)
<li {{!! (request()->is('depreciations') ? ' class="active"' : '') !!}}> <li {{!! (request()->is('depreciations*') ? ' class="active"' : '') !!}}>
<a href="{{ route('depreciations.index') }}"> <a href="{{ route('depreciations.index') }}">
{{ trans('general.depreciation') }} {{ trans('general.depreciation') }}
</a> </a>

10
resources/views/partials/bootstrap-table.blade.php
View File

@ -264,7 +264,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('users.index') : route('users.index', ['status' => 'deleted']) }}'; window.location.href = '{{ (request()->input('status') == "deleted") ? route('users.index') : route('users.index', ['status' => 'deleted']) }}';
}, },
attributes: { attributes: {
class: '{{ (request()->input('status') == "deleted") ? ' btn-selected text-danger ' : '' }}', class: '{{ (request()->input('status') == "deleted") ? ' btn-selected' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('admin/users/table.show_current') : trans('admin/users/table.show_deleted') }}', title: '{{ (request()->input('status') == "deleted") ? trans('admin/users/table.show_current') : trans('admin/users/table.show_deleted') }}',
} }
@ -368,7 +368,7 @@
window.location.href = '{{ (request()->input('status') == "Deleted") ? route('hardware.index') : route('hardware.index', ['status' => 'Deleted']) }}'; window.location.href = '{{ (request()->input('status') == "Deleted") ? route('hardware.index') : route('hardware.index', ['status' => 'Deleted']) }}';
}, },
attributes: { attributes: {
class: '{{ (request()->input('status') == "Deleted") ? 'btn-selected text-danger' : '' }}', class: '{{ (request()->input('status') == "Deleted") ? 'btn-selected' : '' }}',
title: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}', title: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
} }
@ -400,7 +400,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('locations.index') : route('locations.index', ['status' => 'deleted']) }}'; window.location.href = '{{ (request()->input('status') == "deleted") ? route('locations.index') : route('locations.index', ['status' => 'deleted']) }}';
}, },
attributes: { attributes: {
class: '{{ (request()->input('status') == "deleted") ? 'btn-selected text-danger' : '' }}', class: '{{ (request()->input('status') == "deleted") ? 'btn-selected' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('admin/users/table.show_current') : trans('admin/users/table.show_deleted') }}', title: '{{ (request()->input('status') == "deleted") ? trans('admin/users/table.show_current') : trans('admin/users/table.show_deleted') }}',
} }
@ -554,7 +554,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('manufacturers.index') : route('manufacturers.index', ['status' => 'deleted']) }}'; window.location.href = '{{ (request()->input('status') == "deleted") ? route('manufacturers.index') : route('manufacturers.index', ['status' => 'deleted']) }}';
}, },
attributes: { attributes: {
class: '{{ (request()->input('status') == "deleted") ? 'btn-selected text-danger' : '' }}', class: '{{ (request()->input('status') == "deleted") ? 'btn-selected' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}', title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}',
} }
@ -706,7 +706,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('models.index') : route('models.index', ['status' => 'deleted']) }}'; window.location.href = '{{ (request()->input('status') == "deleted") ? route('models.index') : route('models.index', ['status' => 'deleted']) }}';
}, },
attributes: { attributes: {
class: '{{ (request()->input('status') == "deleted") ? ' btn-selected text-danger' : '' }}', class: '{{ (request()->input('status') == "deleted") ? ' btn-selected' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}', title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}',
} }