Skip to content

Commit 366b618

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 89be6bd + c748278 commit 366b618

File tree

8 files changed

+475
-311
lines changed

8 files changed

+475
-311
lines changed

‎.pa11yci.json‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
"screen capture tests/pa11y/admin-settings.png"
3737
]
3838
},
39+
{
40+
"url" : "https://snipe-it.test/admin/branding",
41+
"actions" : [
42+
"navigate to https://snipe-it.test/admin/branding",
43+
"screen capture tests/pa11y/admin-branding.png"
44+
]
45+
},
46+
{
47+
"url" : "https://snipe-it.test/admin/general",
48+
"actions" : [
49+
"navigate to https://snipe-it.test/admin/general",
50+
"screen capture tests/pa11y/admin-general.png"
51+
]
52+
},
3953
{
4054
"url" : "https://snipe-it.test/hardware/create",
4155
"actions" : [
@@ -85,6 +99,27 @@
8599
"screen capture tests/pa11y/license-view.png"
86100
]
87101
},
102+
{
103+
"url" : "https://snipe-it.test/consumables",
104+
"actions" : [
105+
"navigate to https://snipe-it.test/consumables",
106+
"screen capture tests/pa11y/consumable-list.png"
107+
]
108+
},
109+
{
110+
"url" : "https://snipe-it.test/consumables/create",
111+
"actions" : [
112+
"navigate to https://snipe-it.test/consumables/create",
113+
"screen capture tests/pa11y/consumable-create.png"
114+
]
115+
},
116+
{
117+
"url" : "https://snipe-it.test/consumables/1",
118+
"actions" : [
119+
"navigate to https://snipe-it.test/consumables/1",
120+
"screen capture tests/pa11y/consumable-view.png"
121+
]
122+
},
88123
{
89124
"url" : "https://snipe-it.test/accessories",
90125
"actions" : [
@@ -98,6 +133,108 @@
98133
"navigate to https://snipe-it.test/accessories/create",
99134
"screen capture tests/pa11y/accessory-create.png"
100135
]
136+
},
137+
{
138+
"url" : "https://snipe-it.test/accessories/1",
139+
"actions" : [
140+
"navigate to https://snipe-it.test/accessories/1",
141+
"screen capture tests/pa11y/accessory-view.png"
142+
]
143+
},
144+
{
145+
"url" : "https://snipe-it.test/locations",
146+
"actions" : [
147+
"navigate to https://snipe-it.test/locations",
148+
"screen capture tests/pa11y/location-list.png"
149+
]
150+
},
151+
{
152+
"url" : "https://snipe-it.test/locations/create",
153+
"actions" : [
154+
"navigate to https://snipe-it.test/locations/create",
155+
"screen capture tests/pa11y/location-create.png"
156+
]
157+
},
158+
{
159+
"url" : "https://snipe-it.test/locations/1",
160+
"actions" : [
161+
"navigate to https://snipe-it.test/locations/1",
162+
"screen capture tests/pa11y/location-view.png"
163+
]
164+
},
165+
166+
{
167+
"url" : "https://snipe-it.test/models",
168+
"actions" : [
169+
"navigate to https://snipe-it.test/models",
170+
"screen capture tests/pa11y/model-list.png"
171+
]
172+
},
173+
{
174+
"url" : "https://snipe-it.test/models/create",
175+
"actions" : [
176+
"navigate to https://snipe-it.test/models/create",
177+
"screen capture tests/pa11y/model-create.png"
178+
]
179+
},
180+
{
181+
"url" : "https://snipe-it.test/models/1",
182+
"actions" : [
183+
"navigate to https://snipe-it.test/models/1",
184+
"screen capture tests/pa11y/model-view.png"
185+
]
186+
},
187+
188+
{
189+
"url" : "https://snipe-it.test/companies",
190+
"actions" : [
191+
"navigate to https://snipe-it.test/companies",
192+
"screen capture tests/pa11y/company-list.png"
193+
]
194+
},
195+
{
196+
"url" : "https://snipe-it.test/companies/create",
197+
"actions" : [
198+
"navigate to https://snipe-it.test/companies/create",
199+
"screen capture tests/pa11y/company-create.png"
200+
]
201+
},
202+
{
203+
"url" : "https://snipe-it.test/companies/1",
204+
"actions" : [
205+
"navigate to https://snipe-it.test/companies/1",
206+
"screen capture tests/pa11y/company-view.png"
207+
]
208+
},
209+
210+
{
211+
"url" : "https://snipe-it.test/departments",
212+
"actions" : [
213+
"navigate to https://snipe-it.test/departments",
214+
"screen capture tests/pa11y/department-list.png"
215+
]
216+
},
217+
{
218+
"url" : "https://snipe-it.test/departments/create",
219+
"actions" : [
220+
"navigate to https://snipe-it.test/departments/create",
221+
"screen capture tests/pa11y/department-create.png"
222+
]
223+
},
224+
{
225+
"url" : "https://snipe-it.test/departments/1",
226+
"actions" : [
227+
"navigate to https://snipe-it.test/departments/1",
228+
"screen capture tests/pa11y/department-view.png"
229+
]
230+
},
231+
232+
{
233+
"url" : "https://snipe-it.test/invalid-url",
234+
"actions" : [
235+
"navigate to https://snipe-it.test/invalid-url",
236+
"screen capture tests/pa11y/404.png"
237+
]
101238
}
102239
]
103240
}

