Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/views/hardware/view.blade.php

@@ -269,7 +269,7 @@
                                     @can('audit', \App\Models\Asset::class)
                                         <div class="col-md-12 hidden-print" style="padding-top: 5px;">
                                         <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                            <a href="{{ route('asset.audit.create', $asset->id)  }}" class="btn btn-sm btn-theme btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                            <a href="{{ route('asset.audit.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
                                                  <x-icon type="audit" />
                                              {{ trans('general.audit') }}
                                             </a>

resources/views/partials/asset-bulk-actions.blade.php

@@ -24,7 +24,7 @@ class="form-inline"
         @else
 
             @can('update', \App\Models\Asset::class)
-                <option value="edit">{{ trans('button.edit') }}</option>
+                <option value="edit">{{ trans('general.bulk_edit') }}</option>
                 <option value="maintenance">{{ trans('button.add_maintenance') }}</option>
             @endcan
 
@@ -35,7 +35,7 @@ class="form-inline"
             @endif
 
             @can('delete', \App\Models\Asset::class)
-                <option value="delete">{{ trans('button.delete') }}</option>
+                <option value="delete">{{ trans('general.bulk_delete') }}</option>
             @endcan
 
             <option value="labels" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=l" : ''}}>{{ trans_choice('button.generate_labels', 2) }}</option>

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

@@ -1041,7 +1041,7 @@ function licenseKeyFormatter(value, row) {
 
 
     function hardwareAuditFormatter(value, row) {
-        return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
+        return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
     }
 
 
@@ -1074,7 +1074,7 @@ function genericActionsFormatter(owner_name, element_name) {
             }
 
             if ((row.available_actions) && (row.available_actions.audit === true)) {
-                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" class="fa-fw" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" class="fa-fw" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {