Compare commits

...

8 Commits
0.3.0 ... 0.3.8

Author SHA1 Message Date
Deon George
70a7142877 Fix for sidebar collapse/expand and window resizing 2019-05-16 11:15:49 +10:00
Deon George
c406c35ff7 User login updates 2019-04-11 22:30:03 +10:00
Deon George
6d84613158 Added custom css files 2019-03-28 11:16:50 +11:00
Deon George
05dbcaf6c4 Added creativeorange/gravatar to requirements 2019-03-26 17:23:46 +11:00
Deon George
867b42be91 Added acache/user to requirements 2019-03-26 17:18:40 +11:00
Deon George
f44e6f1d09 Added csrf_field() to login form 2019-03-26 14:31:18 +11:00
Deon George
fb88cf2866 Added items to search 2019-03-22 21:52:44 +11:00
Deon George
91aa1d9378 Enabled search results and remember sidebar collapse 2019-02-18 20:44:17 +11:00
9 changed files with 92 additions and 22 deletions

View File

@@ -11,6 +11,8 @@
],
"require": {
"igaster/laravel-theme": "^2.0",
"acacha/user": "^0.2.2",
"creativeorange/gravatar": "^1.0",
"orchestra/asset": "^3.6"
},
"require-dev": {

View File

@@ -30,9 +30,10 @@ return [
'signFacebook' => 'Sign in using Facebook',
'signTwitter' => 'Sign in using Twitter',
'signGoogle+' => 'Sign in using Google+',
'signLinkedin' => 'Sign in using Linkedin',
'signLinkedin' => 'Sign in using Linkedin',
'signW3id' => 'Sign in using W3id',
'signIBMid' => 'Sign in using IBMid',
'signMeetup' => 'Sign in using Meetup',
'sendpassword' => 'Send Password Reset Link',
'passwordreset' => 'Reset password',
'pagenotfound' => 'Page not found',

View File

@@ -27,6 +27,7 @@
<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
<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">

View File

@@ -4,7 +4,7 @@
@include('adminlte::layouts.partials.htmlheader')
@show
<body class="hold-transition sidebar-mini">
<body class="hold-transition sidebar-mini @if (Cookie::get('toggleState') === 'closed') {{ 'sidebar-collapse' }} @endif">
<div id="app">
<div class="wrapper">
@include('adminlte::layouts.partials.mainheader')

View File

@@ -7,14 +7,14 @@
<small>@yield('contentheader_description','Description')</small>
</div><!-- /.col -->
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<ol class="breadcrumb float-sm-right small">
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
@isset($breadcrumb)
@foreach ($breadcrumb as $item => $url)
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
@endforeach
@endisset
<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li>
<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
</ol>
</div><!-- /.col -->
</div><!-- /.row -->

View File

@@ -16,8 +16,14 @@
<link rel="stylesheet" href="/css/adminlte.min.css">
<!-- Google Font: Source Sans Pro -->
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
<!-- Printing Modifications -->
<link rel="stylesheet" href="/css/print.css">
@if(file_exists('css/social.css'))
<!-- Social Logins -->
<link rel="stylesheet" href="/css/social.css">
@endif
@if(file_exists('css/print.css'))
<!-- Printing Modifications -->
<link rel="stylesheet" href="/css/print.css">
@endif
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -45,4 +51,9 @@
<!-- STYLESHEETS -->
{!! Asset::styles() !!}
@if(file_exists('css/fixes.css'))
<!-- CSS Fixes -->
<link rel="stylesheet" href="/css/fixes.css">
@endif
</head>

View File

@@ -6,7 +6,6 @@
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
</li>
</ul>
<!-- SEARCH FORM -->
@@ -18,6 +17,8 @@
<i class="fa 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>
<div id="search_results"></div>
</div>
</form>
@@ -45,6 +46,8 @@
</a>
</div>
</li>
@else
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
@endif
<!-- Control Side Bar -->
@@ -65,8 +68,9 @@
<script type="text/javascript">
$(document).ready(function() {
$("input[name=q]").typeahead({
delay: 300,
delay: 500,
minLength: 2,
items: {{ isset($search_limit) ? $search_limit : 15 }},
fitToElement: false,
appendTo: "#search_results",
source: function (query,process) {
@@ -95,14 +99,15 @@
type : 'GET',
data : 'term=' + query,
dataType : 'JSON',
async : false,
async : true,
cache : false,
beforeSend : function() {
if (c++ == 0) {
if (icon)
$('i[name='+icon+']').addClass("fa-spin");
else
$('i[name=searching]').removeClass("hidden");
else {
$('span[name=searching]').removeClass("d-none");
}
}
},
success : function(data) {
@@ -125,8 +130,9 @@
if (--c == 0) {
if (icon)
$('i[name='+icon+']').removeClass("fa-spin");
else
$('i[name=searching]').addClass("hidden");
else {
$('span[name=searching]').addClass("d-none");
}
}
}
})

View File

@@ -5,12 +5,61 @@
<!-- AdminLTE -->
<script src="/js/adminlte.min.js"></script>
<!-- Our our CSRF token to each interaction -->
{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
<script type="text/javascript">
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
// Our CSRF token to each interaction
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
$.AdminLTESidebarTweak = {};
$.AdminLTESidebarTweak.options = {
EnableRemember: true,
//Removes the transition after page reload.
NoTransitionAfterReload: false
};
$(function () {
"use strict";
$("body").on("collapsed.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember) {
document.cookie = "toggleState=closed;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
}
});
// @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();
});
}
});
if($.AdminLTESidebarTweak.options.EnableRemember){
var re = new RegExp('toggleState' + "=([^;]+)");
var value = re.exec(document.cookie);
var toggleState = (value != null) ? unescape(value[1]) : null;
if(toggleState == 'closed'){
if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){
$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
$(this).removeClass('hold-transition');
});
}else{
$("body").addClass('sidebar-collapse');
}
}
}
});
</script>

View File

@@ -11,10 +11,10 @@
<!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image">
<img src="{{ Gravatar::get($user->exists ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
</div>
<div class="info">
<a class="d-block">{{ $user->name ?: 'Nobody' }}</a>
<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
</div>
</div>