Skip to content

A free open source IT asset/license management system

Small fixes for accessory views when archived/deleted

snipe1a7c51ccc77e
diff --git a/resources/views/accessories/bulk-delete.blade.php b/resources/views/accessories/bulk-delete.blade.php
index 56b06e248e..80a96932bf 100644
--- a/resources/views/accessories/bulk-delete.blade.php
+++ b/resources/views/accessories/bulk-delete.blade.php
@@ -9,12 +9,12 @@
{{-- Page content --}}
@section('content')
<x-container class="col-md-8 col-md-offset-2">
- <p>{{ trans('admin/accessories/general.bulk_delete_help') }}</p>
+ <p>{{ trans('general.bulk_delete_help', ['items' => trans('general.accessories')]) }}</p>
<x-form route="{{ route('accessories.bulkdelete.store') }}">
<x-box>
<x-callout type="warning" icon="warning" live="assertive">
- {{ trans_choice('admin/accessories/general.bulk_delete_warn', count($accessories), ['accessory_count' => count($accessories)]) }}
+ {{ trans_choice('general.bulk_delete_warn', count($accessories), ['count' => count($accessories), 'item' => trans('general.accessory'), 'items' => trans('general.accessories')]) }}
</x-callout>
<table class="table table-striped">
diff --git a/resources/views/accessories/bulk-edit.blade.php b/resources/views/accessories/bulk-edit.blade.php
index 3da0db8bd0..0481ff00a5 100644
--- a/resources/views/accessories/bulk-edit.blade.php
+++ b/resources/views/accessories/bulk-edit.blade.php
@@ -12,11 +12,11 @@
<x-form :route="route('accessories.bulkedit.store')">
<x-box>
<x-slot:header>
- {{ trans_choice('admin/accessories/general.bulk_edit_warn', count($accessories), ['accessory_count' => count($accessories)]) }}
+ {{ trans_choice('general.bulk_edit_warn', count($accessories), ['count' => count($accessories), 'item' => trans('general.accessory'), 'items' => trans('general.accessories')]) }}
</x-slot:header>
<x-callout type="info" icon="tip" live="polite">
- {{ trans('admin/accessories/general.bulk_edit_help') }}
+ {{ trans('general.bulk_edit_help', ['items' => trans('general.accessories')]) }}
</x-callout>
<table class="table table-striped" style="margin-bottom: 25px; border-bottom: 1px solid light-dark(#eeeeee, #656464);">
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 4030197e48..5b5f26a935 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -165,7 +165,7 @@
<form method="POST" action="{{ route('accessories.unarchive', $accessory) }}" class="inline pull-right">
@csrf
<button class="btn btn-sm btn-warning hidden-print" data-tooltip="true" data-placement="top" data-title="{{ trans('general.unarchive') }}">
- <x-icon type="restore" class="fa-fw" />
+ <x-icon type="unarchive" class="fa-fw" />
</button>
</form>
@endcan