Revert "Revert "merge 1""

This reverts commit 0c463d1f10.
2022-10-24 01:04:22 +01:00
parent 0c463d1f10
commit b89d71b371
166 changed files with 4250 additions and 1833 deletions
--- a/resources/views/components/modal.blade.php
+++ b/resources/views/components/modal.blade.php
@@ -14,10 +14,10 @@
            </div>
            <div class="modal-footer">

-                {{ $modalFooter }}
+                {{ $modalFooter ?? '' }}

                @if ($includeCloseButton == true)
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{__('messages.modal_close')}}</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{__('Close')}}</button>
                @endif
            </div>
        </div>