Skip to content

A free open source IT asset/license management system

Added scope=“col” to non-presenter table headers

snipe0251ca8228e0
diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php
index a8958ae5f2..d7e2380b12 100755
--- a/resources/views/account/accept/index.blade.php
+++ b/resources/views/account/accept/index.blade.php
@@ -29,12 +29,12 @@
}'>
<thead>
<tr>
- <th>{{ trans('general.name')}}</th>
- <th>{{ trans('general.type')}}</th>
- <th>{{ trans('general.category')}}</th>
- <th>{{ trans('general.qty') }}</th>
- <th>{{ trans('general.serial_number')}}</th>
- <th>{{ trans('table.actions')}}</th>
+ <th scope="col">{{ trans('general.name')}}</th>
+ <th scope="col">{{ trans('general.type')}}</th>
+ <th scope="col">{{ trans('general.category')}}</th>
+ <th scope="col">{{ trans('general.qty') }}</th>
+ <th scope="col">{{ trans('general.serial_number')}}</th>
+ <th scope="col">{{ trans('table.actions')}}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index d6a20201a2..48181398c3 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -66,22 +66,22 @@
<thead>
<tr>
- <th class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="true">{{ trans('general.image') }}</th>
- <th class="col-md-2" data-field="asset_tag" data-sortable="true" >{{ trans('general.asset_tag') }}</th>
- <th class="col-md-2" data-field="model" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
- <th class="col-md-2" data-field="model_number" data-sortable="true">{{ trans('admin/models/table.modelnumber') }}</th>
- <th class="col-md-2" data-field="name" data-sortable="true">{{ trans('admin/hardware/form.name') }}</th>
- <th class="col-md-3" data-field="serial" data-sortable="true">{{ trans('admin/hardware/table.serial') }}</th>
- <th class="col-md-2" data-field="location" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
- <th class="col-md-2" data-field="status" data-sortable="true">{{ trans('admin/hardware/table.status') }}</th>
- <th class="col-md-2" data-field="expected_checkin" data-formatter="dateDisplayFormatter" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+ <th scope="col" class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="true">{{ trans('general.image') }}</th>
+ <th scope="col" class="col-md-2" data-field="asset_tag" data-sortable="true" >{{ trans('general.asset_tag') }}</th>
+ <th scope="col" class="col-md-2" data-field="model" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
+ <th scope="col" class="col-md-2" data-field="model_number" data-sortable="true">{{ trans('admin/models/table.modelnumber') }}</th>
+ <th scope="col" class="col-md-2" data-field="name" data-sortable="true">{{ trans('admin/hardware/form.name') }}</th>
+ <th scope="col" class="col-md-3" data-field="serial" data-sortable="true">{{ trans('admin/hardware/table.serial') }}</th>
+ <th scope="col" class="col-md-2" data-field="location" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
+ <th scope="col" class="col-md-2" data-field="status" data-sortable="true">{{ trans('admin/hardware/table.status') }}</th>
+ <th scope="col" class="col-md-2" data-field="expected_checkin" data-formatter="dateDisplayFormatter" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
@foreach(\App\Models\CustomField::get() as $field)
@if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1'))
- <th class="col-md-2" data-field="custom_fields.{{ $field->db_column }}" data-sortable="true">{{ $field->name }}</th>
+ <th scope="col" class="col-md-2" data-field="custom_fields.{{ $field->db_column }}" data-sortable="true">{{ $field->name }}</th>
@endif
@endforeach
- <th class="col-md-1" data-formatter="assetRequestActionsFormatter" data-field="actions" data-sortable="false">{{ trans('table.actions') }}</th>
+ <th scope="col" class="col-md-1" data-formatter="assetRequestActionsFormatter" data-field="actions" data-sortable="false">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>
@@ -102,11 +102,11 @@
data-cookie-id-table="requestableAssets">
<thead>
<tr role="row">
- <th class="col-md-1" data-sortable="true">{{ trans('general.image') }}</th>
- <th class="col-md-6" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
- <th class="col-md-3" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>
+ <th scope="col" class="col-md-1" data-sortable="true">{{ trans('general.image') }}</th>
+ <th scope="col" class="col-md-6" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
+ <th scope="col" class="col-md-3" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>
- <th class="col-md-2 actions" data-sortable="false">{{ trans('table.actions') }}</th>
+ <th scope="col" class="col-md-2 actions" data-sortable="false">{{ trans('table.actions') }}</th>
</tr>
</thead>
diff --git a/resources/views/account/requested.blade.php b/resources/views/account/requested.blade.php
index 84506c9e28..50db3889c9 100644
--- a/resources/views/account/requested.blade.php
+++ b/resources/views/account/requested.blade.php
@@ -29,17 +29,17 @@
}'>
<thead>
<tr>
- <th data-field="image" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
- <th data-field="name">{{ trans('general.item_name') }}</th>
- <th data-field="type">{{ trans('general.type') }}</th>
- <th data-field="qty">{{ trans('general.qty') }}</th>
- <th data-field="location">{{ trans('admin/hardware/table.location') }}</th>
- <th data-field="expected_checkin" data-formatter="dateDisplayFormatter"> {{ trans('admin/hardware/form.expected_checkin') }}</th>
- <th data-field="request_date" data-formatter="dateDisplayFormatter"> {{ trans('general.requested_date') }}</th>
+ <th scope="col" data-field="image" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
+ <th scope="col" data-field="name">{{ trans('general.item_name') }}</th>
+ <th scope="col" data-field="type">{{ trans('general.type') }}</th>
+ <th scope="col" data-field="qty">{{ trans('general.qty') }}</th>
+ <th scope="col" data-field="location">{{ trans('admin/hardware/table.location') }}</th>
+ <th scope="col" data-field="expected_checkin" data-formatter="dateDisplayFormatter"> {{ trans('admin/hardware/form.expected_checkin') }}</th>
+ <th scope="col" data-field="request_date" data-formatter="dateDisplayFormatter"> {{ trans('general.requested_date') }}</th>
@foreach(\App\Models\CustomField::get() as $field)
@if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1'))
- <th data-field="custom_fields.{{ $field->db_column }}">{{ $field->name }}</th>
+ <th scope="col" data-field="custom_fields.{{ $field->db_column }}">{{ $field->name }}</th>
@endif
@endforeach
</tr>
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index e52f75251b..0a4a6d0cbe 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -457,65 +457,65 @@
<thead>
<tr>
- <th class="col-md-1">
+ <th scope="col" class="col-md-1">
#
</th>
- <th>
+ <th scope="col">
{{ trans('general.image') }}
</th>
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('general.category') }}
</th>
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_tag') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('general.name') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('general.status') }}
</th>
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_model') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('general.model_no') }}
</th>
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.serial') }}
</th>
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('general.manufacturer') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('admin/hardware/form.default_location') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('general.location') }}
</th>
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/form.expected_checkin') }}
</th>
@can('self.view_purchase_cost')
- <th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
+ <th scope="col" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
{{ trans('general.purchase_cost') }}
</th>
@endcan
- <th data-switchable="true" data-visible="true">
+ <th scope="col" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/form.eol_date') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('general.last_audit') }}
</th>
- <th data-switchable="true" data-visible="false">
+ <th scope="col" data-switchable="true" data-visible="false">
{{ trans('general.next_audit_date') }}
</th>
- <th data-switchable="true" data-visible="false" data-formatter="trueFalseFormatter">
+ <th scope="col" data-switchable="true" data-visible="false" data-formatter="trueFalseFormatter">
{{ trans('general.byod') }}
</th>
@foreach ($field_array as $db_column => $field_name)
- <th data-switchable="true" data-visible="true">{{ $field_name }}</th>
+ <th scope="col" data-switchable="true" data-visible="true">{{ $field_name }}</th>
@endforeach
</tr>
@@ -635,11 +635,11 @@
<thead>
<tr>
- <th class="col-md-2">{{ trans('general.name') }}</th>
- <th class="col-md-4">{{ trans('admin/licenses/form.license_key') }}</th>
- <th class="col-md-2">{{ trans('admin/licenses/form.to_name') }}</th>
- <th class="col-md-2">{{ trans('admin/licenses/form.to_email') }}</th>
- <th class="col-md-2">{{ trans('general.category') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-4">{{ trans('admin/licenses/form.license_key') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('admin/licenses/form.to_name') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('admin/licenses/form.to_email') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.category') }}</th>
</tr>
</thead>
<tbody>
@@ -701,9 +701,9 @@
<thead>
<tr>
- <th class="col-md-5">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-5">{{ trans('general.name') }}</th>
@can('self.view_purchase_cost')
- <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+ <th scope="col" class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
@endcan
</tr>
</thead>
@@ -746,12 +746,12 @@
<thead>
<tr>
- <th class="col-md-3">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.name') }}</th>
@can('self.view_purchase_cost')
- <th class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+ <th scope="col" class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
@endcan
- <th class="col-md-2">{{ trans('general.date') }}</th>
- <th class="col-md-5">{{ trans('general.notes') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.date') }}</th>
+ <th scope="col" class="col-md-5">{{ trans('general.notes') }}</th>
</tr>
</thead>
<tbody>
@@ -794,11 +794,11 @@
<thead>
<tr>
- <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
- <th data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
- <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
- <th data-field="note">{{ trans('general.notes') }}</th>
- <th data-field="url" data-formatter="downloadFormatter">{{ trans('general.download') }}</th>
+ <th scope="col" data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+ <th scope="col" data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
+ <th scope="col" data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
+ <th scope="col" data-field="note">{{ trans('general.notes') }}</th>
+ <th scope="col" data-field="url" data-formatter="downloadFormatter">{{ trans('general.download') }}</th>
</tr>
</thead>
</table>
diff --git a/resources/views/blade/alert-menu.blade.php b/resources/views/blade/alert-menu.blade.php
index 1ba1ffb0aa..4bcb65e87e 100644
--- a/resources/views/blade/alert-menu.blade.php
+++ b/resources/views/blade/alert-menu.blade.php
@@ -6,11 +6,11 @@
<!-- Tasks: style can be found in dropdown.less -->
<?php
$alert_items = \App\Helpers\Helper::checkLowInventory();
- $deprecations = \App\Helpers\Helper::deprecationCheck();
+$deprecations = \App\Helpers\Helper::deprecationCheck();
?>
<li class="dropdown tasks-menu">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<x-icon type="alerts" />
<span class="sr-only">{{ trans('general.alerts') }}</span>
@if(count($alert_items) + count($deprecations))
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index 33a46b8d45..6cdb682311 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -33,15 +33,15 @@
<tr>
{{-- Hide the sorting handle if we can't update the fieldset --}}
@can('update', $custom_fieldset)
- <th class="col-md-1"><span class="sr-only">{{ trans('admin/custom_fields/general.reorder') }}</span></th>
+ <th scope="col" class="col-md-1"><span class="sr-only">{{ trans('admin/custom_fields/general.reorder') }}</span></th>
@endcan
- <th class="col-md-1" style="display: none;">{{ trans('admin/custom_fields/general.order') }}</th>
- <th class="col-md-3">{{ trans('admin/custom_fields/general.field_name') }}</th>
- <th class="col-md-2">{{ trans('admin/custom_fields/general.field_format') }}</th>
- <th class="col-md-2">{{ trans('admin/custom_fields/general.field_element') }}</th>
- <th class="col-md-1">{{ trans('admin/custom_fields/general.encrypted') }}</th>
- <th class="col-md-1">{{ trans('admin/custom_fields/general.required') }}</th>
- <th class="col-md-1"><span class="sr-only">{{ trans('button.remove') }}</span></th>
+ <th scope="col" class="col-md-1" style="display: none;">{{ trans('admin/custom_fields/general.order') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('admin/custom_fields/general.field_name') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('admin/custom_fields/general.field_format') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('admin/custom_fields/general.field_element') }}</th>
+ <th scope="col" class="col-md-1">{{ trans('admin/custom_fields/general.encrypted') }}</th>
+ <th scope="col" class="col-md-1">{{ trans('admin/custom_fields/general.required') }}</th>
+ <th scope="col" class="col-md-1"><span class="sr-only">{{ trans('button.remove') }}</span></th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 36b5a8b30d..13fd6ea164 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -39,10 +39,10 @@
}'>
<thead>
<tr>
- <th>{{ trans('general.name') }}</th>
- <th>{{ trans('admin/custom_fields/general.qty_fields') }}</th>
- <th>{{ trans('admin/custom_fields/general.used_by_models') }}</th>
- <th>{{ trans('table.actions') }}</th>
+ <th scope="col">{{ trans('general.name') }}</th>
+ <th scope="col">{{ trans('admin/custom_fields/general.qty_fields') }}</th>
+ <th scope="col">{{ trans('admin/custom_fields/general.used_by_models') }}</th>
+ <th scope="col">{{ trans('table.actions') }}</th>
</tr>
</thead>
@@ -124,43 +124,43 @@
}'>
<thead>
<tr>
- <th data-sortable="true" data-searchable="true">{{ trans('general.name') }}</th>
- <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.help_text')}}</th>
- <th data-sortable="true" data-visible="false">{{ trans('admin/custom_fields/general.db_field') }}</th>
- <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.field_format') }}</th>
- <th data-sortable="true" data-tooltip="{{ trans('admin/custom_fields/general.encrypted') }}"><i
+ <th scope="col" data-sortable="true" data-searchable="true">{{ trans('general.name') }}</th>
+ <th scope="col" data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.help_text')}}</th>
+ <th scope="col" data-sortable="true" data-visible="false">{{ trans('admin/custom_fields/general.db_field') }}</th>
+ <th scope="col" data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.field_format') }}</th>
+ <th scope="col" data-sortable="true" data-tooltip="{{ trans('admin/custom_fields/general.encrypted') }}"><i
class="fa fa-lock" aria-hidden="true"></i>
<span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.encrypted') }}</span>
</th>
- <th data-sortable="true" class="text-center"
+ <th scope="col" data-sortable="true" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.show_in_listview_short') }}"><i class="fa fa-list"
aria-hidden="true"></i>
<span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.show_in_listview_short') }}</span>
</th>
- <th data-visible="false" data-sortable="true" class="text-center"
+ <th scope="col" data-visible="false" data-sortable="true" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.display_in_user_view_table') }}"><i
class="fa fa-eye"
aria-hidden="true"><span
class="sr-only">{{ trans('admin/custom_fields/general.display_in_user_view_table') }}</span></i>
</th>
- <th data-sortable="true" data-searchable="false" class="text-center"
+ <th scope="col" data-sortable="true" data-searchable="false" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.show_in_email_short') }}"><i
class="fa fa-envelope" aria-hidden="true"><span
class="sr-only">{{ trans('admin/custom_fields/general.show_in_email_short') }}</span></i></th>
- <th data-sortable="true" data-searchable="false" class="text-center"
+ <th scope="col" data-sortable="true" data-searchable="false" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}"><i
class="fa fa-laptop fa-fw" aria-hidden="true"><span
class="sr-only">{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}</span></i>
</th>
- <th data-sortable="true" data-searchable="false" class="text-center"
+ <th scope="col" data-sortable="true" data-searchable="false" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.unique') }}"><i
class="fa-solid fa-fingerprint"><span
class="sr-only">{{ trans('admin/custom_fields/general.unique') }}</span></i></th>
- <th data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
+ <th scope="col" data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.display_checkin') }}">
<x-icon type="checkin" />
<span class="sr-only">
@@ -168,7 +168,7 @@
</span>
</th>
- <th data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
+ <th scope="col" data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.display_checkout') }}">
<x-icon type="checkout" />
<span class="sr-only">
@@ -176,7 +176,7 @@
</span>
</th>
- <th data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
+ <th scope="col" data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
data-tooltip="{{ trans('admin/custom_fields/general.display_audit') }}">
<x-icon type="audit" />
<span class="sr-only">
@@ -185,11 +185,11 @@
</th>
- <th data-sortable="true" data-searchable="true" class="text-center">{{ trans('admin/custom_fields/general.field_element_short') }}</th>
+ <th scope="col" data-sortable="true" data-searchable="true" class="text-center">{{ trans('admin/custom_fields/general.field_element_short') }}</th>
- <th data-searchable="true">{{ trans('admin/custom_fields/general.fieldsets') }}</th>
- <th>{{ trans('button.actions') }}</th>
+ <th scope="col" data-searchable="true">{{ trans('admin/custom_fields/general.fieldsets') }}</th>
+ <th scope="col">{{ trans('button.actions') }}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 5fcd0bf206..9d30486f5f 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -242,12 +242,12 @@
data-url="{{ route('api.activity.index', ['limit' => 25]) }}">
<thead>
<tr>
- <th data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span class="sr-only">{{ trans('admin/hardware/table.icon') }}</span></th>
- <th class="col-sm-3" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
- <th class="col-sm-2" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
- <th class="col-sm-2" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
- <th class="col-sm-3" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
- <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
+ <th scope="col" data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span class="sr-only">{{ trans('admin/hardware/table.icon') }}</span></th>
+ <th scope="col" class="col-sm-3" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
+ <th scope="col" class="col-sm-2" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
+ <th scope="col" class="col-sm-2" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
+ <th scope="col" class="col-sm-3" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+ <th scope="col" class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
</tr>
</thead>
</table>
@@ -321,28 +321,28 @@
<thead>
<tr>
- <th class="col-sm-3" data-visible="true" data-field="name" data-formatter="companiesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
- <th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
+ <th scope="col" class="col-sm-3" data-visible="true" data-field="name" data-formatter="companiesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
<x-icon type="users" />
<span class="sr-only">{{ trans('general.people') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
<x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
<x-icon type="accessories" />
<span class="sr-only">{{ trans('general.accessories_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
<x-icon type="consumables" />
<span class="sr-only">{{ trans('general.consumables_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
<x-icon type="components" />
<span class="sr-only">{{ trans('general.components_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
<x-icon type="licenses" />
<span class="sr-only">{{ trans('general.licenses_count') }}</span>
</th>
@@ -390,17 +390,17 @@
data-url="{{ route('api.locations.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
<thead>
<tr>
- <th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
- <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
<x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
{{ trans('general.assigned') }}
</th>
- <th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
<x-icon type="users" />
<span class="sr-only">{{ trans('general.people') }}</span>
@@ -454,27 +454,27 @@
data-url="{{ route('api.categories.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
<thead>
<tr>
- <th class="col-sm-3" data-visible="true" data-field="name" data-formatter="categoriesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
- <th class="col-sm-3" data-visible="true" data-field="category_type" data-sortable="true">
+ <th scope="col" class="col-sm-3" data-visible="true" data-field="name" data-formatter="categoriesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-sm-3" data-visible="true" data-field="category_type" data-sortable="true">
{{ trans('general.type') }}
</th>
- <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
<x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
<x-icon type="licenses" />
<span class="sr-only">{{ trans('general.accessories_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
<x-icon type="consumables" />
<span class="sr-only">{{ trans('general.consumables_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
<x-icon type="components" />
<span class="sr-only">{{ trans('general.components_count') }}</span>
</th>
- <th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
+ <th scope="col" class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
<x-icon type="licenses" />
<span class="sr-only">{{ trans('general.licenses_count') }}</span>
</th>
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index 05586a8379..aa5ee760b8 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -105,11 +105,11 @@
<table id="checkedin" class="table table-striped snipe-table">
<thead>
<tr>
- <th>{{ trans('general.asset_tag') }}</th>
- <th>{{ trans('general.asset_model') }}</th>
- <th>{{ trans('general.model_no') }}</th>
- <th>{{ trans('general.quickscan_checkin_status') }}</th>
- <th></th>
+ <th scope="col">{{ trans('general.asset_tag') }}</th>
+ <th scope="col">{{ trans('general.asset_model') }}</th>
+ <th scope="col">{{ trans('general.model_no') }}</th>
+ <th scope="col">{{ trans('general.quickscan_checkin_status') }}</th>
+ <th scope="col"></th>
</tr>
<tr id="checkin-loader" style="display: none;">
<td colspan="3">
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 5db0cacd36..b4b4a9a537 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -130,11 +130,11 @@
<table id="audited" class="table table-striped snipe-table">
<thead>
<tr>
- <th>{{ trans('general.audit') }}</th>
- <th>{{ trans('general.bulkaudit_status') }}</th>
- <th>{{ trans('general.status') }}</th>
- <th>{{ trans('general.notes') }}</th>
- <th></th>
+ <th scope="col">{{ trans('general.audit') }}</th>
+ <th scope="col">{{ trans('general.bulkaudit_status') }}</th>
+ <th scope="col">{{ trans('general.status') }}</th>
+ <th scope="col">{{ trans('general.notes') }}</th>
+ <th scope="col"></th>
</tr>
<tr id="audit-loader" style="display: none;">
<td colspan="3">
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index f851145ce1..d435c75e91 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -32,14 +32,14 @@
}'>
<thead>
<tr role="row">
- <th class="col-md-1">{{ trans('general.image') }}</th>
- <th class="col-md-2">{{ trans('general.name') }}</th>
- <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
- <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
- <th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
- <th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
- <th class="col-md-1">{{ trans('button.actions') }}</th>
- <th class="col-md-1">{{ trans('general.checkout') }}</th>
+ <th scope="col" class="col-md-1">{{ trans('general.image') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
+ <th scope="col" class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+ <th scope="col" class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
+ <th scope="col" class="col-md-1">{{ trans('button.actions') }}</th>
+ <th scope="col" class="col-md-1">{{ trans('general.checkout') }}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index 359a0aac5c..8d86f1a687 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -55,7 +55,9 @@
</div>
@endif
<!-- Content -->
- @yield('content')
+ <main id="main">
+ @yield('content')
+ </main>
<div class="text-center" style="padding-top: 100px;">
@if (($snipeSettings) && ($snipeSettings->privacy_policy_link!=''))
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 9bdf0df720..9dc19e04ae 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1317,7 +1317,7 @@
@can('admin')
<li class="dropdown user-menu" aria-hidden="true">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" tabindex="-1" aria-haspopup="true" aria-expanded="false">
{{ trans('general.create') }}
<strong class="caret"></strong>
</a>
@@ -1386,7 +1386,7 @@
@auth
<li class="dropdown user user-menu">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@if (auth()->user()->present()->gravatar())
<img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
alt="">
diff --git a/resources/views/layouts/setup.blade.php b/resources/views/layouts/setup.blade.php
index b09392bc43..f067c13817 100644
--- a/resources/views/layouts/setup.blade.php
+++ b/resources/views/layouts/setup.blade.php
@@ -77,7 +77,7 @@
</head>
<body>
- <div class="container">
+ <main id="main" class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<h1 class="page-header"><img src="../img/logo.png" style="height: 65px;" alt="Snipe-IT logo"> {{ trans('general.pre_flight') }}</h1>
@@ -143,8 +143,8 @@
</div>
</div>
- </div>
-
+ </main>
+
{{-- Javascript files --}}
<script src="{{ url('js/dist/all.js') }}" nonce="{{ csrf_token() }}"></script>
diff --git a/resources/views/livewire/admin-personal-access-tokens.blade.php b/resources/views/livewire/admin-personal-access-tokens.blade.php
index 5baf164d6a..cba05a0ae6 100644
--- a/resources/views/livewire/admin-personal-access-tokens.blade.php
+++ b/resources/views/livewire/admin-personal-access-tokens.blade.php
@@ -13,13 +13,13 @@
>
<thead>
<tr>
- <th data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
- <th data-field="user" data-sortable="true">{{ trans('general.created_by') }}</th>
- <th data-field="client" data-sortable="true">{{ trans('admin/settings/general.oauth_client') }}</th>
- <th data-field="status" data-sortable="true">{{ trans('general.status') }}</th>
- <th data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
- <th data-field="expires_at" data-sortable="true">{{ trans('general.expires') }}</th>
- <th data-field="actions" data-sortable="false">
+ <th scope="col" data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
+ <th scope="col" data-field="user" data-sortable="true">{{ trans('general.created_by') }}</th>
+ <th scope="col" data-field="client" data-sortable="true">{{ trans('admin/settings/general.oauth_client') }}</th>
+ <th scope="col" data-field="status" data-sortable="true">{{ trans('general.status') }}</th>
+ <th scope="col" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
+ <th scope="col" data-field="expires_at" data-sortable="true">{{ trans('general.expires') }}</th>
+ <th scope="col" data-field="actions" data-sortable="false">
<span class="sr-only">{{ trans('general.actions') }}</span>
</th>
</tr>
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index 7a77eed71a..f789bad7f4 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -32,9 +32,9 @@
<div class="errors-table">
<table class="table table-striped table-bordered" id="errors-table">
<thead>
- <th>{{ trans('general.item') }}</th>
- <th>{{ trans('admin/custom_fields/general.field') }}</th>
- <th>{{ trans('general.error') }}</th>
+ <th scope="col">{{ trans('general.item') }}</th>
+ <th scope="col">{{ trans('admin/custom_fields/general.field') }}</th>
+ <th scope="col">{{ trans('general.error') }}</th>
</thead>
<tbody>
@foreach($import_errors AS $key => $actual_import_errors)
diff --git a/resources/views/livewire/oauth-clients.blade.php b/resources/views/livewire/oauth-clients.blade.php
index 1fc5d0dab3..50ae564243 100644
--- a/resources/views/livewire/oauth-clients.blade.php
+++ b/resources/views/livewire/oauth-clients.blade.php
@@ -27,16 +27,16 @@
>
<thead>
<tr>
- <th data-field="id" data-sortable="true">{{ trans('general.id') }}</th>
- <th data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
- <th data-field="client_type" data-sortable="true">{{ trans('admin/settings/general.oauth_client_type') }}</th>
- <th data-field="revoked" data-sortable="true">{{ trans('general.status') }}</th>
- <th data-field="redirect" data-sortable="true">{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
- <th data-field="secret" data-sortable="true">{{ trans('admin/settings/general.oauth_secret') }}</th>
- <th data-field="associated_token_count" data-sortable="true">{{ trans('admin/settings/general.oauth_associated_token_count') }}</th>
- <th data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
- <th data-field="updated_at" data-sortable="true">{{ trans('general.updated_at') }}</th>
- <th>
+ <th scope="col" data-field="id" data-sortable="true">{{ trans('general.id') }}</th>
+ <th scope="col" data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
+ <th scope="col" data-field="client_type" data-sortable="true">{{ trans('admin/settings/general.oauth_client_type') }}</th>
+ <th scope="col" data-field="revoked" data-sortable="true">{{ trans('general.status') }}</th>
+ <th scope="col" data-field="redirect" data-sortable="true">{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
+ <th scope="col" data-field="secret" data-sortable="true">{{ trans('admin/settings/general.oauth_secret') }}</th>
+ <th scope="col" data-field="associated_token_count" data-sortable="true">{{ trans('admin/settings/general.oauth_associated_token_count') }}</th>
+ <th scope="col" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
+ <th scope="col" data-field="updated_at" data-sortable="true">{{ trans('general.updated_at') }}</th>
+ <th scope="col">
<span class="sr-only">{{ trans('general.actions') }}</span>
</th>
</tr>
@@ -126,12 +126,12 @@
>
<thead>
<tr>
- <th data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
- <th data-field="client_owner" data-sortable="true">{{ trans('general.created_by') }}</th>
- <th data-field="oauth_scopes" data-sortable="true">{{ trans('admin/settings/general.oauth_scopes') }}</th>
- <th data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
- <th data-field="expires" data-sortable="true">{{ trans('general.expires') }}</th>
- <th>
+ <th scope="col" data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
+ <th scope="col" data-field="client_owner" data-sortable="true">{{ trans('general.created_by') }}</th>
+ <th scope="col" data-field="oauth_scopes" data-sortable="true">{{ trans('admin/settings/general.oauth_scopes') }}</th>
+ <th scope="col" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
+ <th scope="col" data-field="expires" data-sortable="true">{{ trans('general.expires') }}</th>
+ <th scope="col">
<span class="sr-only">{{ trans('general.actions') }}</span>
</th>
</tr>
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php
index e1c78fd4b4..b5c7640758 100644
--- a/resources/views/livewire/personal-access-tokens.blade.php
+++ b/resources/views/livewire/personal-access-tokens.blade.php
@@ -23,10 +23,10 @@
@if($tokens->count() > 0)
<thead>
<tr>
- <th class="col-md-3">{{ trans('general.name') }}</th>
- <th class="col-md-2">{{ trans('general.created_at') }}</th>
- <th class="col-md-2">{{ trans('general.expires') }}</th>
- <th class="col-md-2"><span class="sr-only">{{ trans('general.delete') }}</span></th>
+ <th scope="col" class="col-md-3">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.created_at') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.expires') }}</th>
+ <th scope="col" class="col-md-2"><span class="sr-only">{{ trans('general.delete') }}</span></th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
index 39e4ad2b5e..7d46e5b6cd 100644
--- a/resources/views/locations/print.blade.php
+++ b/resources/views/locations/print.blade.php
@@ -76,17 +76,17 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="6">{{ trans('general.users') }}</th>
+ <th scope="col" colspan="6">{{ trans('general.users') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 5px;"></th>
- <th style="width: 25%;">{{ trans('general.company') }}</th>
- <th style="width: 25%;">{{ trans('admin/locations/table.user_name') }}</th>
- <th style="width: 10%;">{{ trans('general.employee_number') }}</th>
- <th style="width: 20%;">{{ trans('admin/locations/table.department') }}</th>
- <th style="width: 20%;">{{ trans('admin/locations/table.location') }}</th>
+ <th scope="col" style="width: 5px;"></th>
+ <th scope="col" style="width: 25%;">{{ trans('general.company') }}</th>
+ <th scope="col" style="width: 25%;">{{ trans('admin/locations/table.user_name') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('general.employee_number') }}</th>
+ <th scope="col" style="width: 20%;">{{ trans('admin/locations/table.department') }}</th>
+ <th scope="col" style="width: 20%;">{{ trans('admin/locations/table.location') }}</th>
</tr>
</thead>
@foreach ($users as $user)
@@ -111,18 +111,18 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('general.child_locations') }}</th>
+ <th scope="col" colspan="10">{{ trans('general.child_locations') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th>{{ trans('general.name') }}</th>
- <th>{{ trans('general.address') }}</th>
- <th>{{ trans('general.city') }}</th>
- <th>{{ trans('general.state') }}</th>
- <th>{{ trans('general.country') }}</th>
- <th>{{ trans('general.zip') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col">{{ trans('general.name') }}</th>
+ <th scope="col">{{ trans('general.address') }}</th>
+ <th scope="col">{{ trans('general.city') }}</th>
+ <th scope="col">{{ trans('general.state') }}</th>
+ <th scope="col">{{ trans('general.country') }}</th>
+ <th scope="col">{{ trans('general.zip') }}</th>
</tr>
</thead>
@@ -152,21 +152,21 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('general.assets') }}</th>
+ <th scope="col" colspan="10">{{ trans('general.assets') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_tag') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
- <th style="width: 15%;">{{ trans('admin/locations/table.asset_model') }}</th>
- <th style="width: 15%;">{{ trans('admin/locations/table.asset_serial') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_checked_out') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_expected_checkin') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_tag') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
+ <th scope="col" style="width: 15%;">{{ trans('admin/locations/table.asset_model') }}</th>
+ <th scope="col" style="width: 15%;">{{ trans('admin/locations/table.asset_serial') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_checked_out') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_expected_checkin') }}</th>
</tr>
</thead>
@php
@@ -204,21 +204,21 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('admin/locations/message.assigned_assets') }}</th>
+ <th scope="col" colspan="10">{{ trans('admin/locations/message.assigned_assets') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_tag') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
- <th style="width: 15%;">{{ trans('admin/locations/table.asset_model') }}</th>
- <th style="width: 15%;">{{ trans('admin/locations/table.asset_serial') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_checked_out') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_expected_checkin') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_tag') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
+ <th scope="col" style="width: 15%;">{{ trans('admin/locations/table.asset_model') }}</th>
+ <th scope="col" style="width: 15%;">{{ trans('admin/locations/table.asset_serial') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_checked_out') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_expected_checkin') }}</th>
</tr>
</thead>
@php
@@ -256,17 +256,17 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('general.accessories') }}</th>
+ <th scope="col" colspan="10">{{ trans('general.accessories') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
- <th>{{ trans('admin/models/table.modelnumber') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
+ <th scope="col">{{ trans('admin/models/table.modelnumber') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
</tr>
</thead>
@php
@@ -295,17 +295,17 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('general.accessories_assigned') }}</th>
+ <th scope="col" colspan="10">{{ trans('general.accessories_assigned') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
- <th>{{ trans('admin/models/table.modelnumber') }}</th>
- <th style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
+ <th scope="col">{{ trans('admin/models/table.modelnumber') }}</th>
+ <th scope="col" style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
</tr>
</thead>
@php
@@ -334,17 +334,17 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('general.accessories') }}</th>
+ <th scope="col" colspan="10">{{ trans('general.accessories') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th>{{ trans('admin/locations/table.asset_name') }}</th>
- <th>{{ trans('general.qty') }}</th>
- <th>{{ trans('admin/locations/table.asset_category') }}</th>
- <th>{{ trans('admin/locations/table.asset_manufacturer') }}</th>
- <th>{{ trans('admin/models/table.modelnumber') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col">{{ trans('admin/locations/table.asset_name') }}</th>
+ <th scope="col">{{ trans('general.qty') }}</th>
+ <th scope="col">{{ trans('admin/locations/table.asset_category') }}</th>
+ <th scope="col">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
+ <th scope="col">{{ trans('admin/models/table.modelnumber') }}</th>
</tr>
</thead>
@php
@@ -372,17 +372,17 @@
<table class="inventory">
<thead>
<tr>
- <th colspan="10">{{ trans('general.components') }}</th>
+ <th scope="col" colspan="10">{{ trans('general.components') }}</th>
</tr>
</thead>
<thead>
<tr>
- <th style="width: 20px;"></th>
- <th>{{ trans('admin/locations/table.asset_name') }}</th>
- <th>{{ trans('general.qty') }}</th>
- <th>{{ trans('admin/locations/table.asset_category') }}</th>
- <th>{{ trans('admin/locations/table.asset_manufacturer') }}</th>
- <th>{{ trans('admin/models/table.modelnumber') }}</th>
+ <th scope="col" style="width: 20px;"></th>
+ <th scope="col">{{ trans('admin/locations/table.asset_name') }}</th>
+ <th scope="col">{{ trans('general.qty') }}</th>
+ <th scope="col">{{ trans('admin/locations/table.asset_category') }}</th>
+ <th scope="col">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
+ <th scope="col">{{ trans('admin/models/table.modelnumber') }}</th>
</tr>
</thead>
@php
diff --git a/resources/views/partials/assets-assigned.blade.php b/resources/views/partials/assets-assigned.blade.php
index 9395e08def..0ca4cfdf3c 100644
--- a/resources/views/partials/assets-assigned.blade.php
+++ b/resources/views/partials/assets-assigned.blade.php
@@ -27,10 +27,10 @@
table_html += '<div class="col-md-12">';
table_html += '<table class="table table-striped">';
table_html += '<thead><tr>';
- table_html += '<th></th>';
- table_html += '<th>{{ trans('admin/hardware/form.name') }}</th>';
- table_html += '<th>{{ trans('admin/hardware/form.tag') }}</th>';
- table_html += '<th>{{ trans('admin/hardware/form.serial') }}</th>';
+ table_html += '<th scope="col"></th>';
+ table_html += '<th scope="col">{{ trans('admin/hardware/form.name') }}</th>';
+ table_html += '<th scope="col">{{ trans('admin/hardware/form.tag') }}</th>';
+ table_html += '<th scope="col">{{ trans('admin/hardware/form.serial') }}</th>';
table_html += '</tr></thead><tbody>';
$('#current_assets_content').append('');
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 708881657c..38f713ab3c 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -595,6 +595,11 @@
// layout re-init), since bootstrap-table doesn't re-render the head
// on sort clicks.
var updateAriaSort = function ($tableEl, sortName, sortOrder) {
+ // scope="col" is emitted by the column presenters (see e.g.
+ // AssetPresenter::dataTableLayout). aria-sort will move upstream
+ // once we're on a bootstrap-table version that includes
+ // https://github.com/wenzhixin/bootstrap-table/pull/8005; until
+ // then we stamp it here.
$tableEl.find('thead th').each(function () {
var $th = $(this);
if (sortName && $th.data('field') === sortName) {
diff --git a/resources/views/partials/licenses-assigned.blade.php b/resources/views/partials/licenses-assigned.blade.php
index 39f2b2ea1d..a1241ab5e7 100644
--- a/resources/views/partials/licenses-assigned.blade.php
+++ b/resources/views/partials/licenses-assigned.blade.php
@@ -27,8 +27,8 @@
table_html += '<div class="col-md-12">';
table_html += '<table class="table table-striped">';
table_html += '<thead><tr>';
- table_html += '<th>{{ trans('admin/licenses/form.name') }}</th>';
- table_html += '<th>{{ trans('admin/licenses/form.license_key') }}</th>';
+ table_html += '<th scope="col">{{ trans('admin/licenses/form.name') }}</th>';
+ table_html += '<th scope="col">{{ trans('admin/licenses/form.license_key') }}</th>';
table_html += '</tr></thead><tbody>';
$('#current_license_content').append('');
diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index 8107d4951f..c6c0e4422f 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -29,11 +29,11 @@
<thead>
<tr>
- <th class="col-sm-1" data-field="company.name">{{ trans('admin/companies/table.title') }}</th>
- <th class="col-sm-1" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
- <th class="col-sm-1" data-field="model_number">{{ trans('general.model_no') }}</th>
- <th class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
- <th class="col-sm-1" data-field="remaining_qty">{{ trans('admin/accessories/general.remaining') }}</th>
+ <th scope="col" class="col-sm-1" data-field="company.name">{{ trans('admin/companies/table.title') }}</th>
+ <th scope="col" class="col-sm-1" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
+ <th scope="col" class="col-sm-1" data-field="model_number">{{ trans('general.model_no') }}</th>
+ <th scope="col" class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
+ <th scope="col" class="col-sm-1" data-field="remaining_qty">{{ trans('admin/accessories/general.remaining') }}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php
index 88af0a68ce..deb3b47e92 100644
--- a/resources/views/reports/asset.blade.php
+++ b/resources/views/reports/asset.blade.php
@@ -36,32 +36,32 @@
<thead>
<tr>
@if ($requestStatus!='Deleted')
- <th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
+ <th scope="col" data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
@endif
- <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
- <th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
- <th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
- <th data-sortable="true" data-field="asset_tag">{{ trans('admin/hardware/table.asset_tag') }}</th>
- <th data-sortable="true" data-field="serial">{{ trans('admin/hardware/table.serial') }}</th>
- <th data-sortable="true" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
- <th data-sortable="true" data-field="model_number" data-visible="false">{{ trans('admin/models/table.modelnumber') }}</th>
- <th data-sortable="true" data-field="status_label">{{ trans('admin/hardware/table.status') }}</th>
- <th data-sortable="true" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
- <th data-sortable="true" data-field="employee_number">{{ trans('general.employee_number') }}</th>
- <th data-sortable="true" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
- <th data-sortable="true" data-field="category" data-searchable="true">{{ trans('general.category') }}</th>
- <th data-sortable="true" data-field="manufacturer" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>
- <th data-sortable="true" data-field="purchase_cost" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.cost') }}</th>
- <th data-sortable="true" data-field="purchase_date" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.date') }}</th>
- <th data-sortable="false" data-field="eol" data-searchable="true">{{ trans('general.eol') }}</th>
- <th data-sortable="true" data-searchable="true" data-field="notes">{{ trans('general.notes') }}</th>
- <th data-sortable="true" data-searchable="true" data-field="order_number">{{ trans('admin/hardware/form.order') }}</th>
- <th data-sortable="true" data-searchable="true" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
- <th data-sortable="true" data-field="expected_checkin" data-searchable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+ <th scope="col" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
+ <th scope="col" data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
+ <th scope="col" data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
+ <th scope="col" data-sortable="true" data-field="asset_tag">{{ trans('admin/hardware/table.asset_tag') }}</th>
+ <th scope="col" data-sortable="true" data-field="serial">{{ trans('admin/hardware/table.serial') }}</th>
+ <th scope="col" data-sortable="true" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
+ <th scope="col" data-sortable="true" data-field="model_number" data-visible="false">{{ trans('admin/models/table.modelnumber') }}</th>
+ <th scope="col" data-sortable="true" data-field="status_label">{{ trans('admin/hardware/table.status') }}</th>
+ <th scope="col" data-sortable="true" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
+ <th scope="col" data-sortable="true" data-field="employee_number">{{ trans('general.employee_number') }}</th>
+ <th scope="col" data-sortable="true" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
+ <th scope="col" data-sortable="true" data-field="category" data-searchable="true">{{ trans('general.category') }}</th>
+ <th scope="col" data-sortable="true" data-field="manufacturer" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>
+ <th scope="col" data-sortable="true" data-field="purchase_cost" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.cost') }}</th>
+ <th scope="col" data-sortable="true" data-field="purchase_date" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.date') }}</th>
+ <th scope="col" data-sortable="false" data-field="eol" data-searchable="true">{{ trans('general.eol') }}</th>
+ <th scope="col" data-sortable="true" data-searchable="true" data-field="notes">{{ trans('general.notes') }}</th>
+ <th scope="col" data-sortable="true" data-searchable="true" data-field="order_number">{{ trans('admin/hardware/form.order') }}</th>
+ <th scope="col" data-sortable="true" data-searchable="true" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
+ <th scope="col" data-sortable="true" data-field="expected_checkin" data-searchable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
@foreach(\App\Models\CustomField::all() AS $field)
- <th data-sortable="{{ ($field->field_encrypted=='1' ? 'false' : 'true') }}" data-visible="false" data-field="{{$field->db_column_name()}}">
+ <th scope="col" data-sortable="{{ ($field->field_encrypted=='1' ? 'false' : 'true') }}" data-visible="false" data-field="{{$field->db_column_name()}}">
@if ($field->field_encrypted=='1')
<i class="fas fa-lock"></i>
@endif
@@ -70,7 +70,7 @@
</th>
@endforeach
- <th data-sortable="true" data-field="created_at" data-searchable="true" data-visible="false">{{ trans('general.created_at') }}</th>
+ <th scope="col" data-sortable="true" data-field="created_at" data-searchable="true" data-visible="false">{{ trans('general.created_at') }}</th>
</tr>
</thead>
diff --git a/resources/views/reports/audit.blade.php b/resources/views/reports/audit.blade.php
index 29b168d86e..415602d6f4 100644
--- a/resources/views/reports/audit.blade.php
+++ b/resources/views/reports/audit.blade.php
@@ -30,14 +30,14 @@
<thead>
<tr>
- <th class="col-sm-1" data-field="file" data-visible="false" data-formatter="auditImageFormatter">{{ trans('general.image') }}</th>
- <th class="col-sm-2" data-field="created_by" data-sortable="true" data-searchable="true" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
- <th class="col-sm-2" data-field="item" data-sortable="true" data-searchable="true" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
- <th class="col-sm-1" data-field="location" data-sortable="true" data-searchable="true" data-formatter="locationsLinkObjFormatter">{{ trans('general.location') }}</th>
- <th class="col-sm-2" data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true" data-searchable="true">{{ trans('general.last_audit') }}</th>
- <th class="col-sm-2" data-field="next_audit_date" data-formatter="dateDisplayFormatter">{{ trans('general.next_audit_date') }}</th>
- <th class="col-sm-1" data-field="days_to_next_audit">{{ trans('general.days_to_next_audit') }}</th>
- <th class="col-sm-2" data-field="note" data-sortable="true" data-searchable="true">{{ trans('general.notes') }}</th>
+ <th scope="col" class="col-sm-1" data-field="file" data-visible="false" data-formatter="auditImageFormatter">{{ trans('general.image') }}</th>
+ <th scope="col" class="col-sm-2" data-field="created_by" data-sortable="true" data-searchable="true" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
+ <th scope="col" class="col-sm-2" data-field="item" data-sortable="true" data-searchable="true" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+ <th scope="col" class="col-sm-1" data-field="location" data-sortable="true" data-searchable="true" data-formatter="locationsLinkObjFormatter">{{ trans('general.location') }}</th>
+ <th scope="col" class="col-sm-2" data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true" data-searchable="true">{{ trans('general.last_audit') }}</th>
+ <th scope="col" class="col-sm-2" data-field="next_audit_date" data-formatter="dateDisplayFormatter">{{ trans('general.next_audit_date') }}</th>
+ <th scope="col" class="col-sm-1" data-field="days_to_next_audit">{{ trans('general.days_to_next_audit') }}</th>
+ <th scope="col" class="col-sm-2" data-field="note" data-sortable="true" data-searchable="true">{{ trans('general.notes') }}</th>
</tr>
</thead>
</table>
diff --git a/resources/views/reports/licenses.blade.php b/resources/views/reports/licenses.blade.php
index ddcd5ccac0..5c89a0613d 100644
--- a/resources/views/reports/licenses.blade.php
+++ b/resources/views/reports/licenses.blade.php
@@ -26,18 +26,18 @@
}'>
<thead>
<tr role="row">
- <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
- <th class="col-sm-1">{{ trans('admin/licenses/table.title') }}</th>
- <th class="col-sm-1">{{ trans('admin/licenses/form.license_key') }}</th>
- <th class="col-sm-1">{{ trans('admin/licenses/form.seats') }}</th>
- <th class="col-sm-1">{{ trans('admin/licenses/form.remaining_seats') }}</th>
- <th class="col-sm-1">{{ trans('admin/licenses/form.expiration') }}</th>
- <th class="col-sm-1">{{ trans('admin/licenses/form.termination_date') }}</th>
- <th class="col-sm-1">{{ trans('general.purchase_date') }}</th>
- <th class="col-sm-1 text-right" class="col-sm-1">{{ trans('general.purchase_cost') }}</th>
- <th class="col-sm-1">{{ trans('general.depreciation') }}</th>
- <th class="col-sm-1 text-right">{{ trans('admin/hardware/table.book_value') }}</th>
- <th class="col-sm-1 text-right">{{ trans('admin/hardware/table.diff') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/licenses/table.title') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/licenses/form.license_key') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/licenses/form.seats') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/licenses/form.remaining_seats') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/licenses/form.expiration') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('admin/licenses/form.termination_date') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('general.purchase_date') }}</th>
+ <th scope="col" class="col-sm-1 text-right" class="col-sm-1">{{ trans('general.purchase_cost') }}</th>
+ <th scope="col" class="col-sm-1">{{ trans('general.depreciation') }}</th>
+ <th scope="col" class="col-sm-1 text-right">{{ trans('admin/hardware/table.book_value') }}</th>
+ <th scope="col" class="col-sm-1 text-right">{{ trans('admin/hardware/table.diff') }}</th>
</tr>
</thead>
diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php
index 9df4ed9a33..125d1bf54c 100644
--- a/resources/views/reports/unaccepted_assets.blade.php
+++ b/resources/views/reports/unaccepted_assets.blade.php
@@ -51,15 +51,15 @@
}'>
<thead>
<tr role="row">
- <th class="col-sm-1" data-field="created_at" data-searchable="false" data-sortable="true">{{ trans('general.date') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('general.type') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('admin/companies/table.title') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('general.category') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/form.model') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('general.name') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/table.asset_tag') }}</th>
- <th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/table.checkoutto') }}</th>
- <th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
+ <th scope="col" class="col-sm-1" data-field="created_at" data-searchable="false" data-sortable="true">{{ trans('general.date') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('general.type') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('admin/companies/table.title') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('general.category') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/form.model') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('general.name') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/table.asset_tag') }}</th>
+ <th scope="col" class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/table.checkoutto') }}</th>
+ <th scope="col" class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index ea729aa46e..1046d40b1f 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -74,11 +74,11 @@
class="table table-striped snipe-table">
<thead>
<tr>
- <th data-sortable="true">{{ trans('general.file_name') }}</th>
- <th data-sortable="true" data-field="modified_display" data-sort-name="modified_value">{{ trans('admin/settings/table.created') }}</th>
- <th data-field="modified_value" data-visible="false"></th>
- <th data-sortable="true">{{ trans('admin/settings/table.size') }}</th>
- <th>{{ trans('table.actions') }}</th>
+ <th scope="col" data-sortable="true">{{ trans('general.file_name') }}</th>
+ <th scope="col" data-sortable="true" data-field="modified_display" data-sort-name="modified_value">{{ trans('admin/settings/table.created') }}</th>
+ <th scope="col" data-field="modified_value" data-visible="false"></th>
+ <th scope="col" data-sortable="true">{{ trans('admin/settings/table.size') }}</th>
+ <th scope="col">{{ trans('table.actions') }}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index fc80760528..d229a00348 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -1015,7 +1015,7 @@
]
let header = '<thead><tr>'
for (var i in keys) {
- header += '<th style="white-space: nowrap;">' + keys[i] + '</th>'
+ header += '<th scope="col" style="white-space: nowrap;">' + keys[i] + '</th>'
}
header += "</tr></thead>"
return header;
diff --git a/resources/views/settings/logins.blade.php b/resources/views/settings/logins.blade.php
index 0d7bc86034..6203b165c4 100644
--- a/resources/views/settings/logins.blade.php
+++ b/resources/views/settings/logins.blade.php
@@ -30,11 +30,11 @@
<thead>
<tr>
- <th class="col-sm-2" data-field="username" data-visible="true" data-sortable="true">{{ trans('mail.username') }}</th>
- <th class="col-sm-2" data-field="created_at" data-visible="true" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('admin/settings/general.login_attempt') }}</th>
- <th class="col-sm-2" data-field="user_agent" data-visible="true" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
- <th class="col-sm-2" data-field="remote_ip" data-visible="true" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
- <th class="col-sm-2" data-field="successful" data-visible="true" data-formatter="trueFalseFormatter" data-sortable="true">{{ trans('admin/settings/general.login_success') }}</th>
+ <th scope="col" class="col-sm-2" data-field="username" data-visible="true" data-sortable="true">{{ trans('mail.username') }}</th>
+ <th scope="col" class="col-sm-2" data-field="created_at" data-visible="true" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('admin/settings/general.login_attempt') }}</th>
+ <th scope="col" class="col-sm-2" data-field="user_agent" data-visible="true" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
+ <th scope="col" class="col-sm-2" data-field="remote_ip" data-visible="true" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
+ <th scope="col" class="col-sm-2" data-field="successful" data-visible="true" data-formatter="trueFalseFormatter" data-sortable="true">{{ trans('admin/settings/general.login_success') }}</th>
</tr>
</thead>
</table>
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index 8602166ef9..d1d6892a91 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -14,9 +14,9 @@ Create a User ::
<table class="table">
<thead>
<tr>
- <th class="col-lg-2">Setting</th>
- <th class="col-lg-1">Valid</th>
- <th class="col-lg-9">Notes</th>
+ <th scope="col" class="col-lg-2">Setting</th>
+ <th scope="col" class="col-lg-1">Valid</th>
+ <th scope="col" class="col-lg-9">Notes</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 464e99a66a..9c08e82711 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -60,28 +60,28 @@
</td>
</tr>
<tr>
- <th class="col-md-1">
+ <th scope="col" class="col-md-1">
<!-- <input type="checkbox" id="checkAll"> -->
</th>
- <th class="col-md-3">{{ trans('general.name') }}</th>
- <th class="col-md-3">{{ trans('general.groups') }}</th>
- <th class="text-right">
+ <th scope="col" class="col-md-3">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.groups') }}</th>
+ <th scope="col" class="text-right">
<i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.assets') }}</span>
</th>
- <th class="text-right">
+ <th scope="col" class="text-right">
<i class="far fa-keyboard fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.accessories') }}</span>
</th>
- <th class="text-right">
+ <th scope="col" class="text-right">
<i class="far fa-save fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.licenses') }}</span>
</th>
- <th class="text-right">
+ <th scope="col" class="text-right">
<i class="fas fa-tint fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.consumables') }}</span>
</th>
- <th class="text-right">
+ <th scope="col" class="text-right">
<i class="fas fa-paperclip fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.files') }}</span>
</th>
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index 9e75284336..302487668d 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -45,28 +45,28 @@
<table class="display table table-hover">
<thead>
<tr>
- <th class="col-md-3">{{ trans('general.name') }}</th>
- <th class="col-md-3">{{ trans('general.email') }}</th>
- <th class="col-md-3">{{ trans('general.username') }}</th>
- <th class="col-md-3">{{ trans('general.employee_number') }}</th>
- <th class="col-md-3">{{ trans('general.groups') }}</th>
- <th class="col-md-1 text-right">
+ <th scope="col" class="col-md-3">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.email') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.username') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.employee_number') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.groups') }}</th>
+ <th scope="col" class="col-md-1 text-right">
<i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.assets') }}</span>
</th>
- <th class="col-md-1 text-right">
+ <th scope="col" class="col-md-1 text-right">
<i class="far fa-keyboard fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.accessories') }}</span>
</th>
- <th class="col-md-1 text-right">
+ <th scope="col" class="col-md-1 text-right">
<i class="far fa-save fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.licenses') }}</span>
</th>
- <th class="col-md-1 text-right">
+ <th scope="col" class="col-md-1 text-right">
<i class="fas fa-tint fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.consumables') }}</span>
</th>
- <th class="col-md-1 text-right">
+ <th scope="col" class="col-md-1 text-right">
<i class="fas fa-paperclip fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.files') }}</span>
</th>
diff --git a/resources/views/users/ldap.blade.php b/resources/views/users/ldap.blade.php
index 937e894518..dcec3060c1 100644
--- a/resources/views/users/ldap.blade.php
+++ b/resources/views/users/ldap.blade.php
@@ -75,14 +75,14 @@
}'>
<thead>
<tr>
- <th data-sortable="true" data-visible="false" data-searchable="true">{{ trans('general.id') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.username') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('admin/users/table.display_name') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.employee_number') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.first_name') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.last_name') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.email') }}</th>
- <th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.notes') }}</th>
+ <th scope="col" data-sortable="true" data-visible="false" data-searchable="true">{{ trans('general.id') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.username') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('admin/users/table.display_name') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.employee_number') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.first_name') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.last_name') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.email') }}</th>
+ <th scope="col" data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.notes') }}</th>
</tr>
</thead>
<tbody>
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 00294fcedd..866b0319e9 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -129,17 +129,17 @@
data-show-columns="true"
data-cookie-id-table="AssetsAssigned">
<thead>
- <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
- <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
- <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
- <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>
- <th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>
- <th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>
- <th data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>
- <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
- <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
- <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
- <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
+ <th scope="col" data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
+ <th scope="col" data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
+ <th scope="col" data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
+ <th scope="col" data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>
+ <th scope="col" data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>
+ <th scope="col" data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>
+ <th scope="col" data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>
+ <th scope="col" data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
+ <th scope="col" data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
+ <th scope="col" data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+ <th scope="col" data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
</thead>
<tbody>
@foreach ($show_user->assets as $asset)
@@ -197,11 +197,11 @@
data-cookie-id-table="licensessAssigned">
<thead>
<tr>
- <th data-sortable="false" data-switchable="false">#</th>
- <th data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
- <th data-sortable="true">{{ trans('admin/licenses/form.license_key') }}</th>
- <th data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
- <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
+ <th scope="col" data-sortable="false" data-switchable="false">#</th>
+ <th scope="col" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
+ <th scope="col" data-sortable="true">{{ trans('admin/licenses/form.license_key') }}</th>
+ <th scope="col" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+ <th scope="col" data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
</tr>
</thead>
@php
@@ -261,12 +261,12 @@
data-cookie-id-table="accessoriesAssigned">
<thead>
<tr>
- <th style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
- <th data-field="accessory_image" data-sortable="true" data-visible="true">{{ trans('general.image') }}</th>
- <th style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
- <th style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
- <th style="width: 10%;" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
- <th style="width: 10%;" data-sortable="true">{{ trans('general.signature') }}</th>
+ <th scope="col" style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
+ <th scope="col" data-field="accessory_image" data-sortable="true" data-visible="true">{{ trans('general.image') }}</th>
+ <th scope="col" style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
+ <th scope="col" style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
+ <th scope="col" style="width: 10%;" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+ <th scope="col" style="width: 10%;" data-sortable="true">{{ trans('general.signature') }}</th>
</tr>
</thead>
@php
@@ -327,11 +327,11 @@
data-cookie-id-table="consumablesAssigned">
<thead>
<tr>
- <th style="width: 20px;" data-sortable="false" data-switchable="false"></th>
- <th style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
- <th style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
- <th style="width: 10%;" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
- <th style="width: 10%;" data-sortable="true">{{ trans('general.signature') }}</th>
+ <th scope="col" style="width: 20px;" data-sortable="false" data-switchable="false"></th>
+ <th scope="col" style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
+ <th scope="col" style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
+ <th scope="col" style="width: 10%;" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+ <th scope="col" style="width: 10%;" data-sortable="true">{{ trans('general.signature') }}</th>
</tr>
</thead>
@@ -394,11 +394,11 @@
$indirectAssignmentsCounter = 1;
@endphp
<tr>
- <th style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
- <th style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('mail.assigned_to') }}</th>
- <th style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
- <th style="width: 10%;" data-sortable="true">{{ trans('mail.item') }}</th>
- <th style="width: 10%;" data-sortable="true">{{ trans('general.quantity') }}</th>
+ <th scope="col" style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
+ <th scope="col" style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('mail.assigned_to') }}</th>
+ <th scope="col" style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
+ <th scope="col" style="width: 10%;" data-sortable="true">{{ trans('mail.item') }}</th>
+ <th scope="col" style="width: 10%;" data-sortable="true">{{ trans('general.quantity') }}</th>
</tr>
</thead>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 51a923c13d..f302db4d7a 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -359,14 +359,14 @@
<thead>
<tr>
@can('checkin', \App\Models\License::class)
- <th class="hidden-print"><input type="checkbox" id="userLicenseSelectAll"></th>
+ <th scope="col" class="hidden-print"><input type="checkbox" id="userLicenseSelectAll"></th>
@endcan
- <th>{{ trans('general.name') }}</th>
- <th>{{ trans('admin/licenses/form.license_key') }}</th>
- <th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
- <th>{{ trans('admin/licenses/form.purchase_order') }}</th>
- <th>{{ trans('general.order_number') }}</th>
- <th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
+ <th scope="col">{{ trans('general.name') }}</th>
+ <th scope="col">{{ trans('admin/licenses/form.license_key') }}</th>
+ <th scope="col" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+ <th scope="col">{{ trans('admin/licenses/form.purchase_order') }}</th>
+ <th scope="col">{{ trans('general.order_number') }}</th>
+ <th scope="col" class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
</tr>
</thead>
<tbody>
@@ -433,12 +433,12 @@
}'>
<thead>
<tr>
- <th>{{ trans('general.id') }}</th>
- <th>{{ trans('general.name') }}</th>
- <th>{{ trans('general.date') }}</th>
- <th data-fieldname="note">{{ trans('general.notes') }}</th>
- <th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.unit_cost') }}</th>
- <th class="hidden-print">{{ trans('general.action') }}</th>
+ <th scope="col">{{ trans('general.id') }}</th>
+ <th scope="col">{{ trans('general.name') }}</th>
+ <th scope="col">{{ trans('general.date') }}</th>
+ <th scope="col" data-fieldname="note">{{ trans('general.notes') }}</th>
+ <th scope="col" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.unit_cost') }}</th>
+ <th scope="col" class="hidden-print">{{ trans('general.action') }}</th>
</tr>
</thead>
<tbody>
@@ -481,10 +481,10 @@
}'>
<thead>
<tr>
- <th class="col-md-3">{{ trans('general.name') }}</th>
- <th class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.unit_cost') }}</th>
- <th class="col-md-2">{{ trans('general.date') }}</th>
- <th class="col-md-5">{{ trans('general.notes') }}</th>
+ <th scope="col" class="col-md-3">{{ trans('general.name') }}</th>
+ <th scope="col" class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.unit_cost') }}</th>
+ <th scope="col" class="col-md-2">{{ trans('general.date') }}</th>
+ <th scope="col" class="col-md-5">{{ trans('general.notes') }}</th>
</tr>
</thead>
<tbody>
@@ -565,11 +565,11 @@
}'>
<thead>
<tr>
- <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
- <th data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
- <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
- <th data-field="note">{{ trans('general.notes') }}</th>
- <th data-field="url" data-formatter="fileDownloadButtonsFormatter">{{ trans('general.download') }}</th>
+ <th scope="col" data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+ <th scope="col" data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
+ <th scope="col" data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
+ <th scope="col" data-field="note">{{ trans('general.notes') }}</th>
+ <th scope="col" data-field="url" data-formatter="fileDownloadButtonsFormatter">{{ trans('general.download') }}</th>
</tr>
</thead>
</table>