Compare commits

...

4 Commits
9.2.1 ... 9.2.5

Author SHA1 Message Date
Deon George
d494400e7e Updated form helpers, to ensure right hand corners were rounded. Added success_button helper 2022-08-06 00:19:20 +10:00
Deon George
61f38aefe7 For search, if we get a 401, redirect to the login page 2022-08-03 16:32:38 +10:00
Deon George
8e9ca4c531 Added form input select, and fixes to date 2022-08-02 22:34:20 +10:00
Deon George
2e512cc3ed Added some form and status widgets 2022-08-01 20:29:57 +10:00
9 changed files with 125 additions and 26 deletions

View File

@@ -83,7 +83,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("input[name=q]").typeahead({ $('input[name=q]').typeahead({
autoSelect: false, autoSelect: false,
scrollHeight: 10, scrollHeight: 10,
theme: 'bootstrap4', theme: 'bootstrap4',
@@ -149,6 +149,11 @@
$('span[name=searching]').addClass("d-none"); $('span[name=searching]').addClass("d-none");
} }
} }
},
statusCode: {
401: function() {
window.parent.location.href = '{{ route('login') }}';
}
} }
}) })
}, 500); }, 500);

View File

@@ -44,7 +44,7 @@
$.AdminLTESidebarTweak.Open = state; $.AdminLTESidebarTweak.Open = state;
if (addclass !== 'undefined') if (addclass !== 'undefined')
$("body") $('body')
.addClass(state ? 'sidebar-open' : 'sidebar-collapse'); .addClass(state ? 'sidebar-open' : 'sidebar-collapse');
$(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() { $(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
@@ -56,7 +56,7 @@
$(function () { $(function () {
"use strict"; "use strict";
$("body").on("collapsed.lte.pushmenu", function(){ $('body').on('collapsed.lte.pushmenu', function(){
if($.AdminLTESidebarTweak.options.EnableRemember) { if($.AdminLTESidebarTweak.options.EnableRemember) {
document.cookie = "toggleState=closed;path=/"; document.cookie = "toggleState=closed;path=/";
@@ -64,7 +64,7 @@
} }
}); });
$("body").on("shown.lte.pushmenu", function(){ $('body').on('shown.lte.pushmenu', function(){
if($.AdminLTESidebarTweak.options.EnableRemember){ if($.AdminLTESidebarTweak.options.EnableRemember){
document.cookie = "toggleState=opened;path=/"; document.cookie = "toggleState=opened;path=/";

View File

@@ -0,0 +1,12 @@
<!-- Errors -->
@if ($errors->any())
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
<ul>
@foreach ($errors->all() as $error)
<li>{!! $error !!}</li>
@endforeach
</ul>
</div>
@endif

View File

@@ -0,0 +1,17 @@
<div class="form-group">
<label for="{{ $id }}">{{ $label }}</label>
<div class="input-group has-validation">
@empty($icon)
@else
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
</div>
@endempty()
<input type="date" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}" value="{{ old($old,$value) }}">
<span class="invalid-feedback" role="alert">
@error($id)
{{ $message }}
@enderror
</span>
</div>
</div>

View File

@@ -0,0 +1,57 @@
<div class="form-group">
<label for="{{ $id }}">{{ $label }}</label>
<div class="input-group has-validation">
@empty($icon)
@else
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
</div>
@endempty()
<select class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}">
@if(! isset($addvalues) || ! $addvalues)
<option id="new"></option>
@endif
@empty($groupby))
@foreach($options as $option)
@empty(Arr::get($option,'value')) @continue @endempty
<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
@endforeach
@else
@foreach($options->groupBy($groupby) as $group)
<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
@foreach($group as $option)
@empty(Arr::get($option,'value')) @continue @endempty
<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
@endforeach
</optgroup>
@endforeach
@endempty
</select>
<span class="invalid-feedback" role="alert">
@error($id)
{{ $message }}
@enderror
</span>
</div>
</div>
@section('page-scripts')
@css(select2)
@js(select2,autofocus)
<script type="text/javascript">
$(document).ready(function() {
$('#{{ $id }}').select2({
dropdownAutoWidth: true,
width: 'style',
@isset($addvalues)
tags: true,
placeholder: '',
allowClear: true,
@endisset
});
});
</script>
@append

View File

@@ -0,0 +1,17 @@
<div class="form-group">
<label for="{{ $id }}">{{ $label }}</label>
<div class="input-group has-validation">
@empty($icon)
@else
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
</div>
@endempty()
<input type="text" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?: $id }}" value="{{ old($old ?? $name,$value) }}">
<span class="invalid-feedback" role="alert">
@error($id)
{{ $message }}
@enderror
</span>
</div>
</div>

View File

@@ -1,23 +1,3 @@
<!-- Success --> @include('adminlte::widget.success')
@if(session()->has('success'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fas fa-check"></i> Success!</h5>
<ul>
<li>{{ session()->get('success') }}</li>
</ul>
</div>
@endif
<!-- Errors --> @include('adminlte::widget.errors')
@if ($errors->any())
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
<ul>
@foreach ($errors->all() as $error)
<li>{!! $error !!}</li>
@endforeach
</ul>
</div>
@endif

View File

@@ -0,0 +1,10 @@
<!-- Success -->
@if(session()->has('success'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fas fa-check"></i> Success!</h5>
<ul>
<li>{{ session()->get('success') }}</li>
</ul>
</div>
@endif

View File

@@ -0,0 +1 @@
@if(session()->has('success'))<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success float-right"><small>{{ session()->get('success') }}</small></span>@endif