Skip to content

A free open source IT asset/license management system

Switched add new button to “+”, converted to blade component

snipe3af644ee8249
diff --git a/resources/views/blade/button/modal-add.blade.php b/resources/views/blade/button/modal-add.blade.php
new file mode 100644
index 0000000000..4fcfc6e9a8
--- /dev/null
+++ b/resources/views/blade/button/modal-add.blade.php
@@ -0,0 +1,19 @@
+@props([
+ 'type' => null,
+ 'target',
+ 'routeArgs' => null,
+])
+
+<a
+ href="{{ route('modal.show', $routeArgs ?? $type) }}"
+ data-toggle="modal"
+ data-target="#createModal"
+ data-select="{{ $target }}"
+ class="btn btn-theme"
+ data-tooltip="true"
+ data-placement="top"
+ data-title="{{ trans('general.create') }}"
+ aria-label="{{ trans('general.create') }}"
+>
+ <x-icon type="create" class="fa-fw"/>
+</a>
diff --git a/resources/views/blade/input/accessory-select.blade.php b/resources/views/blade/input/accessory-select.blade.php
index 3cab4e8361..17551f9438 100644
--- a/resources/views/blade/input/accessory-select.blade.php
+++ b/resources/views/blade/input/accessory-select.blade.php
@@ -53,7 +53,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', Accessory::class)
- <a href="{{ route('modal.show', 'accessory') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="accessory" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/category-select.blade.php b/resources/views/blade/input/category-select.blade.php
index eb92fb81a5..7eab8aaaac 100644
--- a/resources/views/blade/input/category-select.blade.php
+++ b/resources/views/blade/input/category-select.blade.php
@@ -55,7 +55,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', Category::class)
- <a href="{{ route('modal.show', ['type' => 'category', 'category_type' => $categoryType]) }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add :routeArgs="['type' => 'category', 'category_type' => $categoryType]" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/company-select.blade.php b/resources/views/blade/input/company-select.blade.php
index d0ef51ead8..bbf026a25c 100644
--- a/resources/views/blade/input/company-select.blade.php
+++ b/resources/views/blade/input/company-select.blade.php
@@ -70,7 +70,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', Company::class)
- <a href="{{ route('modal.show', 'company') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="company" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/consumable-select.blade.php b/resources/views/blade/input/consumable-select.blade.php
index 5b159f561b..c82c0b2faf 100644
--- a/resources/views/blade/input/consumable-select.blade.php
+++ b/resources/views/blade/input/consumable-select.blade.php
@@ -53,7 +53,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', Consumable::class)
- <a href="{{ route('modal.show', 'consumable') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="consumable" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/license-select.blade.php b/resources/views/blade/input/license-select.blade.php
index 6802268023..8d27206b02 100644
--- a/resources/views/blade/input/license-select.blade.php
+++ b/resources/views/blade/input/license-select.blade.php
@@ -53,7 +53,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', License::class)
- <a href="{{ route('modal.show', 'license') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="license" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/location-select.blade.php b/resources/views/blade/input/location-select.blade.php
index 549d68ab1c..d214e69651 100644
--- a/resources/views/blade/input/location-select.blade.php
+++ b/resources/views/blade/input/location-select.blade.php
@@ -65,7 +65,7 @@
<div class="col-md-1 col-sm-1 text-left">
@unless($hideNewButton)
@can('create', Location::class)
- <a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $selectId }}' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="location" :target="$selectId"/>
@endcan
@endunless
</div>
diff --git a/resources/views/blade/input/manufacturer-select.blade.php b/resources/views/blade/input/manufacturer-select.blade.php
index b8331cbdf2..58a145424e 100644
--- a/resources/views/blade/input/manufacturer-select.blade.php
+++ b/resources/views/blade/input/manufacturer-select.blade.php
@@ -53,7 +53,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', Manufacturer::class)
- <a href="{{ route('modal.show', 'manufacturer') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="manufacturer" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/model-select.blade.php b/resources/views/blade/input/model-select.blade.php
index 2582e311e1..a0d68e1ef3 100644
--- a/resources/views/blade/input/model-select.blade.php
+++ b/resources/views/blade/input/model-select.blade.php
@@ -53,7 +53,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', AssetModel::class)
- <a href="{{ route('modal.show', 'model') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="model" :target="$selectId"/>
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;">
<i class="fas fa-spinner fa-spin" aria-hidden="true"></i>
</span>
diff --git a/resources/views/blade/input/supplier-select.blade.php b/resources/views/blade/input/supplier-select.blade.php
index d6bde07af2..52a15a956b 100644
--- a/resources/views/blade/input/supplier-select.blade.php
+++ b/resources/views/blade/input/supplier-select.blade.php
@@ -55,7 +55,7 @@
@unless($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', Supplier::class)
- <a href="{{ route('modal.show', 'supplier') }}" data-toggle="modal" data-target="#createModal" data-select="{{ $selectId }}" class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="supplier" :target="$selectId"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/input/user-select.blade.php b/resources/views/blade/input/user-select.blade.php
index 4996f7e62a..12f2955488 100644
--- a/resources/views/blade/input/user-select.blade.php
+++ b/resources/views/blade/input/user-select.blade.php
@@ -67,13 +67,7 @@
@unless ($hideNewButton)
<div class="col-md-1 col-sm-1 text-left">
@can('create', User::class)
- <a
- href="{{ route('modal.show', 'user') }}"
- data-toggle="modal"
- data-target="#createModal"
- data-select="{{ $id }}"
- class="btn btn-sm btn-theme"
- >{{ trans('button.new') }}</a>
+ <x-button.modal-add type="user" :target="$id"/>
@endcan
</div>
@endunless
diff --git a/resources/views/blade/sync-adapter/form.blade.php b/resources/views/blade/sync-adapter/form.blade.php
index 3cc820e7c8..866adfcd6f 100644
--- a/resources/views/blade/sync-adapter/form.blade.php
+++ b/resources/views/blade/sync-adapter/form.blade.php
@@ -184,13 +184,7 @@
</x-slot:input>
<x-slot:after_input>
@can('create', \App\Models\Statuslabel::class)
- <a
- href="{{ route('modal.show', ['type' => 'statuslabel']) }}"
- data-toggle="modal"
- data-target="#createModal"
- data-select="{{ $slug . '_default_status_id' }}"
- class="btn btn-sm btn-theme"
- >{{ trans('button.new') }}</a>
+ <x-button.modal-add type="statuslabel" :target="$slug.'_default_status_id'"/>
@endcan
</x-slot:after_input>
</x-form.row>
diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index a5c302703f..8a449699f2 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -28,7 +28,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Category::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
- <a href='{{ route('modal.show',['type' => 'category', 'category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal" data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add :routeArgs="['type' => 'category', 'category_type' => isset($category_type) ? $category_type : 'assets']" target="category_select_id"/>
@endif
@endcan
</div>
diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
index 65855eed8a..fd83a6557c 100644
--- a/resources/views/partials/forms/edit/location-select.blade.php
+++ b/resources/views/partials/forms/edit/location-select.blade.php
@@ -22,7 +22,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Location::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
- <a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="location" :target="$fieldname.'_location_select'"/>
@endif
@endcan
</div>
diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index cff3779ec1..7363cb8c31 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -35,11 +35,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\MaintenanceType::class)
- <a href="{{ route('modal.show', 'maintenance-type') }}"
- data-toggle="modal"
- data-target="#createModal"
- data-select="maintenance_type_id"
- class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="maintenance-type" target="maintenance_type_id"/>
@endcan
</div>
</div>
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index bddd47a4c3..28ff3c7091 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -31,7 +31,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Manufacturer::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
- <a href='{{ route('modal.show', 'manufacturer') }}' data-toggle="modal" data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="manufacturer" target="manufacturer_select_id"/>
@endif
@endcan
</div>
diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index c75f00cb9c..0c3c515ecd 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -28,7 +28,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\AssetModel::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
- <a href='{{ route('modal.show', 'model') }}' data-toggle="modal" data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="model" target="model_select_id"/>
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;">
<i class="fas fa-spinner fa-spin" aria-hidden="true"></i>
</span>
diff --git a/resources/views/partials/forms/edit/status-select.blade.php b/resources/views/partials/forms/edit/status-select.blade.php
index 60f8b155cd..2ee9dfb514 100644
--- a/resources/views/partials/forms/edit/status-select.blade.php
+++ b/resources/views/partials/forms/edit/status-select.blade.php
@@ -24,7 +24,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Statuslabel::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
- <a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="statuslabel" target="status_select_id"/>
@endif
@endcan
</div>
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index 4a7d1c0cb2..652b31039d 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -17,7 +17,7 @@
<div class="col-md-2 col-sm-2 text-left">
@can('create', \App\Models\Statuslabel::class)
- <a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="statuslabel" target="status_select_id"/>
@endcan
<span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> </span>
diff --git a/resources/views/partials/forms/edit/supplier-select.blade.php b/resources/views/partials/forms/edit/supplier-select.blade.php
index 8bf1556ea2..81f08c8f61 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -22,7 +22,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Supplier::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
- <a href='{{ route('modal.show', 'supplier') }}' data-toggle="modal" data-target="#createModal" data-select='supplier_select' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
+ <x-button.modal-add type="supplier" target="supplier_select"/>
@endif
@endcan
</div>