‎resources/lang/en-US/admin/hardware/form.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5959
'asset_deployable' => 'This asset can be checked out.',
6060
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
61+
'processing' => 'Processing... ',
6162
'optional_infos' => 'Optional Information',
6263
'order_details' => 'Order Related Information',
6364
'calc_eol' => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',

‎resources/lang/en-US/admin/settings/general.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,9 @@
462462
'checkin' => 'Checkin Preferences',
463463
'dashboard' => 'Login & Dashboard Preferences',
464464
'misc' => 'Miscellaneous',
465-
465+
'logos' => 'Logos & Display',
466+
'colors' => 'Colors & Skins',
467+
'footer' => 'Footer Preferences',
466468
],
467469

468470

‎resources/views/errors/404.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="col-md-8 col-md-offset-2">
1717

1818
<div style="padding-top: 200px">
19-
<img src="{{ config('app.url') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left">
19+
<img src="{{ config('app.url') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left" alt="Sad Panda cartoon" />
2020
<div class="error-content">
2121
<h2><x-icon type="warning" class="text-yellow" /> 404 Page not found.</h2>
2222
<p>

‎resources/views/hardware/quickscan.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<tr id="audit-loader" style="display: none;">
113113
<td colspan="3">
114114
<x-icon type="spinner" />
115-
{{ trans('admin/hardware/form.processing_spinner') }}
115+
{{ trans('admin/hardware/form.processing') }}
116116
</td>
117117
</tr>
118118
</thead>

‎resources/views/partials/bootstrap-table.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ function orderNumberObjFilterFormatter(value, row) {
842842
843843
function auditImageFormatter(value){
844844
if (value){
845-
return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>'
845+
return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt=""></a>'
846846
}
847847
}
848848
@@ -872,7 +872,7 @@ function downloadFormatter(value) {
872872
873873
function fileUploadFormatter(value) {
874874
if ((value) && (value.url) && (value.inlineable)) {
875-
return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>';
875+
return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt=""></a>';
876876
} else if ((value) && (value.url)) {
877877
return '<a href="' + value.url + '" class="btn btn-default"><x-icon type="download" /></a>';
878878
}

‎resources/views/partials/forms/edit/uploadLogo.blade.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,24 @@
2525
</p>
2626

2727
@if (config('app.lock_passwords')===true)
28-
<p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
28+
<p class="text-warning">
29+
<x-icon type="locked" />
30+
{{ trans('general.feature_disabled') }}</p>
2931
@endif
3032
</div>
3133

3234
<div class="col-md-9 col-md-offset-3">
35+
3336
@if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(($logoPath ?? ''). $snipeSettings->$logoVariable)))
3437
<div class="pull-left" style="padding-right: 20px;">
35-
<a href="{{ Storage::disk('public')->url(e(($logoPath ?? '').$snipeSettings->$logoVariable)) }}"{!! ($logoVariable!='favicon') ? ' data-toggle="lightbox"' : '' !!}>
36-
<img id="{{ $logoId }}-imagePreview" style="height: 80px; padding-bottom: 5px;" alt="" src="{{ Storage::disk('public')->url(e(($logoPath ?? ''). $snipeSettings->$logoVariable)) }}">
38+
<a href="{{ Storage::disk('public')->url(e(($logoPath ?? '').$snipeSettings->$logoVariable)) }}"{!! ($logoVariable!='favicon') ? ' data-toggle="lightbox"' : '' !!} title="Existing logo">
39+
<img style="height: 80px; padding-bottom: 5px;" alt="Current logo" src="{{ Storage::disk('public')->url(e(($logoPath ?? ''). $snipeSettings->$logoVariable)) }}">
3740
</a>
3841
</div>
3942
@endif
4043

4144
<div id="{{ $logoId }}-previewContainer" style="display: none;">
42-
<img id="{{ $logoId }}-imagePreview" style="height: 80px;">
45+
<img id="{{ $logoId }}-imagePreview" style="height: 80px;" alt="Logo upload preview">
4346
</div>
4447

4548

0 commit comments

Comments
 (0)