Skip to content

A free open source IT asset/license management system

Updated callouts, use livewire route

snipea4ee02553d86
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index be9ae11f5f..13f93c74ca 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -2,14 +2,10 @@
namespace App\Http\Controllers;
-use App\Helpers\Helper;
-use App\Http\Requests\CustomFieldRequest;
use App\Models\CustomField;
use App\Models\CustomFieldset;
-use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
/**
* This controller handles all actions related to Custom Asset Fields for
@@ -56,93 +52,6 @@ class CustomFieldsController extends Controller
return redirect()->route('fields.index');
}
- /**
- * Returns a view with a form to create a new custom field.
- *
- * @see CustomFieldsController::storeField()
- *
- * @author [Brady Wetherington] [<[email protected]>]
- *
- * @since [v1.8]
- */
- public function create(Request $request): View
- {
- $this->authorize('view', CustomField::class);
- $this->authorize('create', CustomField::class);
- $fieldsets = CustomFieldset::get();
-
- return view('custom_fields.fields.edit', [
- 'predefinedFormats' => Helper::predefined_formats(),
- 'customFormat' => '',
- 'fieldsets' => $fieldsets,
- 'field' => new CustomField,
- ]);
- }
-
- /**
- * Validates and stores a new custom field.
- *
- * @see CustomFieldsController::createField()
- *
- * @author [Brady Wetherington] [<[email protected]>]
- *
- * @since [v1.8]
- */
- public function store(CustomFieldRequest $request): RedirectResponse
- {
- $this->authorize('view', CustomField::class);
- $this->authorize('create', CustomField::class);
-
- $show_in_email = $request->input('show_in_email', 0);
- $display_in_user_view = $request->input('display_in_user_view', 0);
-
- // Override the display settings if the field is encrypted
- if ($request->input('field_encrypted') == '1') {
- $show_in_email = '0';
- $display_in_user_view = '0';
- }
-
- $field = new CustomField([
- 'name' => trim($request->input('name')),
- 'element' => $request->input('element'),
- 'help_text' => $request->input('help_text'),
- 'field_values' => $request->input('field_values'),
- 'field_encrypted' => $request->input('field_encrypted', 0),
- 'show_in_email' => $show_in_email,
- 'is_unique' => $request->input('is_unique', 0),
- 'display_in_user_view' => $display_in_user_view,
- 'auto_add_to_fieldsets' => $request->input('auto_add_to_fieldsets', 0),
- 'show_in_listview' => $request->input('show_in_listview', 0),
- 'show_in_requestable_list' => $request->input('show_in_requestable_list', 0),
- 'display_checkin' => $request->input('display_checkin', 0),
- 'display_checkout' => $request->input('display_checkout', 0),
- 'display_audit' => $request->input('display_audit', 0),
- 'created_by' => auth()->id(),
- ]);
-
- if ($request->filled('custom_format')) {
- $field->format = $request->input('custom_format');
- } else {
- $field->format = $request->input('format');
- }
-
- if ($field->save()) {
-
- // Sync fields with fieldsets
- $fieldset_array = $request->input('associate_fieldsets');
- if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {
- $field->fieldset()->sync(array_keys($fieldset_array));
- } else {
- $field->fieldset()->sync([]);
- }
-
- return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.create.success'));
- }
-
- return redirect()->back()->with('selected_fieldsets', $request->input('associate_fieldsets'))->withInput()
- ->with('error', trans('admin/custom_fields/message.field.create.error'));
- }
-
/**
* Detach a custom field from a fieldset.
*
@@ -192,97 +101,4 @@ class CustomFieldsController extends Controller
return redirect()->route('fields.index')
->with('success', trans('admin/custom_fields/message.field.delete.success'));
}
-
- /**
- * Return a view to edit a custom field
- *
- * @author [A. Gianotto] [<[email protected]>]
- *
- * @param int $id
- *
- * @since [v4.0]
- */
- public function edit(Request $request, CustomField $field): View|RedirectResponse
- {
- $this->authorize('update', CustomField::class);
- $fieldsets = CustomFieldset::get();
- $customFormat = '';
- if ((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
- $customFormat = $field->format;
- }
-
- return view('custom_fields.fields.edit', [
- 'field' => $field,
- 'customFormat' => $customFormat,
- 'fieldsets' => $fieldsets,
- 'predefinedFormats' => Helper::predefined_formats(),
- ]);
-
- }
-
- /**
- * Store the updated field
- *
- * @todo Allow encrypting/decrypting if encryption status changes
- *
- * @author [A. Gianotto] [<[email protected]>]
- *
- * @param int $id
- *
- * @since [v4.0]
- *
- * @throws AuthorizationException
- */
- public function update(CustomFieldRequest $request, CustomField $field): RedirectResponse
- {
- $this->authorize('update', CustomField::class);
- $show_in_email = $request->input('show_in_email', 0);
- $display_in_user_view = $request->input('display_in_user_view', 0);
-
- // Override the display settings if the field is encrypted
- if ($request->input('field_encrypted') == '1') {
- $show_in_email = '0';
- $display_in_user_view = '0';
- }
-
- $field->name = trim($request->input('name'));
- $field->element = $request->input('element');
- $field->field_values = $request->input('field_values');
- $field->created_by = auth()->id();
- $field->help_text = $request->input('help_text');
- $field->show_in_email = $show_in_email;
- $field->is_unique = $request->input('is_unique', 0);
- $field->display_in_user_view = $display_in_user_view;
- $field->auto_add_to_fieldsets = $request->input('auto_add_to_fieldsets', 0);
- $field->show_in_listview = $request->input('show_in_listview', 0);
- $field->show_in_requestable_list = $request->input('show_in_requestable_list', 0);
- $field->display_checkin = $request->input('display_checkin', 0);
- $field->display_checkout = $request->input('display_checkout', 0);
- $field->display_audit = $request->input('display_audit', 0);
-
- if ($request->input('format') == 'CUSTOM REGEX') {
- $field->format = $request->input('custom_format');
- } else {
- $field->format = $request->input('format');
- }
-
- if ($field->element == 'checkbox' || $field->element == 'radio') {
- $field->format = 'ANY';
- }
-
- if ($field->save()) {
-
- // Sync fields with fieldsets
- $fieldset_array = $request->input('associate_fieldsets');
- if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {
- $field->fieldset()->sync(array_keys($fieldset_array));
- } else {
- $field->fieldset()->sync([]);
- }
-
- return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.update.success'));
- }
-
- return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.update.error'));
- }
}
diff --git a/app/Livewire/CustomFieldEditor.php b/app/Livewire/CustomFieldEditor.php
index 91e07bd4e2..d9ffd275dc 100644
--- a/app/Livewire/CustomFieldEditor.php
+++ b/app/Livewire/CustomFieldEditor.php
@@ -58,10 +58,13 @@ class CustomFieldEditor extends Component
// the fieldset ID (matching the associate_fieldsets[id]=id POST pattern).
public array $associate_fieldsets = [];
- public function mount(?int $fieldId = null): void
+ // Signature accepts an optional CustomField for the edit route
+ // (fields/{field}/edit) and no argument for the create route
+ // (fields/create). Livewire resolves the route parameter via Laravel's
+ // model binding and passes it here.
+ public function mount(?CustomField $field = null): void
{
- if ($fieldId) {
- $field = CustomField::findOrFail($fieldId);
+ if ($field?->exists) {
$this->authorize('update', CustomField::class);
$this->fieldId = $field->id;
$this->isEdit = true;
@@ -379,6 +382,10 @@ class CustomFieldEditor extends Component
'fieldsets' => CustomFieldset::orderBy('name')->get(),
'predefinedFormats' => Helper::predefined_formats(),
'elementOptions' => $this->elementOptions(),
+ ])->layout('layouts.livewire-default', [
+ 'title' => trans('admin/custom_fields/general.custom_fields'),
+ 'helpText' => trans('admin/custom_fields/general.about_fieldsets_text'),
+ 'helpPosition' => 'right',
]);
}
}
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 4e66e01214..6009af293f 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -55,7 +55,7 @@
@if ($accessory->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $accessory->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
@if ($accessory->requireAcceptance())
<i class="far fa-envelope fa-fw" aria-hidden="true"></i>
{{ trans('admin/categories/general.required_acceptance') }}<br>
@@ -72,7 +72,7 @@
<i class="fab fa-slack fa-fw" aria-hidden="true"></i>
{{ trans('general.webhook_msg_note') }}
@endif
- </div>
+ </x-callout>
</div>
@if ($accessory->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1')
diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php
index 4c153e6aae..3c26a4f8c1 100644
--- a/resources/views/account/api.blade.php
+++ b/resources/views/account/api.blade.php
@@ -16,9 +16,9 @@
@endif
</div>
<div class="col-md-4">
- <div class="alert alert-warning"><i class="fas fa-exclamation-triangle faa-pulse animated"></i>
+ <x-alert type="warning" icon="warning">
{{ trans('account/general.api_key_warning') }}
- </div>
+ </x-alert>
<p>{{ trans('account/general.api_base_url') }}<br>
<code>{{ url('/api/v1') }}{!! trans('account/general.api_base_url_endpoint') !!}</code></p>
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index 48181398c3..b4d7b346f5 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -19,11 +19,9 @@
@if (($assets->count() < 1) && ($models->count() < 1))
<div class="col-md-12">
- <div class="alert alert-info fade in">
- <i class="fas fa-info-circle faa-pulse animated"></i>
- <strong>{{ trans('general.notification_info') }}: </strong>
+ <x-alert type="info" icon="info" :title="trans('general.notification_info')">
{{ trans('general.no_requestable') }}
- </div>
+ </x-alert>
</div>
@else
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index 0a4a6d0cbe..b416ae0e4f 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -13,15 +13,13 @@
@if ($acceptanceQuantity = \App\Models\CheckoutAcceptance::forUser(Auth::user())->pending()->sum('qty'))
<div class="row">
<div class="col-md-12">
- <div class="alert alert alert-warning fade in">
- <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-
+ <x-alert type="warning" icon="warning">
<strong>
<a href="{{ route('account.accept') }}" style="color: white;">
{{ trans_choice('general.unaccepted_profile_warning', $acceptanceQuantity, ['count' => $acceptanceQuantity]) }}
</a>
- </strong>
- </div>
+ </strong>
+ </x-alert>
</div>
</div>
@endif
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 8d85b47e23..615162b629 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -40,9 +40,9 @@
@if ($snipeSettings->login_note)
<div class="col-md-12">
- <div class="alert alert-info">
+ <x-alert type="info">
{!! Helper::parseEscapedMarkedown($snipeSettings->login_note) !!}
- </div>
+ </x-alert>
</div>
@endif
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index cc3b92ee13..d2371e71b5 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -36,10 +36,9 @@
<div class="login-box-body">
<div class="row">
<div class="col-md-12">
- <div class="alert alert-info">
- <x-icon type="info-circle" />
+ <x-alert type="info" icon="info-circle">
{!! trans('auth/general.username_help_top') !!}
- </div>
+ </x-alert>
</div>
diff --git a/resources/views/blade/alert.blade.php b/resources/views/blade/alert.blade.php
index 9830c93bf3..ad3fb11250 100644
--- a/resources/views/blade/alert.blade.php
+++ b/resources/views/blade/alert.blade.php
@@ -2,8 +2,11 @@
'type' => 'info',
'icon' => null,
'title' => null,
+ // 'alert' fits error/warning contexts; 'status' is more appropriate for
+ // success/info notifications that shouldn't interrupt screen readers.
+ 'role' => 'alert',
])
-<div {{ $attributes->merge(['class' => 'alert alert-'.$type.' fade in']) }} role="alert">
+<div {{ $attributes->merge(['class' => 'alert alert-'.$type.' fade in']) }} role="{{ $role }}">
@if ($icon)
<x-icon :type="$icon" />
@endif
diff --git a/resources/views/blade/callout.blade.php b/resources/views/blade/callout.blade.php
index 59f7d8dba4..8aaad04889 100644
--- a/resources/views/blade/callout.blade.php
+++ b/resources/views/blade/callout.blade.php
@@ -2,8 +2,12 @@
'type' => 'info',
'icon' => null,
'live' => 'polite',
+ // 'alert' by default; callers can pass role="status" for polite info
+ // callouts. Made a prop rather than passthrough so we don't emit two
+ // role= attributes on the tag.
+ 'role' => 'alert',
])
-<div {{ $attributes->merge(['class' => 'callout callout-'.$type]) }} role="alert" aria-live="{{ $live }}" aria-atomic="true">
+<div {{ $attributes->merge(['class' => 'callout callout-'.$type]) }} role="{{ $role }}" aria-live="{{ $live }}" aria-atomic="true">
@if ($icon)
<x-icon :type="$icon" />
diff --git a/resources/views/blade/form/checkbox-row.blade.php b/resources/views/blade/form/checkbox-row.blade.php
index f6c3e61515..e1ff597c2d 100644
--- a/resources/views/blade/form/checkbox-row.blade.php
+++ b/resources/views/blade/form/checkbox-row.blade.php
@@ -10,6 +10,11 @@
'help_text' => null,
'help_icon' => null,
'info_tooltip_text' => null,
+ // Explicit checked-state override. When passed (non-null), it wins over
+ // the old-input / $item fallback below. Needed for contexts (like
+ // Livewire) where the source of truth is neither the session's old input
+ // nor a bound Eloquent model but a live component property.
+ 'checked' => null,
// Default input column: only skip the offset when a left-hand label
// column is being rendered (i.e. multi mode with a label). Single mode
// never has a left label; multi mode without a label lays out the same
@@ -35,9 +40,13 @@
$is_redisplay = session()->hasOldInput();
if (! $is_multi) {
- $single_checked = $is_redisplay
- ? (bool) old($name)
- : (bool) ($item?->{$name} ?? false);
+ // Explicit :checked wins over any implicit source. Otherwise fall
+ // back to old input on redisplay, then to the bound $item attribute.
+ $single_checked = $checked !== null
+ ? (bool) $checked
+ : ($is_redisplay
+ ? (bool) old($name)
+ : (bool) ($item?->{$name} ?? false));
// Helper::checkIfRequired dereferences $item statically via $item::rules(),
// so it needs a real class/object. Fall back to false when no model was
@@ -73,11 +82,15 @@
$errors_class = $errors->has($name) ? ' has-error' : '';
@endphp
-<div {{ $attributes->merge(['class' => 'form-group'.$errors_class]) }}>
+<div class="form-group{{ $errors_class }}">
@if (! $is_multi)
- {{-- Single checkbox: no left-hand label column; label wraps the input. --}}
+ {{-- Single checkbox: no left-hand label column; label wraps the input.
+ $attributes are forwarded to the input itself (not the wrapper)
+ so `wire:model.live=...` from Livewire callers binds the actual
+ checkbox and not an inert div. Wrapper-level class/style props
+ would be silently dropped here; no current caller uses them. --}}
<div class="{{ $input_div_class }}">
<label class="form-control">
<x-input.checkbox
@@ -89,6 +102,7 @@
:disabled="$disabled"
:aria-label="$name"
:aria-describedby="$help_text ? $name.'-help' : null"
+ {{ $attributes }}
/>
{{ $label }}
</label>
diff --git a/resources/views/blade/notifications.blade.php b/resources/views/blade/notifications.blade.php
index ab2882f07b..aa7ce762a1 100644
--- a/resources/views/blade/notifications.blade.php
+++ b/resources/views/blade/notifications.blade.php
@@ -1,49 +1,40 @@
@if ($errors->any())
-<div class="col-md-12" id="error-notification">
- <div class="alert alert-danger fade in" role="alert" aria-live="assertive" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_error') }}:</strong>
- {{ trans('general.notification_error_hint') }}
+ <div class="col-md-12" id="error-notification">
+ <x-alert type="danger" icon="warning" :title="trans('general.notification_error')" aria-live="assertive" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ trans('general.notification_error_hint') }}
+ </x-alert>
</div>
-</div>
-
@endif
@if ($message = session()->get('status'))
<div class="col-md-12" id="success-notification">
- <div class="alert alert-success fade in" role="status" aria-live="polite" aria-atomic="true">
+ <x-alert type="success" icon="checkmark" :title="trans('general.notification_success')" role="status" aria-live="polite" aria-atomic="true">
<button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-check faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_success') }}: </strong>
{{ $message }}
- </div>
+ </x-alert>
</div>
@endif
@if ($message = session()->get('success'))
-<div class="col-md-12" id="success-notification">
- <div class="alert alert-success fade in" role="status" aria-live="polite" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-check faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_success') }}: </strong>
- {{ $message }}
+ <div class="col-md-12" id="success-notification">
+ <x-alert type="success" icon="checkmark" :title="trans('general.notification_success')" role="status" aria-live="polite" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ $message }}
+ </x-alert>
</div>
-</div>
-@include ('partials.confetti-js')
+ @include ('partials.confetti-js')
@endif
@if ($message = session()->get('success-unescaped'))
<div class="col-md-12" id="success-notification">
- <div class="alert alert-success fade in" role="status" aria-live="polite" aria-atomic="true">
+ <x-alert type="success" icon="checkmark" :title="trans('general.notification_success')" role="status" aria-live="polite" aria-atomic="true">
<button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-check faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_success') }}: </strong>
- {!! $message !!}
- </div>
+ {!! $message !!}
+ </x-alert>
</div>
@include ('partials.confetti-js')
@endif
@@ -52,10 +43,8 @@
@if ($assets = session()->get('assets'))
@foreach ($assets as $asset)
<div class="col-md-12" id="multi-error-notification">
- <div class="alert alert-info fade in" role="status" aria-live="polite" aria-atomic="true">
+ <x-alert type="info" icon="info-circle" :title="trans('general.asset_information')" role="status" aria-live="polite" aria-atomic="true">
<button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-info-circle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.asset_information') }}:</strong>
<ul>
@isset ($asset->model->name)
<li><b>{{ trans('general.model_name') }} </b> {{ $asset->model->name }}</li>
@@ -68,8 +57,7 @@
<li><b>{{ trans('general.notes') }}</b> {{ $asset->notes }}</li>
@endisset
</ul>
-
- </div>
+ </x-alert>
</div>
@endforeach
@endif
@@ -78,12 +66,10 @@
@if ($consumables = session()->get('consumables'))
@foreach ($consumables as $consumable)
<div class="col-md-12" id="success-notification">
- <div class="alert alert-info fade in" role="status" aria-live="polite" aria-atomic="true">
+ <x-alert type="info" icon="info-circle" :title="trans('general.consumable_information')" role="status" aria-live="polite" aria-atomic="true">
<button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-info-circle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.consumable_information') }}: </strong>
<ul><li><b>{{ trans('general.consumable_name') }}</b> {{ $consumable->name }}</li></ul>
- </div>
+ </x-alert>
</div>
@endforeach
@endif
@@ -92,104 +78,91 @@
@if ($accessories = session()->get('accessories'))
@foreach ($accessories as $accessory)
<div class="col-md-12">
- <div class="alert alert-info fade in" role="status" aria-live="polite" aria-atomic="true">
+ <x-alert type="info" icon="info-circle" :title="trans('general.accessory_information')" role="status" aria-live="polite" aria-atomic="true">
<button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-info-circle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.accessory_information') }}:</strong>
<ul><li><b>{{ trans('general.accessory_name') }}</b> {{ $accessory->name }}</li></ul>
- </div>
+ </x-alert>
</div>
@endforeach
@endif
@if ($message = session()->get('error'))
-<div class="col-md-12">
- <div class="alert alert alert-danger fade in" role="alert" aria-live="assertive" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.error') }}: </strong>
- {{ $message }}
+ <div class="col-md-12">
+ <x-alert type="danger" icon="warning" :title="trans('general.error')" aria-live="assertive" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ $message }}
+ </x-alert>
</div>
-</div>
@endif
@if ($messages = session()->get('error_messages'))
-@foreach ($messages as $message)
-<div class="col-md-12">
- <div class="alert alert alert-danger fade in" role="alert" aria-live="assertive" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_error') }}: </strong>
- {{ $message }}
- </div>
-</div>
-@endforeach
+ @foreach ($messages as $message)
+ <div class="col-md-12">
+ <x-alert type="danger" icon="warning" :title="trans('general.notification_error')" aria-live="assertive" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ $message }}
+ </x-alert>
+ </div>
+ @endforeach
@endif
@if ($messages = session()->get('bulk_asset_errors'))
-<div class="col-md-12">
- <div class="alert alert alert-danger fade in" role="alert" aria-live="assertive" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_error') }}: </strong>
- {{ trans('general.notification_bulk_error_hint') }}
- @foreach($messages as $key => $message)
+ <div class="col-md-12">
+ <x-alert type="danger" icon="warning" :title="trans('general.notification_error')" aria-live="assertive" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ trans('general.notification_bulk_error_hint') }}
+ @foreach ($messages as $key => $message)
@for ($x = 0; $x < count($message); $x++)
- <ul>
- <li>{{ $message[$x] }}</li>
- </ul>
- @endfor
+ <ul>
+ <li>{{ $message[$x] }}</li>
+ </ul>
+ @endfor
@endforeach
+ </x-alert>
</div>
-</div>
@endif
+
@if ($messages = session()->get('multi_error_messages'))
<div class="col-md-12">
- <div class="alert alert alert-warning fade in" role="alert" aria-live="assertive" aria-atomic="true">
+ <x-alert type="warning" icon="warning" :title="trans('general.notification_error')" aria-live="assertive" aria-atomic="true">
<button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_error') }}: </strong>
<ul>
- @foreach(array_splice($messages, 0,3) as $key => $message)
+ @foreach (array_splice($messages, 0, 3) as $key => $message)
<li>{{ $message }}</li>
@endforeach
</ul>
<details>
<summary>{{ trans('general.show_all') }}</summary>
<ul>
- @foreach(array_splice($messages, 3) as $key => $message)
- <li>{{ $message }}</li>
- @endforeach
+ @foreach (array_splice($messages, 3) as $key => $message)
+ <li>{{ $message }}</li>
+ @endforeach
</ul>
</details>
- </div>
+ </x-alert>
</div>
@endif
@if ($message = session()->get('warning'))
-<div class="col-md-12">
- <div class="alert alert-warning fade in" role="alert" aria-live="assertive" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_warning') }}: </strong>
- {{ $message }}
+ <div class="col-md-12">
+ <x-alert type="warning" icon="warning" :title="trans('general.notification_warning')" aria-live="assertive" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ $message }}
+ </x-alert>
</div>
-</div>
@endif
@if ($message = session()->get('info'))
-<div class="col-md-12">
- <div class="alert alert-info fade in" role="status" aria-live="polite" aria-atomic="true">
- <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
- <i class="fas fa-info-circle faa-pulse animated" aria-hidden="true"></i>
- <strong>{{ trans('general.notification_info') }}: </strong>
- {{ $message }}
+ <div class="col-md-12">
+ <x-alert type="info" icon="info-circle" :title="trans('general.notification_info')" role="status" aria-live="polite" aria-atomic="true">
+ <button type="button" class="close" data-dismiss="alert" aria-label="{{ trans('general.close') }}"><span aria-hidden="true">&times;</span></button>
+ {{ $message }}
+ </x-alert>
</div>
-</div>
@endif
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php
index 1fb2e1bb24..e1c31e7166 100644
--- a/resources/views/components/checkout.blade.php
+++ b/resources/views/components/checkout.blade.php
@@ -37,7 +37,7 @@
@if ($snipe_component->requireAcceptance() || $snipe_component->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
@if ($snipe_component->category->require_acceptance == '1')
<i class="far fa-envelope fa-fw" aria-hidden="true"></i>
{{ trans('admin/categories/general.required_acceptance') }}<br>
@@ -50,7 +50,7 @@
<i class="fab fa-slack fa-fw" aria-hidden="true"></i>
{{ trans('general.webhook_msg_note') }}
@endif
- </div>
+ </x-callout>
</div>
</div>
@endif
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index e53882f511..15a320fa26 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -37,7 +37,7 @@
@if ($consumable->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $consumable->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
@if ($consumable->category->require_acceptance == '1')
<i class="far fa-envelope fa-fw" aria-hidden="true"></i>
{{ trans('admin/categories/general.required_acceptance') }}<br>
@@ -58,7 +58,7 @@
<i class="fab fa-slack fa-fw" aria-hidden="true"></i>
{{ trans('general.webhook_msg_note') }}
@endif
- </div>
+ </x-callout>
</div>
@if ($consumable->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1')
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
deleted file mode 100644
index 3f40bf6dfc..0000000000
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ /dev/null
@@ -1,424 +0,0 @@
-@extends('layouts/default', [
- 'helpText' => trans('admin/custom_fields/general.about_fieldsets_text'),
- 'helpPosition' => 'right',
-])
-
-@section('title')
- {{ trans('admin/custom_fields/general.custom_fields') }}
- @parent
-@stop
-
-@section('content')
-
- @php
- $field_format = '';
- if (stripos($field->format, 'regex') === 0) {
- $field_format = 'CUSTOM REGEX';
- }
- $format_locked = $field->exists && in_array($field->format, ['DATE', 'DATETIME'], true);
- @endphp
-
- <x-form :item="$field" route="{{ $field->id ? route('fields.update', $field->id) : route('fields.store') }}">
-
- <x-container columns="2">
-
- <x-page-column class="col-md-8">
-
- <x-box top_submit>
-
- <x-form.row
- :label="trans('admin/custom_fields/general.field_name')"
- :item="$field"
- name="name"
- required
- />
-
- <x-form.row
- :label="trans('admin/custom_fields/general.field_format')"
- name="format"
- required
- id="format_values"
- >
- <x-slot:input>
- <x-input.select
- name="format"
- :options="Helper::predefined_formats()"
- :selected="($field_format == '') ? $field->format : $field_format"
- class="format form-control"
- style="width:100%"
- aria-label="format"
- :disabled="$format_locked"
- />
- @if ($format_locked)
- <input type="hidden" name="format" value="{{ $field->format }}">
- <x-form.help name="format-locked">
- {{ trans('admin/custom_fields/general.format_locked_for_native_column', ['format' => $field->format]) }}
- </x-form.help>
- @else
- <x-form.help name="format">
- {{ trans('admin/custom_fields/general.field_format_help') }}
- </x-form.help>
- @endif
- <x-form.help name="format_picker_note" style="display:none;">
- {{ trans('admin/custom_fields/general.format_any_with_date_picker_help') }}
- </x-form.help>
- </x-slot:input>
- </x-form.row>
-
- <x-form.row
- :label="trans('admin/custom_fields/general.field_element')"
- name="element"
- required
- id="element_row"
- >
- <x-slot:input>
- <x-input.select
- name="element"
- :selected="old('element', $field->element)"
- class="field_element"
- id="element_select"
- style="width: 100%;"
- :options="[
- 'text' => trans('admin/custom_fields/general.types.text'),
- 'listbox' => trans('admin/custom_fields/general.types.listbox'),
- 'textarea' => trans('admin/custom_fields/general.types.textarea'),
- 'markdown-textarea' => trans('admin/custom_fields/general.types.markdown-textarea'),
- 'checkbox' => trans('admin/custom_fields/general.types.checkbox'),
- 'radio' => trans('admin/custom_fields/general.types.radio'),
- 'date_picker' => trans('admin/custom_fields/general.types.date_picker'),
- 'datetime_picker' => trans('admin/custom_fields/general.types.datetime_picker'),
- ]"
- />
- <x-form.help name="element">
- {{ trans('admin/custom_fields/general.field_element_help') }}
- </x-form.help>
- </x-slot:input>
- </x-form.row>
-
- <x-form.row
- :label="trans('admin/custom_fields/general.field_values')"
- name="field_values"
- required
- id="field_values_text"
- style="display:none;"
- :help_text="trans('admin/custom_fields/general.field_values_help')"
- >
- <x-slot:input>
- <x-input.textarea
- name="field_values"
- :value="old('field_values', $field->field_values)"
- style="width: 100%"
- rows="4"
- aria-label="field_values"
- />
- </x-slot:input>
- </x-form.row>
-
- <x-form.row
- :label="trans('admin/custom_fields/general.field_custom_format')"
- name="custom_format"
- required
- id="custom_regex"
- style="display:none;"
- :help_html="trans('admin/custom_fields/general.field_custom_format_help')"
- >
- <x-slot:input>
- <input
- class="form-control"
- id="custom_format"
- aria-label="custom_format"
- maxlength="191"
- placeholder="regex:/^[0-9]{15}$/"
- name="custom_format"
- type="text"
- value="{{ old('custom_format', (($field->format != '') && (stripos($field->format, 'regex') === 0)) ? $field->format : '') }}"
- >
- </x-slot:input>
- </x-form.row>
-
- <x-form.row
- :label="trans('admin/custom_fields/general.help_text')"
- :item="$field"
- name="help_text"
- :help_text="trans('admin/custom_fields/general.help_text_description')"
- />
-
- <div class="form-group">
-
- @if (($field->id) && ($field->field_encrypted == '1'))
- <div class="col-md-9 col-md-offset-3">
- <div class="alert alert-warning fade in">
- <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
- <strong>{{ trans('general.notification_warning') }}:</strong>
- {{ trans('admin/custom_fields/general.encrypted_options') }}
- </div>
- </div>
- @endif
-
- @if (! $field->id)
- <div class="col-md-9 col-md-offset-3" id="encryption_section">
- <label class="form-control">
- <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted"{{ (old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.encrypt_field') }}
- </label>
- <x-form.help name="encrypt_disabled_note" style="display:none;">
- {{ trans('admin/custom_fields/general.encrypt_disabled_for_date_format') }}
- </x-form.help>
- </div>
- <div class="col-md-9 col-md-offset-3" id="encrypt_warning" style="display:none;">
- <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
- <p><x-icon type="warning" /> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
- </div>
- </div>
- @endif
-
- <div class="col-md-9 col-md-offset-3" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="auto_add_to_fieldsets" aria-label="auto_add_to_fieldsets" value="1"{{ (old('auto_add_to_fieldsets') || $field->auto_add_to_fieldsets) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.auto_add_to_fieldsets') }}
- </label>
- </div>
-
- <div class="col-md-9 col-md-offset-3" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="show_in_listview" aria-label="show_in_listview" value="1"{{ (old('show_in_listview') || $field->show_in_listview) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.show_in_listview') }}
- </label>
- </div>
-
- @if ((! $field->id) || ($field->field_encrypted == '0'))
- <div class="col-md-9 col-md-offset-3" id="show_in_requestable_list" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="show_in_requestable_list" aria-label="show_in_requestable_list" value="1"{{ (old('show_in_requestable_list') || $field->show_in_requestable_list) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.show_in_requestable_list') }}
- </label>
- </div>
-
- <div class="col-md-9 col-md-offset-3" id="show_in_email" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="show_in_email" aria-label="show_in_email" value="1"{{ (old('show_in_email') || $field->show_in_email) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.show_in_email') }}
- </label>
- </div>
-
- <div class="col-md-9 col-md-offset-3" id="is_unique" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="is_unique" aria-label="is_unique" value="1"{{ (old('is_unique') || $field->is_unique) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.is_unique') }}
- </label>
- </div>
- @endif
-
- <div class="col-md-9 col-md-offset-3" id="display_checkout" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="display_checkout" aria-label="display_checkout" value="1" {{ (old('display_checkout') || $field->display_checkout) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.display_checkout') }}
- </label>
- </div>
-
- <div class="col-md-9 col-md-offset-3" id="display_checkin" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="display_checkin" aria-label="display_checkin" value="1" {{ (old('display_checkin') || $field->display_checkin) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.display_checkin') }}
- </label>
- </div>
-
- <div class="col-md-9 col-md-offset-3" id="display_audit" style="padding-bottom: 10px;">
- <label class="form-control">
- <input type="checkbox" name="display_audit" aria-label="display_audit" value="1" {{ (old('display_audit') || $field->display_audit) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.display_audit') }}
- </label>
- </div>
-
- <div class="col-md-9 col-md-offset-3" id="display_in_user_view">
- <label class="form-control">
- <input type="checkbox" name="display_in_user_view" aria-label="display_in_user_view" value="1" {{ (old('display_in_user_view') || $field->display_in_user_view) ? ' checked="checked"' : '' }}>
- {{ trans('admin/custom_fields/general.display_in_user_view') }}
- </label>
- </div>
-
- </div>
-
- </x-box>
-
- </x-page-column>
-
- @if ($fieldsets->count() > 0)
- <x-page-column class="col-md-4">
-
- <div class="box box-default">
- <div class="box-body">
-
- <h4>{{ trans('admin/custom_fields/general.fieldsets') }}</h4>
- <x-form.error name="associate_fieldsets" />
-
- <label class="form-control">
- <input type="checkbox" id="checkAll">
- {{ trans('general.select_all') }}
- </label>
-
- @foreach ($fieldsets as $fieldset)
- @php
- $array_fieldname = 'associate_fieldsets.' . $fieldset->id;
-
- if (old($array_fieldname) == $fieldset->id) {
- $checked = 'checked';
- } elseif (isset($field->fieldset) && ($field->fieldset->contains($fieldset->id))) {
- $checked = 'checked';
- } else {
- $checked = '';
- }
- @endphp
-
- <label class="form-control{{ $errors->has('associate_fieldsets.' . $fieldset->id) ? ' has-error' : '' }}">
- <input
- type="checkbox"
- name="associate_fieldsets[{{ $fieldset->id }}]"
- class="fieldset"
- value="{{ $fieldset->id }}"
- {{ $checked }}
- >
- {{ $fieldset->name }}
- <x-form.error :name="'associate_fieldsets.' . $fieldset->id" />
- </label>
- @endforeach
-
- </div>
- </div>
-
- </x-page-column>
- @endif
-
- </x-container>
-
- </x-form>
-
-@stop
-
-@section('moar_scripts')
-<script nonce="{{ csrf_token() }}">
- $(document).ready(function(){
-
- $("#checkAll").change(function () {
- $(".fieldset").prop('checked', $(this).prop("checked"));
- });
-
- // Only display the custom format field if it's a custom format validation type
- $(".format").change(function(){
- $(this).find("option:selected").each(function(){
- if ($('.format').prop("selectedIndex") == 1) {
- $("#custom_regex").show();
- } else{
- $("#custom_regex").hide();
- }
- });
-
- var pickedFormat = $(this).val();
- var isDateFormat = (pickedFormat === 'DATE' || pickedFormat === 'DATETIME');
-
- // DATE / DATETIME fields are stored in native date columns which
- // can't hold ciphertext, so encryption is disallowed. Leave the
- // checkbox visible so the user sees the option exists, but
- // uncheck + disable it. Trigger change so the dependent warning
- // and related visibility toggles run.
- $("#field_encrypted")
- .prop('disabled', isDateFormat)
- .prop('checked', isDateFormat ? false : $("#field_encrypted").prop('checked'))
- .trigger('change');
-
- // Explain WHY the checkbox is disabled when the format is DATE
- // or DATETIME. The help component renders id="{name}-help".
- $("#encrypt_disabled_note-help").toggle(isDateFormat);
-
- // With DATE/DATETIME format, force the element to the matching
- // picker option and disable the other options so the user can't
- // pick something invalid. Anything else — re-enable everything.
- var $elementOptions = $("#element_select > option");
- if (isDateFormat) {
- var matchingElement = (pickedFormat === 'DATETIME') ? 'datetime_picker' : 'date_picker';
- $elementOptions.each(function () {
- $(this).prop('disabled', $(this).val() !== matchingElement);
- });
- $("#element_select").val(matchingElement).trigger('change');
- } else {
- $elementOptions.prop('disabled', false);
- // Don't force-change the user's element pick here — only
- // reset if the previous value was one of the forced pickers.
- var currentEl = $("#element_select").val();
- if (currentEl === 'date_picker' || currentEl === 'datetime_picker') {
- // Leave whatever they had; user can pick another manually.
- }
- }
-
- // Nudge the format-picker help note (element handler recomputes
- // it too — this catches the case where format alone changed).
- updateFormatPickerNote();
- }).change();
-
- // Shown when the user has explicitly picked date_picker /
- // datetime_picker as the element AND left the format as ANY. That
- // combo IS supported (needed for encrypted date fields) but isn't
- // the common path — surface the reason so users don't wonder.
- function updateFormatPickerNote() {
- var el = $("#element_select").val();
- var fmt = $(".format").val();
- var isPickerElement = (el === 'date_picker' || el === 'datetime_picker');
- var isAnyFormat = (fmt === 'ANY' || fmt === '' || fmt == null);
- $("#format_picker_note-help").toggle(isPickerElement && isAnyFormat);
- }
-
- // If the element is a radiobutton/checkbox, doesn't show the format input box
- $(".field_element").change(function(){
- $(this).find("option:selected").each(function(){
- if (($(this).attr("value") != "radio") && ($(this).attr("value") != "checkbox")){
- $("#format_values").show();
- } else{
- $("#format_values").hide();
- }
- });
- }).change();
-
- // Field Values input is only meaningful for elements that need a
- // predefined set of options (listbox, checkbox, radio). Datepickers
- // and text inputs have no options list, so hide it there.
- // Encryption is disallowed for checkbox / radio elements (those
- // store comma-separated values that don't play nicely with encrypt).
- $(".field_element").change(function(){
- var el = $(this).val();
- var needsValues = (el === 'listbox' || el === 'checkbox' || el === 'radio');
- var blocksEncryption = (el === 'checkbox' || el === 'radio');
-
- $("#field_values_text").toggle(needsValues);
- if (blocksEncryption) {
- $("#encryption_section").hide();
- } else {
- $("#encryption_section").show();
- }
-
- // Also re-evaluate the format-picker help note when element
- // changes (e.g., user switches to date_picker on an ANY format).
- updateFormatPickerNote();
- }).change();
- });
-
-
- $("#field_encrypted").change(function() {
- if (this.checked) {
- $("#encrypt_warning").show();
- $("#show_in_email").hide();
- $("#display_in_user_view").hide();
- $("#is_unique").hide();
- $("#show_in_requestable_list").hide();
- } else {
- $("#encrypt_warning").hide();
- $("#show_in_email").show();
- $("#display_in_user_view").show();
- $("#is_unique").show();
- $("#show_in_requestable_list").show();
- }
- });
-
-
-
-</script>
-@stop
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 4031fed171..8d268b3da4 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -31,9 +31,9 @@
<div class="col-md-2">
<img src="{{ config('app.url') }}/img/sad-panda.png" class="pull-right" style="width: 140px; height: 140px;" alt="">
</div>
- <div class="alert alert-warning fade in">
+ <x-alert type="warning">
<h2> {{ trans('general.maintenance_mode') }}</h2>
- </div>
+ </x-alert>
</div> <!-- /.div -->
</div><!-- /.box-body -->
diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index c42a76385b..4a8d1a039e 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -19,10 +19,9 @@
<div class="box-body">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-callout type="warning" icon="warning" live="assertive">
{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}
- </div>
+ </x-callout>
<table class="table table-striped">
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index fa6e01b0e9..d3f5a211c2 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -27,13 +27,13 @@
<div class="box box-default">
<div class="box-body">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans_choice('admin/hardware/form.bulk_update_warn', count($assets), ['asset_count' => count($assets)]) }}
+ <x-callout type="warning" icon="warning" live="assertive">
+ {{ trans_choice('admin/hardware/form.bulk_update_warn', count($assets), ['asset_count' => count($assets)]) }}
@if (count($models) > 0)
{{ trans_choice('admin/hardware/form.bulk_update_with_custom_field', count($models), ['asset_model_count' => count($models)]) }}
@endif
- </div>
+ </x-callout>
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 64fdf8e705..8417c453f3 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -115,7 +115,7 @@
@if ($asset->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $asset->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout" style="display:none;">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
@if ($asset->requireAcceptance())
<x-icon type="email" class="fa-fw"/>
@@ -145,7 +145,7 @@
<i class="fab fa-slack fa-fw" aria-hidden="true"></i>
{{ trans('general.webhook_msg_note') }}
@endif
- </div>
+ </x-callout>
</div>
<!-- Sign in place checkbox -->
diff --git a/resources/views/hardware/history.blade.php b/resources/views/hardware/history.blade.php
index 434ba823eb..628fea31e1 100644
--- a/resources/views/hardware/history.blade.php
+++ b/resources/views/hardware/history.blade.php
@@ -17,11 +17,10 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="box box-default">
- <div class="alert alert-danger">
- <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
- <strong>{{ count($status['error']) }} {{ trans('admin/hardware/general.error_messages') }}</strong> </strong>
+ <x-alert type="danger" icon="warning">
+ <strong>{{ count($status['error']) }} {{ trans('admin/hardware/general.error_messages') }}</strong>
{{ trans('admin/hardware/general.alert_details') }}
- </div>
+ </x-alert>
</div>
</div>
</div>
@@ -30,11 +29,10 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="box box-default">
- <div class="alert alert-success">
- <i class="fas fa-check faa-pulse animated"></i>
+ <x-alert type="success" icon="checkmark">
<strong>{{ count($status['success']) }} {{ trans('admin/hardware/general.success_messages') }} </strong>
{{ trans('admin/hardware/general.alert_details') }}
- </div>
+ </x-alert>
</div>
</div>
</div>
@@ -150,9 +148,9 @@
<div class="box-footer text-right">
@if (config('app.lock_passwords')===true)
<div class="col-md-12">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
{{ trans('general.feature_disabled') }}
- </div>
+ </x-callout>
</div>
@else
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index b1a09c4c60..8e30d56bc6 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -18,18 +18,16 @@
@if (!$asset->model)
<div class="col-md-12">
- <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
- <p>
- <strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}
- </p>
- </div>
+ <x-callout type="danger" live="assertive">
+ <strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}
+ </x-callout>
</div>
@endif
@if ($asset->checkInvalidNextAuditDate())
<div class="col-md-12">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <p><strong>{{ trans('general.warning',
+ <x-callout type="warning" live="assertive">
+ <strong>{{ trans('general.warning',
[
'warning' => trans('admin/hardware/message.warning_audit_date_mismatch',
[
@@ -38,17 +36,16 @@
]
)
]
- ) }}</strong></p>
- </div>
+ ) }}</strong>
+ </x-callout>
</div>
@endif
@if ($asset->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <x-icon type="warning"/>
+ <x-callout type="warning" icon="warning" live="assertive">
{{ trans('general.asset_deleted_warning') }}
- </div>
+ </x-callout>
</div>
@endif
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index dc1244ee5a..9e0295d20c 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -2232,9 +2232,9 @@
<div class="row">
@if (config('app.lock_passwords'))
<div class="col-md-12">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
{{ trans('general.some_features_disabled') }}
- </div>
+ </x-callout>
</div>
@endif
diff --git a/resources/views/layouts/livewire-default.blade.php b/resources/views/layouts/livewire-default.blade.php
new file mode 100644
index 0000000000..a3373c5657
--- /dev/null
+++ b/resources/views/layouts/livewire-default.blade.php
@@ -0,0 +1,20 @@
+{{--
+ Bridge layout for full-page Livewire components. layouts/default uses
+ @section('content') and @section('title'), but Livewire's `->layout()`
+ renders into $slot — this adapter wires them together so a full-page
+ Livewire component can set title / helpText via layoutData(...) and
+ have its render output land in the right place.
+--}}
+@extends('layouts/default', [
+ 'helpText' => $helpText ?? null,
+ 'helpPosition' => $helpPosition ?? 'left',
+])
+
+@section('title')
+ {{ $title ?? '' }}
+ @parent
+@stop
+
+@section('content')
+ {{ $slot }}
+@stop
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index c2b696f66f..7be8ec5d52 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -58,7 +58,7 @@
@if ($license->requireAcceptance() || (string) $snipeSettings->require_accept_signature === '1' || $license->getEula() || ($snipeSettings->webhook_endpoint != ''))
<div class="form-group notification-callout">
<div class="col-md-8 col-md-offset-3">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
@if ($license->requireAcceptance())
<i class="far fa-envelope fa-fw" aria-hidden="true"></i>
@@ -88,7 +88,7 @@
<i class="fab fa-slack fa-fw" aria-hidden="true"></i>
{{ trans('general.webhook_msg_note') }}
@endif
- </div>
+ </x-callout>
</div>
<!-- Sign in place checkbox -->
diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php
index 762d764d85..d156c16c3c 100644
--- a/resources/views/livewire/category-edit-form.blade.php
+++ b/resources/views/livewire/category-edit-form.blade.php
@@ -107,10 +107,10 @@
@endif
</label>
@if ($this->emailWillBeSendDueToEula)
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
+ <x-callout type="info" role="status">
<i class="far fa-envelope" aria-hidden="true"></i>
<span>{{ $this->emailMessage }}</span>
- </div>
+ </x-callout>
@endif
</div>
</div>
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index f789bad7f4..a2f458a3f5 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -9,14 +9,14 @@
{{-- alert --}}
@if($message != '')
<div class="col-md-12" class="{{ $message_type }}">
- <div class="alert alert-{{ $this->message_type }}">
+ <x-alert :type="$this->message_type">
<button type="button" class="close" wire:click="$set('message','')">&times;</button>
@if($message_type == 'success')
<i class="fas fa-check faa-pulse animated" aria-hidden="true"></i>
@endif
<strong>{{-- title --}} </strong>
{{ $message }}
- </div>
+ </x-alert>
</div>
@endif
@@ -24,10 +24,9 @@
<div class="col-md-12">
<div class="box box-default">
<div class="box-body">
- <div class="alert alert-warning">
-
- <i class="fa fa-warning info" aria-hidden="true"></i> <strong>{{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}</strong>
- </div>
+ <x-alert type="warning" icon="warning">
+ <strong>{{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}</strong>
+ </x-alert>
<div class="errors-table">
<table class="table table-striped table-bordered" id="errors-table">
diff --git a/resources/views/livewire/oauth-clients.blade.php b/resources/views/livewire/oauth-clients.blade.php
index 50ae564243..c91363db76 100644
--- a/resources/views/livewire/oauth-clients.blade.php
+++ b/resources/views/livewire/oauth-clients.blade.php
@@ -1,12 +1,12 @@
<div>
@if ($authorizationError)
- <div class="alert alert-danger">
+ <x-alert type="danger">
<p>
{{ trans('admin/users/message.insufficient_permissions') }}
<br>
{{ $authorizationError }}
</p>
- </div>
+ </x-alert>
@endif
@if ($this->showOauthClients())
@@ -192,7 +192,7 @@
<div class="modal-body">
<!-- Form Errors -->
@if($errors->has('name') || $errors->has('redirect'))
- <div class="alert alert-danger">
+ <x-alert type="danger">
<p><strong>Whoops!</strong> Something went wrong!</p>
<br>
<ul>
@@ -203,7 +203,7 @@
<li>{{ $errors->first('redirect') }}</li>
@endif
</ul>
- </div>
+ </x-alert>
@endif
<!-- Create Client Form -->
@@ -279,7 +279,7 @@
<div class="modal-body">
@if($errors->has('newName') || $errors->has('newRedirect'))
- <div class="alert alert-danger">
+ <x-alert type="danger">
<p><strong>Whoops!</strong> Something went wrong!</p>
<br>
<ul>
@@ -293,7 +293,7 @@
<li>{{ $authorizationError }}</li>
@endif
</ul>
- </div>
+ </x-alert>
@endif
<!-- Edit Client Form -->
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php
index b5c7640758..8e8da5d479 100644
--- a/resources/views/livewire/personal-access-tokens.blade.php
+++ b/resources/views/livewire/personal-access-tokens.blade.php
@@ -77,7 +77,7 @@
<div class="modal-body">
<!-- Form Errors -->
@if($errors->has('name'))
- <div class="alert alert-danger">
+ <x-alert type="danger">
<p><strong>{{ trans('general.whoops') }}</strong> {{ trans('general.something_went_wrong') }}</p>
<br>
<ul>
@@ -89,7 +89,7 @@
@enderror
</li>
</ul>
- </div>
+ </x-alert>
@endif
<!-- Create Token Form -->
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index a00aa151a5..b1204aa32a 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -16,12 +16,12 @@
<form class="form-horizontal" role="form" wire:submit="submit">
{{csrf_field()}}
@if (session()->has('warning'))
- <div class="alert alert-warning">
+ <x-alert type="warning">
{!! session('warning') !!}
@php
session()->forget('warning'); // Clear the session flash immediately
@endphp
- </div>
+ </x-alert>
@endif
<div class="row">
@@ -48,14 +48,14 @@
<div class="col-md-12" style="border-top: 0px;">
@if(session()->has('success'))
- <div class="alert alert-success fade in">
+ <x-alert type="success">
{{session('success')}}
- </div>
+ </x-alert>
@endif
@if(session()->has('error'))
- <div class="alert alert-danger fade in">
+ <x-alert type="danger">
{{session('error')}}
- </div>
+ </x-alert>
@endif
<div class="form-group">
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 519a1b3c65..ffff08c11f 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -20,10 +20,9 @@
@if ($location->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <x-icon type="warning" />
+ <x-callout type="warning" icon="warning" live="assertive">
{{ trans('admin/locations/message.deleted_warning') }}
- </div>
+ </x-callout>
</div>
@endif
diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php
index 684590101b..a0aca89fca 100755
--- a/resources/views/manufacturers/index.blade.php
+++ b/resources/views/manufacturers/index.blade.php
@@ -15,14 +15,12 @@
<form action="{{ route('manufacturers.seed') }}" method="POST">
{{ csrf_field() }}
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
- <p>
- {{ trans('general.seeding.manufacturers.prompt') }}
+ <x-callout type="info" role="status">
+ {{ trans('general.seeding.manufacturers.prompt') }}
<button class="btn btn-sm btn-theme hidden-print" rel="noopener">
{{ trans('general.seeding.manufacturers.button') }}
</button>
- </p>
- </div>
+ </x-callout>
</form>
@else
diff --git a/resources/views/modals/add-note.blade.php b/resources/views/modals/add-note.blade.php
index 1bbd99b1d1..796e0a539f 100644
--- a/resources/views/modals/add-note.blade.php
+++ b/resources/views/modals/add-note.blade.php
@@ -16,7 +16,7 @@
<input type="hidden" name="id" value="{{$id}}"/>
<div class="modal-body">
- <div class="alert alert-danger" id="modal_error_msg" style="display:none"></div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none"></x-alert>
<div class="row">
<div class="col-md-12">
diff --git a/resources/views/modals/category.blade.php b/resources/views/modals/category.blade.php
index c49f44ee5c..2e68eaa1b5 100644
--- a/resources/views/modals/category.blade.php
+++ b/resources/views/modals/category.blade.php
@@ -9,8 +9,8 @@
<div class="modal-body">
<form action="{{ route('api.categories.store') }}" onsubmit="return false">
{{ csrf_field() }}
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
@include('modals.partials.name', ['required' => 'true'])
<input type="hidden" name='category_type' id="modal-category_type" value="{{ request('category_type') }}" />
</form>
diff --git a/resources/views/modals/kit-accessory.blade.php b/resources/views/modals/kit-accessory.blade.php
index c4c3b7527d..368e5c57f8 100644
--- a/resources/views/modals/kit-accessory.blade.php
+++ b/resources/views/modals/kit-accessory.blade.php
@@ -9,8 +9,8 @@
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.kits.accessories.store', $kitId) }}" onsubmit="return false">
{{ csrf_field() }}
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
<label for="modal-accessory_id" class="col-md-4 col-xs-12 control-label">{{ trans('general.accessory') }}:</label>
diff --git a/resources/views/modals/kit-consumable.blade.php b/resources/views/modals/kit-consumable.blade.php
index a709dd86f5..c05682ed8c 100644
--- a/resources/views/modals/kit-consumable.blade.php
+++ b/resources/views/modals/kit-consumable.blade.php
@@ -9,8 +9,8 @@
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.kits.consumables.store', $kitId) }}" onsubmit="return false">
{{ csrf_field() }}
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
<label for="modal-consumable_id" class="col-md-4 col-xs-12 control-label">{{ trans('general.consumable') }}:</label>
diff --git a/resources/views/modals/kit-license.blade.php b/resources/views/modals/kit-license.blade.php
index dbf5532aa8..09b14b6b76 100644
--- a/resources/views/modals/kit-license.blade.php
+++ b/resources/views/modals/kit-license.blade.php
@@ -9,8 +9,8 @@
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.kits.licenses.store', $kitId) }}" onsubmit="return false">
{{ csrf_field() }}
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
<label for="modal-license_id" class="col-md-4 col-xs-12 control-label">{{ trans('general.license') }}:</label>
diff --git a/resources/views/modals/kit-model.blade.php b/resources/views/modals/kit-model.blade.php
index d2ef541409..bffa046d4a 100644
--- a/resources/views/modals/kit-model.blade.php
+++ b/resources/views/modals/kit-model.blade.php
@@ -9,8 +9,8 @@
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.kits.models.store', $kitId) }}" onsubmit="return false">
{{ csrf_field() }}
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
<label for="modal-model_id" class="col-md-4 col-xs-12 control-label">{{ trans('general.asset_model') }}:</label>
diff --git a/resources/views/modals/location.blade.php b/resources/views/modals/location.blade.php
index c86473ad24..2aa43838ba 100644
--- a/resources/views/modals/location.blade.php
+++ b/resources/views/modals/location.blade.php
@@ -7,8 +7,8 @@
</div>
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.locations.store') }}" onsubmit="return false">
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
<label for="modal-name" class="col-md-3 col-xs-12 control-label">{{ trans('general.name') }}:</label>
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index fb1650eee7..9c5696af65 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -7,8 +7,8 @@
</div>
<div class="modal-body">
<form action="{{ route('api.models.store') }}" onsubmit="return false">
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
@include('modals.partials.name', ['required' => 'true'])
@include('modals.partials.categories-select', ['required' => 'true'])
@include('modals.partials.manufacturer-select')
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index 06fc1d046a..8c8dbe41d4 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -7,8 +7,8 @@
</div>
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.statuslabels.store') }}" onsubmit="return false">
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
<label for="modal-name" class="col-md-3 col-xs-12 control-label">{{ trans('admin/statuslabels/table.name') }}:</label>
<div class="col-md-9 col-xs-12"><input type="text" name="name" id="modal-name" class="form-control" maxlength="191" required></div>
diff --git a/resources/views/modals/supplier.blade.php b/resources/views/modals/supplier.blade.php
index f2cbfb9835..38160fddc8 100644
--- a/resources/views/modals/supplier.blade.php
+++ b/resources/views/modals/supplier.blade.php
@@ -7,8 +7,8 @@
</div>
<div class="modal-body">
<form action="{{ route('api.suppliers.store') }}" onsubmit="return false">
- <div class="alert alert-danger" id="modal_error_msg" style="display:none">
- </div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none">
+ </x-alert>
<div class="dynamic-form-row">
@include('partials.forms.edit.name', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.name')])
</div>
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index e5d2aa901d..657e4a08d6 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -25,7 +25,7 @@
</div>
<div class="modal-body">
<form class="form-horizontal" action="{{ route('api.users.store') }}" onsubmit="return false">
- <div class="alert alert-danger" id="modal_error_msg" style="display:none"></div>
+ <x-alert type="danger" id="modal_error_msg" style="display:none"></x-alert>
@if ($user->companies->isNotEmpty())
<input type="hidden" name="company_id" value="{{ $user->companies->first()->id }}">
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index d65d933c93..a5b65dfd56 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -18,10 +18,9 @@
<div class="box box-default">
<div class="box-body">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-callout type="warning" icon="warning" live="assertive">
{{ trans_choice('admin/models/message.bulkedit.warn', count($models), ['model_count' => count($models)]) }}
- </div>
+ </x-callout>
<table class="table table-striped">
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 2b4f0176b6..8050e5508e 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -135,9 +135,19 @@
@else
@if (($field->field_encrypted=='0') || (Gate::allows('assets.view.encrypted_custom_fields')))
- <input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
+ @php
+ $format_icon = \App\Models\CustomField::iconForFormat($field->format);
+ @endphp
+ @if ($format_icon)
+ <div class="input-group">
+ <input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
+ <span class="input-group-addon"><x-icon :type="$format_icon" /></span>
+ </div>
@else
- <input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
+ <input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
+ @endif
+ @else
+ <input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
@endif
@endif
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index b740773874..3a90257347 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -17,10 +17,9 @@
@if ($model->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <x-icon type="warning" />
+ <x-callout type="warning" icon="warning" live="assertive">
{{ trans('admin/models/general.deleted') }}
- </div>
+ </x-callout>
</div>
@endif
diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php
index c2d3788f3f..d680a3a82e 100644
--- a/resources/views/reports/depreciation.blade.php
+++ b/resources/views/reports/depreciation.blade.php
@@ -37,10 +37,9 @@
</table>
@else
<div class="col-md-12">
- <div class="alert alert-warning fade in">
- <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
+ <x-alert type="warning" icon="warning">
{!! trans('admin/depreciations/general.no_depreciations_warning') !!}
- </div>
+ </x-alert>
</div>
@endif
</div> <!-- /.box-body-->
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index 168e709dd3..521597affb 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -158,7 +158,7 @@
</p>
@if (config('app.lock_passwords')===true)
- <p class="alert alert-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+ <x-alert type="warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</x-alert>
@else
<form method="POST" action="{{ route('settings.backups.upload') }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index d229a00348..16fedfbe8c 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -59,9 +59,9 @@
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
- <div class="alert alert-danger">
+ <x-alert type="danger">
{{ trans('admin/settings/general.ldap_extension_warning') }}
- </div>
+ </x-alert>
</div>
</div>
</div>
diff --git a/resources/views/setup/migrate.blade.php b/resources/views/setup/migrate.blade.php
index f99ce05579..922a6c79be 100644
--- a/resources/views/setup/migrate.blade.php
+++ b/resources/views/setup/migrate.blade.php
@@ -10,10 +10,9 @@
<div class="col-lg-12" style="padding-top: 20px;">
@if (trim($output)=='Nothing to migrate.')
<div class="col-md-12">
- <div class="alert alert-warning">
- <i class="fas fa-exclamation-triangle"></i>
+ <x-alert type="warning" icon="warning">
{{ trans('general.setup_no_migrations') }}
- </div>
+ </x-alert>
</div>
@endif
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index f5b884027a..c46afa9d85 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -24,9 +24,9 @@
<p>{{ trans('admin/users/general.bulk_update_help') }}</p>
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('admin/users/general.bulk_update_warn', ['user_count' => count($users)]) }}
- </div>
+ <x-callout type="warning" icon="warning" live="assertive">
+ {{ trans('admin/users/general.bulk_update_warn', ['user_count' => count($users)]) }}
+ </x-callout>
<form class="form-horizontal" method="post" action="{{ route('users/bulkeditsave') }}" autocomplete="off" role="form">
{{ csrf_field() }}
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 9c08e82711..dd30ceb8e7 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -16,18 +16,16 @@
<!-- CSRF Token -->
{{csrf_field()}}
<div class="col-md-12">
- <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-callout type="danger" icon="warning" live="assertive">
<strong>{{ trans('admin/users/general.warning_deletion_information', array('count' => count($users))) }} </strong>
-
- </div>
+ </x-callout>
</div>
@if (config('app.lock_passwords'))
<div class="col-md-12">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <p>{{ trans('general.feature_disabled') }}</p>
- </div>
+ <x-callout type="warning" live="assertive">
+ {{ trans('general.feature_disabled') }}
+ </x-callout>
</div>
@endif
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index 302487668d..df2f546abb 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -23,19 +23,18 @@
{{csrf_field()}}
<div class="row">
<div class="col-md-12">
- <div class="callout callout-danger" role="alert" aria-live="assertive" aria-atomic="true">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-callout type="danger" icon="warning" live="assertive">
{{ trans('general.warning_merge_information') }}
- </div>
+ </x-callout>
</div>
</div>
@if (config('app.lock_passwords'))
<div class="row">
<div class="col-md-12">
- <div class="callout callout-info" role="status" aria-live="polite" aria-atomic="true">
- <p>{{ trans('general.feature_disabled') }}</p>
- </div>
+ <x-callout type="info" role="status">
+ {{ trans('general.feature_disabled') }}
+ </x-callout>
</div>
</div>
@endif
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9d7ed7cfd3..69f23f3b44 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -715,20 +715,17 @@
<x-form.legend help_text="{{ trans('permissions.use_groups') }}"/>
@if (auth()->user()->isAdmin() && !auth()->user()->isSuperUser())
- <p class="alert alert-info">
- <x-icon type="info"/>
+ <x-alert type="info" icon="info">
{{ trans('admin/users/general.superadmin_permission_warning') }}
- </p>
+ </x-alert>
@elseif (!auth()->user()->isAdmin() && !auth()->user()->isSuperUser() && auth()->id() === $user->id)
- <p class="alert alert-danger">
- <x-icon type="alert"/>
+ <x-alert type="danger" icon="warning">
{{ trans('admin/users/general.self_permission_warning') }}
- </p>
+ </x-alert>
@elseif (!auth()->user()->isAdmin() && !auth()->user()->isSuperUser() && auth()->id() !== $user->id)
- <p class="alert alert-danger">
- <x-icon type="warning"/>
+ <x-alert type="danger" icon="warning">
{{ trans('admin/users/general.admin_permission_warning') }}
- </p>
+ </x-alert>
@endif
@if (auth()->user()->isSuperUser() || auth()->user()->isAdmin() || (auth()->id() !== $user->id && !$user->isSuperUser()))
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index f302db4d7a..bb77c742c7 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -17,10 +17,9 @@
@if ($user->deleted_at!='')
<div class="col-md-12">
- <div class="callout callout-warning" role="alert" aria-live="assertive" aria-atomic="true">
- <x-icon type="warning"/>
+ <x-callout type="warning" icon="warning" live="assertive">
{{ trans('admin/users/message.user_deleted_warning') }}
- </div>
+ </x-callout>
</div>
@endif
diff --git a/routes/web/fields.php b/routes/web/fields.php
index 529842fdc9..ac4d1fe297 100644
--- a/routes/web/fields.php
+++ b/routes/web/fields.php
@@ -2,15 +2,14 @@
use App\Http\Controllers\CustomFieldsController;
use App\Http\Controllers\CustomFieldsetsController;
+use App\Livewire\CustomFieldEditor;
use Illuminate\Support\Facades\Route;
/*
* Custom Fields Routes
*/
-
-
-Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {
+Route::group(['prefix' => 'fields', 'middleware' => ['auth']], function () {
Route::post(
'required/{fieldset_id}/{field_id}',
@@ -32,16 +31,14 @@ Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {
[CustomFieldsetsController::class, 'associate']
)->name('fieldsets.associate');
-
Route::resource('fieldsets', CustomFieldsetsController::class, [
'parameters' => [
'fieldset' => 'fieldset',
- 'field' => 'field_id'
+ 'field' => 'field_id',
],
- 'except' => ['show', 'view']
+ 'except' => ['show', 'view'],
]);
-
// This is a shim to handle bootstrap tables
// @todo: normalize this in the JS
Route::get(
@@ -56,8 +53,14 @@ Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {
});
-Route::resource('fields', CustomFieldsController::class,
- ['middleware' => ['auth'],
- 'except' => ['show', 'view']
- ]);
+Route::group(['middleware' => ['auth']], function () {
+ // Create/edit are handled by the CustomFieldEditor Livewire component
+ // as full-page routes — mount() applies the create/update policies.
+ Route::get('fields/create', CustomFieldEditor::class)->name('fields.create');
+ Route::get('fields/{field}/edit', CustomFieldEditor::class)->name('fields.edit');
+ // index + destroy remain on the controller (the Livewire component
+ // handles saves via wire:submit -> save(), so store/update are gone).
+ Route::get('fields', [CustomFieldsController::class, 'index'])->name('fields.index');
+ Route::delete('fields/{field}', [CustomFieldsController::class, 'destroy'])->name('fields.destroy');
+});
diff --git a/tests/Feature/CustomFields/Ui/CreateCustomFieldsTest.php b/tests/Feature/CustomFields/Ui/CreateCustomFieldsTest.php
index d102659c5e..b55433c6d0 100644
--- a/tests/Feature/CustomFields/Ui/CreateCustomFieldsTest.php
+++ b/tests/Feature/CustomFields/Ui/CreateCustomFieldsTest.php
@@ -7,33 +7,21 @@ use Tests\TestCase;
class CreateCustomFieldsTest extends TestCase
{
- public function test_user_without_view_permission_cannot_reach_create_page()
+ public function test_user_without_create_permission_cannot_reach_create_page()
{
- // The menu entry already requires customfields.view; the create page
- // and store action should match so a user can't bypass by typing the
- // URL directly. Defense-in-depth tie-in with the XSS report on the
- // custom-field name column.
- $this->actingAs(User::factory()->createCustomFields()->create())
+ // fields.create routes directly to the CustomFieldEditor Livewire
+ // component; mount() checks the 'create' policy. A user with only
+ // 'view' can't reach the authoring form.
+ $this->actingAs(User::factory()->viewCustomFields()->create())
->get(route('fields.create'))
->assertForbidden();
}
- public function test_user_without_view_permission_cannot_post_to_store()
+ public function test_user_with_create_can_reach_create_page()
{
+ // Route no longer requires view permission separately — create is
+ // the authoring gate for the authoring form.
$this->actingAs(User::factory()->createCustomFields()->create())
- ->post(route('fields.store'), [
- 'name' => 'TestField',
- 'element' => 'text',
- 'format' => 'ANY',
- ])
- ->assertForbidden();
-
- $this->assertDatabaseMissing('custom_fields', ['name' => 'TestField']);
- }
-
- public function test_user_with_view_and_create_can_reach_create_page()
- {
- $this->actingAs(User::factory()->viewCustomFields()->createCustomFields()->create())
->get(route('fields.create'))
->assertOk();
}