Compare commits

...

7 Commits

Author SHA1 Message Date
Deon George
b67df24219 Disable sorting - should be sorted by ajax method 2020-06-11 16:19:40 +10:00
Deon George
7ffcdb139a Enable font selection override 2020-05-26 11:26:00 +10:00
Deon George
5a9437db37 bootstrap typeahead now part of app.js - updated and optimised enabling categories 2020-05-26 11:12:54 +10:00
Deon George
9389fd9e83 Added widget for success/error messages 2020-05-06 17:13:15 +10:00
Deon George
87819891a1 Updated Fontawesome to v5 2020-05-06 16:30:41 +10:00
Deon George
b3924ea239 Make resize delay configurable and default 1000 2020-03-12 09:13:55 +11:00
Deon George
6bc2787602 Improved sidebar open/close handling 2020-03-11 12:41:36 +11:00
10 changed files with 113 additions and 62 deletions

View File

@@ -8,7 +8,7 @@
@if(isset($login_note) AND $login_note)
<div class="alert alert-info alert-dismissible m-auto">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fa fa-info"></i> NOTE!</h5>
<h5><i class="icon fas fa-info"></i> NOTE!</h5>
{!! $login_note !!}
</div>
<br>
@@ -46,18 +46,27 @@
<form method="post">
{{ csrf_field() }}
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email">
<div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="Password">
<div class="input-group-append">
<span class="fa fa-lock input-group-text"></span>
<div class="row">
<div class="col-12">
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email">
<div class="input-group-append">
<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
</div>
</div>
</div>
<div class="col-12">
<div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="Password">
<div class="input-group-append">
<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-8">
<div class="checkbox icheck">
@@ -66,9 +75,10 @@
</label>
</div>
</div>
<!-- /.col -->
<div class="col-4">
<button type="submit" name="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
<button type="submit" name="submit" class="btn btn-primary mr-0 float-right">Sign In</button>
</div>
<!-- /.col -->
</div>

View File

@@ -1,8 +1,8 @@
<div class="social-auth-links text-center mb-3">
<p>- OR -</p>
@foreach(config('auth.social') as $o)
<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block btn-{{ $o['class'] }}">
<i class="fa fa-{{ $o['icon'] }} mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block {{ $o['class'] }}">
<i class="{{ $o['icon'] }} fa-fw mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
</a>
@endforeach
</div>

View File

@@ -39,7 +39,7 @@
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email" required>
<div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span>
<span class="fas fa-envelope input-group-text"></span>
</div>
</div>
<div class="row">

View File

@@ -31,19 +31,19 @@
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email" required>
<div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span>
<span class="fas fa-envelope fa-fw input-group-text"></span>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="Password" required>
<div class="input-group-append">
<span class="fa fa-lock input-group-text"></span>
<span class="fas fa-lock input-group-text"></span>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
<div class="input-group-append">
<span class="fa fa-lock input-group-text"></span>
<span class="fas fa-lock input-group-text"></span>
</div>
</div>
<div class="row">

View File

@@ -9,12 +9,11 @@
<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
<!-- Font Awesome Icons -->
<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
<!-- IonIcons -->
<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/all.css') }}">
<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
<!-- Google Font: Source Sans Pro -->
<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">
@if(file_exists('css/social.css'))
<!-- Social Logins -->

View File

