Compare commits

...

2 Commits
0.3.6 ... 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
5 changed files with 20 additions and 8 deletions

View File

@@ -4,7 +4,7 @@
@include('adminlte::layouts.partials.htmlheader') @include('adminlte::layouts.partials.htmlheader')
@show @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 id="app">
<div class="wrapper"> <div class="wrapper">
@include('adminlte::layouts.partials.mainheader') @include('adminlte::layouts.partials.mainheader')

View File

@@ -14,7 +14,7 @@
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li> <li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
@endforeach @endforeach
@endisset @endisset
<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li> <li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
</ol> </ol>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->

View File

@@ -46,6 +46,8 @@
</a> </a>
</div> </div>
</li> </li>
@else
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
@endif @endif
<!-- Control Side Bar --> <!-- Control Side Bar -->

View File

@@ -25,15 +25,25 @@
"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"; document.cookie = "toggleState=closed;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
} }
}); });
// @todo this is not firing. // @todo this is not firing.
$("body").on("expanded.lte.pushmenu", function(){ $("body").on("shown.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember){ if($.AdminLTESidebarTweak.options.EnableRemember){
document.cookie = "toggleState=opened"; document.cookie = "toggleState=opened;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
} }
}); });

View File

@@ -11,10 +11,10 @@
<!-- Sidebar user panel (optional) --> <!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex"> <div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image"> <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>
<div class="info"> <div class="info">
<a class="d-block">{{ $user->name ?: 'Nobody' }}</a> <a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
</div> </div>
</div> </div>