Skip to content

Commit ee830e0

Browse files
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # 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
2 parents 0cd3be0 + c8a5065 commit ee830e0

File tree

10 files changed

+57
-65
lines changed

10 files changed

+57
-65
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4189,6 +4189,15 @@
41894189
"contributions": [
41904190
"code"
41914191
]
4192+
},
4193+
{
4194+
"login": "mckaygerhard",
4195+
"name": "Герхард PICCORO Lenz McKAY ",
4196+
"avatar_url": "https://avatars.githubusercontent.com/u/1571724?v=4",
4197+
"profile": "https://github-readme-stats.vercel.app/api?username=mckaygerhard",
4198+
"contributions": [
4199+
"code"
4200+
]
41924201
}
41934202
]
41944203
}

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
6868
| [<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") |
6969
| [<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") |
7070
| [<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") |
71+
| [<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") |
7172
<!-- ALL-CONTRIBUTORS-LIST:END -->
7273

7374
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

public/css/build/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/app.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/all.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"/js/dist/all.js": "/js/dist/all.js?id=de88a5fd4b026170e290344559b7fa99",
33
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bf1a348eae3e60c62b8879953f7df14c",
44
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=146086d653897e2557af5e68f6f8c56f",
5-
"/css/build/overrides.css": "/css/build/overrides.css?id=86b4ba168dfdaa63adf0d004212305cf",
6-
"/css/build/app.css": "/css/build/app.css?id=a1b58d57776830e3bd23dad36fa38ce3",
5+
"/css/build/overrides.css": "/css/build/overrides.css?id=0bac6960dea3fc4e62536f9b665006e9",
6+
"/css/build/app.css": "/css/build/app.css?id=bd23682f958f06f815d8e1261dbf56b9",
77
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",
88
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
99
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
@@ -19,7 +19,7 @@
1919
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=68a92d85c8e351dfb38a835307f126ec",
2020
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cbb20ad6182b658f34117bf96a621b63",
2121
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=84e2ee950ae04444988b37038e5a3951",
22-
"/css/dist/all.css": "/css/dist/all.css?id=7a50d99a2bc36c509fa09376996db18a",
22+
"/css/dist/all.css": "/css/dist/all.css?id=fcedb8d2c6f164cdb288638c47f9b57d",
2323
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2424
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2525
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

resources/assets/less/overrides.less

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,3 +1221,16 @@ caption.tableCaption {
12211221
padding-left: 8px;
12221222
}
12231223

1224+
// via https://github.com/grokability/snipe-it/issues/11754
1225+
.sidebar-toggle.btn {
1226+
border-radius: 3px;
1227+
box-shadow: none;
1228+
border-top: 0px solid transparent;
1229+
border-bottom: 0px solid transparent;
1230+
padding-left: 15px;
1231+
padding-right: 15px;
1232+
padding-top: 12px;
1233+
padding-bottom: 12px;
1234+
margin-left: -47px;
1235+
margin-top: 2px;
1236+
}

resources/views/locations/view.blade.php

Lines changed: 26 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -23,146 +23,115 @@
2323
<ul class="nav nav-tabs hidden-print">
2424

2525
@can('view', \App\Models\User::class)
26-
@if ($location->users->count() > 0)
2726
<li class="active">
2827
<a href="#users" data-toggle="tab">
29-
<i class="fa-solid fa-house-user" style="font-size: 17px" aria-hidden="true"></i>
28+
<i class="fa-solid fa-house-user fa-fw" style="font-size: 17px" aria-hidden="true"></i>
3029
<span class="sr-only">
3130
{{ trans('general.users') }}
3231
</span>
33-
<span class="badge">
34-
{{ number_format($location->users->count()) }}
35-
</span>
32+
{!! ($location->users->count() > 0) ? '<span class="badge">'.number_format($location->users->count()).'</span>' : '' !!}
3633
</a>
3734
</li>
38-
@endif
3935
@endcan
4036

4137
@can('view', \App\Models\Asset::class)
42-
@if ($location->assets()->AssetsForShow()->count() > 0)
4338
<li>
4439
<a href="#assets" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/locations/message.current_location') }}">
45-
<i class="fa-solid fa-house-laptop" style="font-size: 17px" aria-hidden="true"></i>
46-
<span class="badge">
47-
{{ number_format($location->assets()->AssetsForShow()->count()) }}
48-
</span>
40+
<i class="fa-solid fa-house-laptop fa-fw" style="font-size: 17px" aria-hidden="true"></i>
41+
{!! ($location->assets()->AssetsForShow()->count() > 0) ? '<span class="badge">'.number_format($location->assets()->AssetsForShow()->count()).'</span>' : '' !!}
4942
<span class="sr-only">
5043
{{ trans('admin/locations/message.current_location') }}
5144
</span>
5245
</a>
5346
</li>
54-
@endif
5547

56-
@if ($location->rtd_assets()->AssetsForShow()->count() > 0)
5748
<li>
5849
<a href="#rtd_assets" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/hardware/form.default_location') }}">
59-
<i class="fa-solid fa-house-flag" style="font-size: 17px" aria-hidden="true"></i>
60-
<span class="badge">
61-
{{ number_format($location->rtd_assets()->AssetsForShow()->count()) }}
62-
</span>
50+
<i class="fa-solid fa-house-flag fa-fw" style="font-size: 17px" aria-hidden="true"></i>
51+
{!! ($location->rtd_assets()->AssetsForShow()->count() > 0) ? '<span class="badge">'.number_format($location->rtd_assets()->AssetsForShow()->count()).'</span>' : '' !!}
6352
<span class="sr-only">
6453
{{ trans('admin/hardware/form.default_location') }}
6554
</span>
6655
</a>
6756
</li>
68-
@endif
6957

70-
@if ($location->assignedAssets()->AssetsForShow()->count() > 0)
7158
<li>
7259
<a href="#assets_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/locations/message.assigned_assets') }}">
73-
<i class="fas fa-barcode" style="font-size: 17px" aria-hidden="true"></i>
74-
<span class="badge">
75-
{{ number_format($location->assignedAssets()->AssetsForShow()->count()) }}
76-
</span>
60+
<i class="fas fa-barcode fa-fw" style="font-size: 17px" aria-hidden="true"></i>
61+
{!! ($location->assignedAssets()->AssetsForShow()->count() > 0) ? '<span class="badge">'.number_format($location->assignedAssets()->AssetsForShow()->count()).'</span>' : '' !!}
7762
<span class="sr-only">
7863
{{ trans('admin/locations/message.assigned_assets') }}
7964
</span>
8065
</a>
8166
</li>
82-
@endif
8367
@endcan
8468

8569
@can('view', \App\Models\Accessory::class)
86-
@if ($location->accessories->count() > 0)
8770
<li>
8871
<a href="#accessories" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories') }}">
89-
<i class="far fa-keyboard" style="font-size: 17px" aria-hidden="true"></i>
90-
<span class="badge">
91-
{{ number_format($location->accessories->count()) }}
92-
</span>
72+
<i class="far fa-keyboard fa-fw" style="font-size: 17px" aria-hidden="true"></i>
73+
{!! ($location->accessories->count() > 0) ? '<span class="badge">'.number_format($location->accessories->count()).'</span>' : '' !!}
9374
<span class="sr-only">
9475
{{ trans('general.accessories') }}
9576
</span>
9677
</a>
9778
</li>
98-
@endif
9979

100-
@if ($location->assignedAccessories->count() > 0)
10180
<li>
10281
<a href="#accessories_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories_assigned') }}">
103-
<i class="fas fa-keyboard" style="font-size: 17px" aria-hidden="true"></i>
104-
<span class="badge">
105-
{{ number_format($location->assignedAccessories->count()) }}
106-
</span>
82+
<i class="fas fa-keyboard fa-fw" style="font-size: 17px" aria-hidden="true"></i>
83+
{!! ($location->assignedAccessories->count() > 0) ? '<span class="badge">'.number_format($location->assignedAccessories->count()).'</span>' : '' !!}
10784
<span class="sr-only">
10885
{{ trans('general.accessories_assigned') }}
10986
</span>
11087
</a>
11188
</li>
112-
@endif
11389
@endcan
11490

11591

11692
@can('view', \App\Models\Consumable::class)
117-
@if ($location->consumables->count() > 0)
11893
<li>
11994
<a href="#consumables" data-toggle="tab" data-tooltip="true" title="{{ trans('general.consumables') }}">
120-
<i class="fas fa-tint" style="font-size: 17px" aria-hidden="true"></i>
121-
<span class="badge">
122-
{{ number_format($location->consumables->count()) }}
123-
</span>
95+
<i class="fas fa-tint fa-fw" style="font-size: 17px" aria-hidden="true"></i>
96+
{!! ($location->consumables->count() > 0) ? '<span class="badge">'.number_format($location->consumables->count()).'</span>' : '' !!}
12497
<span class="sr-only">
12598
{{ trans('general.consumables') }}
12699
</span>
127100
</a>
128101
</li>
129-
@endif
130102
@endcan
131103

132104
@can('view', \App\Models\Component::class)
133-
@if ($location->components->count() > 0)
134105
<li>
135106
<a href="#components" data-toggle="tab" data-tooltip="true" title="{{ trans('general.components') }}">
136-
<i class="fas fa-hdd" style="font-size: 17px" aria-hidden="true"></i>
137-
<span class="badge">
138-
{{ number_format($location->components->count()) }}
139-
</span>
107+
<i class="fas fa-hdd fa-fw" style="font-size: 17px" aria-hidden="true"></i>
108+
{!! ($location->components->count() > 0) ? '<span class="badge">'.number_format($location->components->count()).'</span>' : '' !!}
140109
<span class="sr-only">
141110
{{ trans('general.components') }}
142111
</span>
143112
</a>
144113
</li>
145-
@endif
146114
@endcan
147115

148-
@if ($location->uploads->count() > 0 )
149116
<li>
150-
<a href="#files" data-toggle="tab">
117+
<a href="#files" data-toggle="tab" data-tooltip="true" title="{{ trans('general.files') }}">
151118

152119
<span class="hidden-lg hidden-md">
153120
<i class="fas fa-barcode fa-2x"></i>
154121
</span>
155122
<span class="hidden-xs hidden-sm">
156-
{{ trans('general.files') }}
157-
{!! ($location->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($location->uploads->count()).'</span>' : '' !!}
123+
<i class="fa-solid fa-file-contract fa-fw" style="font-size: 17px" aria-hidden="true"></i>
124+
<span class="sr-only">
125+
{{ trans('general.files') }}
126+
</span>
127+
{!! ($location->uploads->count() > 0 ) ? '<span class="badge">'.number_format($location->uploads->count()).'</span>' : '' !!}
158128
</span>
159129
</a>
160130
</li>
161-
@endif
162131

163132
<li>
164-
<a href="#history" data-toggle="tab" data-toggle="tab" data-tooltip="true" title="{{ trans('general.history') }}">
165-
<i class="fa-solid fa-clock-rotate-left" style="font-size: 17px" aria-hidden="true"></i>
133+
<a href="#history" data-toggle="tab" data-tooltip="true" title="{{ trans('general.history') }}">
134+
<i class="fa-solid fa-clock-rotate-left fa-fw" style="font-size: 17px" aria-hidden="true"></i>
166135
<span class="sr-only">
167136
{{ trans('general.history') }}
168137
</span>
@@ -182,7 +151,7 @@
182151

183152
<div class="tab-content">
184153
@can('view', \App\Models\User::class)
185-
<div id="users" @class(['tab-pane','active' => $location->users->count() > 0 ]) >
154+
<div id="users" @class(['tab-pane','active']) >
186155
@endcan
187156
<h2 class="box-title">{{ trans('general.users') }}</h2>
188157
@include('partials.users-bulk-actions')
@@ -205,7 +174,7 @@ class="table table-striped snipe-table"
205174
}'>
206175
</table>
207176
</div><!-- /.tab-pane -->
208-
<div id="assets" @class(['tab-pane', 'active' => $location->users->count() == 0]) >
177+
<div id="assets" @class(['tab-pane']) >
209178

210179
<h2 class="box-title">{{ trans('admin/locations/message.current_location') }}</h2>
211180

0 commit comments

Comments
 (0)