@@ -4,7 +4,7 @@
<!-- Left navbar links -->
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
</li>
</ul>
@@ -14,10 +14,10 @@
<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search" autocomplete="off">
<div class="input-group-append">
<button class="btn btn-navbar" type="submit">
<i class="fa fa-search"></i>
<i class="fas fa-search"></i>
</button>
</div>
<span name="searching" class="d-none"><i class="fa fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
<span name="searching" class="d-none"><i class="fas fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
<div id="search_results"></div>
</div>
</form>
@@ -30,7 +30,7 @@
<!-- Profile Settings -->
<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#">
<i class="fa fa-cog"></i>
<i class="fas fa-cog"></i>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<span class="dropdown-item dropdown-header @if($user->switched) bg-danger @endif">
@@ -43,30 +43,30 @@
<div class="dropdown-divider"></div>
<a href="{{ url('settings') }}" class="dropdown-item">
<i class="fa fa-user mr-2"></i> Settings
<i class="fas fa-user mr-2"></i> Settings
</a>
<div class="dropdown-divider"></div>
@if ($user->switched)
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
<i class="fa fa-sign-out mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
</a>
@else
<a href="{{ url('logout') }}" class="dropdown-item">
<i class="fa fa-sign-out mr-2"></i> Log Out
<i class="fas fa-sign-out-alt mr-2"></i> Log Out
</a>
@endif
</div>
</li>
@else
<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fas fa-lock"></i></a>
@endif
<!-- Control Side Bar -->
@isset($controlsidebar)
<li class="nav-item">
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#">
<i class="fa fa-th-large"></i>
<i class="fas fa-th"></i>
</a>
</li>
@endisset
@@ -75,15 +75,25 @@
</nav>
@section('page-scripts')
@js('/plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js','bs-typeahead')
<style>
/* Solid border */
div.typeahead.dropdown-menu > .dropdown-header {
color: #000000;
text-align: left;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$("input[name=q]").typeahead({
autoSelect: false,
scrollHeight: 10,
theme: 'bootstrap4',
delay: 500,
minLength: 2,
items: {{ isset($search_limit) ? $search_limit : 15 }},
items: {{ isset($search_limit) ? $search_limit : 100 }},
fitToElement: false,
selectOnBlur: false,
appendTo: "#search_results",
source: function (query,process) {
search('{{ url("search",['date'=>isset($ido) ? $ido->id : NULL]) }}',query,process);
@@ -91,8 +101,14 @@
matcher: function () { return true; },
// Disable sorting and just return the items (items should by the ajax method)
sorter: function(items) {
return items;
},
updater: function (item) {
window.parent.location.href = '{{ url("/") }}'+users[item];
console.log(item.value);
window.parent.location.href = item.value;
},
})
.on('keyup keypress', function(event) {
@@ -126,17 +142,7 @@
// if json is null, means no match, won't do again.
if(data==null || (data.length===0)) return;
users = {};
userLabels = [];
_.each(data,function(item,ix,list) {
if (_.includes(users,item.label))
item.label = item.label + ' #' + item.value;
userLabels.push(item.label);
users[item.label] = item.value;
});
process(userLabels);
process(data);
},
complete : function() {
if (--c == 0) {

View File

@@ -14,6 +14,8 @@
});
$.AdminLTESidebarTweak = {};
$.AdminLTESidebarTweak.Open = true;
$.AdminLTESidebarTweak.ResizeDelay = 1000;
$.AdminLTESidebarTweak.options = {
EnableRemember: true,
@@ -24,6 +26,29 @@
// Work out our timezone.
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
/**
* Open and close the sidebar
* @param state
* @param addclass
*/
function sidebaropenclose(state,addclass) {
// Dont do anything if the state hasnt changed.
if (state == $.AdminLTESidebarTweak.Open) {
return;
}
$.AdminLTESidebarTweak.Open = state;
if (addclass !== 'undefined')
$("body")
.addClass(state ? 'sidebar-open' : 'sidebar-collapse');
$(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
}
$(function () {
"use strict";
@@ -31,22 +56,15 @@
if($.AdminLTESidebarTweak.options.EnableRemember) {
document.cookie = "toggleState=closed;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
$("body").queue(sidebaropenclose(false));
}
});
// @todo this is not firing.
$("body").on("shown.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember){
document.cookie = "toggleState=opened;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
$("body").queue(sidebaropenclose(true));
}
});
@@ -60,12 +78,7 @@
$(this).removeClass('hold-transition');
});
}else{
$("body")
.addClass('sidebar-collapse')
.delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
$("body").queue(sidebaropenclose(false,true));
}
}
}

View File

@@ -14,7 +14,7 @@
@if($user->exists)
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
@else
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a>
@endif
</div>

View File

@@ -2,7 +2,7 @@
<li class="nav-item">
<a href="#" class="nav-link @if(Route::current()->getName() == 'home') active @endif">
<i class="nav-icon fa fa-th"></i>
<i class="nav-icon fas fa-th"></i>
<p>
My Link Title
<span class="right badge badge-danger">New</span>

View File

@@ -0,0 +1,23 @@
<!-- 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 -->
@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