mirror of
https://github.com/snipe/snipe-it.git
synced 2026-02-05 00:35:22 +00:00
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/app.css.map # public/css/build/overrides.css # public/css/build/overrides.css.map # public/css/dist/all.css # public/mix-manifest.json
This commit is contained in:
snipe
@ -4189,6 +4189,15 @@
|
||||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "mckaygerhard",
|
||||
"name": "Герхард PICCORO Lenz McKAY ",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/1571724?v=4",
|
||||
"profile": "https://github-readme-stats.vercel.app/api?username=mckaygerhard",
|
||||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -68,6 +68,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
|
||||
| [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") | [<img src="https://avatars.githubusercontent.com/u/58696401?v=4" width="110px;"/><br /><sub>Lukas Kraic</sub>](https://github.com/lukaskraic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukaskraic "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") |
|
||||
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
||||
|
||||
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
public/css/dist/all.css
vendored
2
public/css/dist/all.css
vendored
File diff suppressed because one or more lines are too long
@ -2,8 +2,8 @@
|
||||
"/js/dist/all.js": "/js/dist/all.js?id=de88a5fd4b026170e290344559b7fa99",
|
||||
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bf1a348eae3e60c62b8879953f7df14c",
|
||||
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=146086d653897e2557af5e68f6f8c56f",
|
||||
"/css/build/overrides.css": "/css/build/overrides.css?id=86b4ba168dfdaa63adf0d004212305cf",
|
||||
"/css/build/app.css": "/css/build/app.css?id=a1b58d57776830e3bd23dad36fa38ce3",
|
||||
"/css/build/overrides.css": "/css/build/overrides.css?id=0bac6960dea3fc4e62536f9b665006e9",
|
||||
"/css/build/app.css": "/css/build/app.css?id=bd23682f958f06f815d8e1261dbf56b9",
|
||||
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",
|
||||
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
|
||||
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
|
||||
@ -19,7 +19,7 @@
|
||||
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=68a92d85c8e351dfb38a835307f126ec",
|
||||
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cbb20ad6182b658f34117bf96a621b63",
|
||||
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=84e2ee950ae04444988b37038e5a3951",
|
||||
"/css/dist/all.css": "/css/dist/all.css?id=7a50d99a2bc36c509fa09376996db18a",
|
||||
"/css/dist/all.css": "/css/dist/all.css?id=fcedb8d2c6f164cdb288638c47f9b57d",
|
||||
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
|
||||
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
|
||||
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
|
||||
|
||||
@ -1221,3 +1221,16 @@ caption.tableCaption {
|
||||
padding-left: 8px;
|
||||
}
|
||||
|
||||
// via https://github.com/grokability/snipe-it/issues/11754
|
||||
.sidebar-toggle.btn {
|
||||
border-radius: 3px;
|
||||
box-shadow: none;
|
||||
border-top: 0px solid transparent;
|
||||
border-bottom: 0px solid transparent;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
padding-top: 12px;
|
||||
padding-bottom: 12px;
|
||||
margin-left: -47px;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
@ -23,146 +23,115 @@
|
||||
<ul class="nav nav-tabs hidden-print">
|
||||
|
||||
@can('view', \App\Models\User::class)
|
||||
@if ($location->users->count() > 0)
|
||||
<li class="active">
|
||||
<a href="#users" data-toggle="tab">
|
||||
<i class="fa-solid fa-house-user" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<i class="fa-solid fa-house-user fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="sr-only">
|
||||
{{ trans('general.users') }}
|
||||
</span>
|
||||
<span class="badge">
|
||||
{{ number_format($location->users->count()) }}
|
||||
</span>
|
||||
{!! ($location->users->count() > 0) ? '<span class="badge">'.number_format($location->users->count()).'</span>' : '' !!}
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
|
||||
@can('view', \App\Models\Asset::class)
|
||||
@if ($location->assets()->AssetsForShow()->count() > 0)
|
||||
<li>
|
||||
<a href="#assets" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/locations/message.current_location') }}">
|
||||
<i class="fa-solid fa-house-laptop" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->assets()->AssetsForShow()->count()) }}
|
||||
</span>
|
||||
<i class="fa-solid fa-house-laptop fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->assets()->AssetsForShow()->count() > 0) ? '<span class="badge">'.number_format($location->assets()->AssetsForShow()->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('admin/locations/message.current_location') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($location->rtd_assets()->AssetsForShow()->count() > 0)
|
||||
<li>
|
||||
<a href="#rtd_assets" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/hardware/form.default_location') }}">
|
||||
<i class="fa-solid fa-house-flag" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->rtd_assets()->AssetsForShow()->count()) }}
|
||||
</span>
|
||||
<i class="fa-solid fa-house-flag fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->rtd_assets()->AssetsForShow()->count() > 0) ? '<span class="badge">'.number_format($location->rtd_assets()->AssetsForShow()->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('admin/hardware/form.default_location') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($location->assignedAssets()->AssetsForShow()->count() > 0)
|
||||
<li>
|
||||
<a href="#assets_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/locations/message.assigned_assets') }}">
|
||||
<i class="fas fa-barcode" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->assignedAssets()->AssetsForShow()->count()) }}
|
||||
</span>
|
||||
<i class="fas fa-barcode fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->assignedAssets()->AssetsForShow()->count() > 0) ? '<span class="badge">'.number_format($location->assignedAssets()->AssetsForShow()->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('admin/locations/message.assigned_assets') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
|
||||
@can('view', \App\Models\Accessory::class)
|
||||
@if ($location->accessories->count() > 0)
|
||||
<li>
|
||||
<a href="#accessories" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories') }}">
|
||||
<i class="far fa-keyboard" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->accessories->count()) }}
|
||||
</span>
|
||||
<i class="far fa-keyboard fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->accessories->count() > 0) ? '<span class="badge">'.number_format($location->accessories->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('general.accessories') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if ($location->assignedAccessories->count() > 0)
|
||||
<li>
|
||||
<a href="#accessories_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories_assigned') }}">
|
||||
<i class="fas fa-keyboard" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->assignedAccessories->count()) }}
|
||||
</span>
|
||||
<i class="fas fa-keyboard fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->assignedAccessories->count() > 0) ? '<span class="badge">'.number_format($location->assignedAccessories->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('general.accessories_assigned') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
|
||||
|
||||
@can('view', \App\Models\Consumable::class)
|
||||
@if ($location->consumables->count() > 0)
|
||||
<li>
|
||||
<a href="#consumables" data-toggle="tab" data-tooltip="true" title="{{ trans('general.consumables') }}">
|
||||
<i class="fas fa-tint" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->consumables->count()) }}
|
||||
</span>
|
||||
<i class="fas fa-tint fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->consumables->count() > 0) ? '<span class="badge">'.number_format($location->consumables->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('general.consumables') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
|
||||
@can('view', \App\Models\Component::class)
|
||||
@if ($location->components->count() > 0)
|
||||
<li>
|
||||
<a href="#components" data-toggle="tab" data-tooltip="true" title="{{ trans('general.components') }}">
|
||||
<i class="fas fa-hdd" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="badge">
|
||||
{{ number_format($location->components->count()) }}
|
||||
</span>
|
||||
<i class="fas fa-hdd fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
{!! ($location->components->count() > 0) ? '<span class="badge">'.number_format($location->components->count()).'</span>' : '' !!}
|
||||
<span class="sr-only">
|
||||
{{ trans('general.components') }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
@endcan
|
||||
|
||||
@if ($location->uploads->count() > 0 )
|
||||
<li>
|
||||
<a href="#files" data-toggle="tab">
|
||||
<a href="#files" data-toggle="tab" data-tooltip="true" title="{{ trans('general.files') }}">
|
||||
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fas fa-barcode fa-2x"></i>
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">
|
||||
{{ trans('general.files') }}
|
||||
{!! ($location->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($location->uploads->count()).'</span>' : '' !!}
|
||||
<i class="fa-solid fa-file-contract fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="sr-only">
|
||||
{{ trans('general.files') }}
|
||||
</span>
|
||||
{!! ($location->uploads->count() > 0 ) ? '<span class="badge">'.number_format($location->uploads->count()).'</span>' : '' !!}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
<li>
|
||||
<a href="#history" data-toggle="tab" data-toggle="tab" data-tooltip="true" title="{{ trans('general.history') }}">
|
||||
<i class="fa-solid fa-clock-rotate-left" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<a href="#history" data-toggle="tab" data-tooltip="true" title="{{ trans('general.history') }}">
|
||||
<i class="fa-solid fa-clock-rotate-left fa-fw" style="font-size: 17px" aria-hidden="true"></i>
|
||||
<span class="sr-only">
|
||||
{{ trans('general.history') }}
|
||||
</span>
|
||||
@ -182,7 +151,7 @@
|
||||
|
||||
<div class="tab-content">
|
||||
@can('view', \App\Models\User::class)
|
||||
<div id="users" @class(['tab-pane','active' => $location->users->count() > 0 ]) >
|
||||
<div id="users" @class(['tab-pane','active']) >
|
||||
@endcan
|
||||
<h2 class="box-title">{{ trans('general.users') }}</h2>
|
||||
@include('partials.users-bulk-actions')
|
||||
@ -205,7 +174,7 @@
|
||||
}'>
|
||||
</table>
|
||||
</div><!-- /.tab-pane -->
|
||||
<div id="assets" @class(['tab-pane', 'active' => $location->users->count() == 0]) >
|
||||
<div id="assets" @class(['tab-pane']) >
|
||||
|
||||
<h2 class="box-title">{{ trans('admin/locations/message.current_location') }}</h2>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user