Skip to content

A free open source IT asset/license management system

Added aria tags to static callouts

snipe365864cc53bf
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 3aa81e9e6b..2813782dbf 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -54,7 +54,7 @@
@if ($accessory->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $accessory->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
@if ($accessory->requireAcceptance())
<i class="far fa-envelope" aria-hidden="true"></i>
{{ trans('admin/categories/general.required_acceptance') }}<br>
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php
index 724bf835c7..034a0532ed 100644
--- a/resources/views/components/checkout.blade.php
+++ b/resources/views/components/checkout.blade.php
@@ -36,7 +36,7 @@
@if ($snipe_component->requireAcceptance() || $snipe_component->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
@if ($snipe_component->category->require_acceptance == '1')
<i class="far fa-envelope" aria-hidden="true"></i>
{{ trans('admin/categories/general.required_acceptance') }}<br>
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index f5d94cf9fa..bca4fac753 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -36,7 +36,7 @@
@if ($consumable->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $consumable->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
@if ($consumable->category->require_acceptance == '1')
<i class="far fa-envelope" aria-hidden="true"></i>
{{ trans('admin/categories/general.required_acceptance') }}<br>
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index e372680571..a7a7bf2432 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -160,7 +160,7 @@
</label>
</div>
<div class="col-md-9 col-md-offset-3" id="encrypt_warning" style="display:none;">
- <div class="callout callout-danger">
+ <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
<p><x-icon type="warning" /> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
</div>
</div>
diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index c657877744..c42a76385b 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -19,8 +19,8 @@
<div class="box-body">
- <div class="callout callout-warning">
- <i class="fas fa-exclamation-triangle"></i>
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
+ <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}
</div>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index e0ed74851d..d9db0f23c2 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -27,8 +27,8 @@
<div class="box box-default">
<div class="box-body">
- <div class="callout callout-warning">
- <i class="fas fa-exclamation-triangle"></i> {{ trans_choice('admin/hardware/form.bulk_update_warn', count($assets), ['asset_count' => count($assets)]) }}
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
+ <i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans_choice('admin/hardware/form.bulk_update_warn', count($assets), ['asset_count' => count($assets)]) }}
@if (count($models) > 0)
{{ trans_choice('admin/hardware/form.bulk_update_with_custom_field', count($models), ['asset_model_count' => count($models)]) }}
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index e56f80ca5f..96348c1614 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -185,7 +185,7 @@
@if ($asset->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
<div class="form-group notification-callout" style="display:none;">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
@if ($asset->requireAcceptance())
<x-icon type="email"/>
diff --git a/resources/views/hardware/history.blade.php b/resources/views/hardware/history.blade.php
index 95cf4d9efd..434ba823eb 100644
--- a/resources/views/hardware/history.blade.php
+++ b/resources/views/hardware/history.blade.php
@@ -150,7 +150,7 @@
<div class="box-footer text-right">
@if (config('app.lock_passwords')===true)
<div class="col-md-12">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
{{ trans('general.feature_disabled') }}
</div>
</div>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 7412284e36..3a142a90e0 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -18,7 +18,7 @@
@if (!$asset->model)
<div class="col-md-12">
- <div class="callout callout-danger">
+ <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
<p>
<strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}
</p>
@@ -28,7 +28,7 @@
@if ($asset->checkInvalidNextAuditDate())
<div class="col-md-12">
- <div class="callout callout-warning">
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
<p><strong>{{ trans('general.warning',
[
'warning' => trans('admin/hardware/message.warning_audit_date_mismatch',
@@ -45,7 +45,7 @@
@if ($asset->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning">
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
<x-icon type="warning"/>
{{ trans('general.asset_deleted_warning') }}
</div>
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index c2c2e06164..60aadbe401 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1530,7 +1530,10 @@
</a>
</li>
- <?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
+ <?php
+use App\Models\Statuslabel;
+
+$status_navs = Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
@if (count($status_navs) > 0)
@foreach ($status_navs as $status_nav)
<li{!! (request()->is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}>
@@ -2024,7 +2027,7 @@
<div class="row">
@if (config('app.lock_passwords'))
<div class="col-md-12">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
{{ trans('general.some_features_disabled') }}
</div>
</div>
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 3d3f0b6290..2f6ce99ad9 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -91,7 +91,7 @@
@if ($license->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
@if ($license->requireAcceptance())
<i class="far fa-envelope"></i>
diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php
index 0c3da202f9..18fd4396f1 100644
--- a/resources/views/livewire/category-edit-form.blade.php
+++ b/resources/views/livewire/category-edit-form.blade.php
@@ -105,8 +105,8 @@
@endif
</label>
@if ($this->emailWillBeSendDueToEula)
- <div class="callout callout-info">
- <i class="far fa-envelope"></i>
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <i class="far fa-envelope" aria-hidden="true"></i>
<span>{{ $this->emailMessage }}</span>
</div>
@endif
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 81e5ae3f00..519a1b3c65 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -20,7 +20,7 @@
@if ($location->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning">
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
<x-icon type="warning" />
{{ trans('admin/locations/message.deleted_warning') }}
</div>
diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php
index da4e16effc..684590101b 100755
--- a/resources/views/manufacturers/index.blade.php
+++ b/resources/views/manufacturers/index.blade.php
@@ -15,7 +15,7 @@
<form action="{{ route('manufacturers.seed') }}" method="POST">
{{ csrf_field() }}
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
<p>
{{ trans('general.seeding.manufacturers.prompt') }}
<button class="btn btn-sm btn-theme hidden-print" rel="noopener">
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 2bb458d99c..58b650c3d8 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -18,8 +18,8 @@
<div class="box box-default">
<div class="box-body">
- <div class="callout callout-warning">
- <i class="fas fa-exclamation-triangle"></i>
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
+ <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
{{ trans_choice('admin/models/message.bulkedit.warn', count($models), ['model_count' => count($models)]) }}
</div>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 017d945fea..b740773874 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -17,7 +17,7 @@
@if ($model->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning">
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
<x-icon type="warning" />
{{ trans('admin/models/general.deleted') }}
</div>
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index ba41311fd4..02c5124b01 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -24,8 +24,8 @@
<p>{{ trans('admin/users/general.bulk_update_help') }}</p>
- <div class="callout callout-warning">
- <i class="fas fa-exclamation-triangle"></i> {{ trans('admin/users/general.bulk_update_warn', ['user_count' => count($users)]) }}
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
+ <i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('admin/users/general.bulk_update_warn', ['user_count' => count($users)]) }}
</div>
<form class="form-horizontal" method="post" action="{{ route('users/bulkeditsave') }}" autocomplete="off" role="form">
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 2c92d386f9..464e99a66a 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -16,8 +16,8 @@
<!-- CSRF Token -->
{{csrf_field()}}
<div class="col-md-12">
- <div class="callout callout-danger">
- <i class="fas fa-exclamation-triangle"></i>
+ <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
+ <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
<strong>{{ trans('admin/users/general.warning_deletion_information', array('count' => count($users))) }} </strong>
</div>
@@ -25,7 +25,7 @@
@if (config('app.lock_passwords'))
<div class="col-md-12">
- <div class="callout callout-warning">
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
<p>{{ trans('general.feature_disabled') }}</p>
</div>
</div>
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index 1b2f9171f4..9e75284336 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -23,8 +23,8 @@
{{csrf_field()}}
<div class="row">
<div class="col-md-12">
- <div class="callout callout-danger">
- <i class="fas fa-exclamation-triangle"></i>
+ <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
+ <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
{{ trans('general.warning_merge_information') }}
</div>
</div>
@@ -33,7 +33,7 @@
@if (config('app.lock_passwords'))
<div class="row">
<div class="col-md-12">
- <div class="callout callout-info">
+ <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
<p>{{ trans('general.feature_disabled') }}</p>
</div>
</div>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index f2af359307..51a923c13d 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -17,7 +17,7 @@
@if ($user->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning">
+ <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
<x-icon type="warning"/>
{{ trans('admin/users/message.user_deleted_warning') }}
</div>