Skip to content

A free open source IT asset/license management system

Added demo-callout for wider version at the top of forms

snipedfeef4110058
diff --git a/resources/views/blade/demo-callout.blade.php b/resources/views/blade/demo-callout.blade.php
new file mode 100644
index 0000000000..fd0eb66314
--- /dev/null
+++ b/resources/views/blade/demo-callout.blade.php
@@ -0,0 +1,18 @@
+{{-- Full-width "this action is locked in demo mode" callout for
+ destructive-action confirm screens (delete, merge, bulk edit,
+ etc.). Bigger visual weight than <x-demo-lock> so it can't get
+ missed above a Submit button and users don't misread the disabled
+ state.
+
+ Self-gates on the editableOnDemo policy so callers don't need
+ their own @if wrapper. Renders nothing when the app is not in
+ demo mode.
+
+ Slot overrides the default text (trans('general.feature_disabled')).
+ Uses warning styling + warning-triangle icon + role="status" for
+ a consistent visual across every confirm-action page. --}}
+@if (! Gate::allows('editableOnDemo'))
+ <x-callout type="warning" icon="warning" role="status" {{ $attributes }}>
+ {{ $slot->isEmpty() ? trans('general.feature_disabled') : $slot }}
+ </x-callout>
+@endif
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 2be43957ca..4e31afec30 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -34,6 +34,11 @@
<div class="box box-default">
<div class="box-body">
+ <div class="row">
+ <div class="col-md-12">
+ <x-demo-callout />
+ </div>
+ </div>
<!-- Department -->
@include ('partials.forms.edit.department-select', ['translated_name' => trans('general.department'), 'fieldname' => 'department_id'])
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 4a3f5185e9..02522fd528 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -17,13 +17,9 @@
</x-callout>
</div>
- @if (config('app.lock_passwords'))
- <div class="col-md-12">
- <x-callout type="warning" live="assertive">
- {{ trans('general.feature_disabled') }}
- </x-callout>
- </div>
- @endif
+ <div class="col-md-12">
+ <x-demo-callout />
+ </div>
<div class="col-md-12">
<div class="table-responsive">
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index df2f546abb..4fc9e548d0 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -29,15 +29,11 @@
</div>
</div>
- @if (config('app.lock_passwords'))
- <div class="row">
- <div class="col-md-12">
- <x-callout type="info" role="status">
- {{ trans('general.feature_disabled') }}
- </x-callout>
- </div>
+ <div class="row">
+ <div class="col-md-12">
+ <x-demo-callout />
</div>
- @endif
+ </div>
<div class="col-md-12">
<div class="table-responsive">