From f131db31c6d890f2d93deeb9f2fdb402ce574eb0 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 9 Jan 2020 18:44:07 +1100
Subject: [PATCH] Added custom.js, login redirects to current page, added
 form-start/form-end and change breadcrumb width

---
 resources/themes/adminlte/views/layouts/app.blade.php      | 4 +++-
 .../views/layouts/partials/contentheader.blade.php         | 4 ++--
 .../adminlte/views/layouts/partials/mainheader.blade.php   | 2 +-
 .../adminlte/views/layouts/partials/scripts.blade.php      | 7 ++++++-
 .../adminlte/views/layouts/partials/sidebar.blade.php      | 4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/resources/themes/adminlte/views/layouts/app.blade.php b/resources/themes/adminlte/views/layouts/app.blade.php
index caa4a35..00e62f4 100644
--- a/resources/themes/adminlte/views/layouts/app.blade.php
+++ b/resources/themes/adminlte/views/layouts/app.blade.php
@@ -13,7 +13,8 @@
 
 				<!-- Content Wrapper. Contains page content -->
 				<div class="content-wrapper">
-
+					<!-- In case we have input fields in the header -->
+					@yield('page-form-start')
 					@include('adminlte::layouts.partials.contentheader')
 
 					<!-- Main content -->
@@ -24,6 +25,7 @@
 						</div>
 					</section><!-- /.content -->
 
+					@yield('page-form-end')
 				</div><!-- /.content-wrapper -->
 
 				@isset($controlsidebar)
diff --git a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php
index 9c47938..979f0f5 100644
--- a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php
@@ -2,12 +2,12 @@
 <div class="content-header d-print-none">
 	<div class="container-fluid">
 		<div class="row mb-2">
-			<div class="col-sm-6">
+			<div class="col-sm-8">
 				<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
 				<small>@yield('contentheader_description','Description')</small>
 			</div><!-- /.col -->
 
-			<div class="col-sm-6">
+			<div class="col-sm-4">
 				<ol class="breadcrumb float-sm-right small">
 					<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
 					@isset($breadcrumb)
diff --git a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
index 6bd5ef5..2ad4ec1 100644
--- a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
@@ -59,7 +59,7 @@
 				</div>
 			</li>
 		@else
-			<a href="{{ url('login') }}" 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="fa fa-lock"></i></a>
 		@endif
 
 		<!-- Control Side Bar -->
diff --git a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
index cdecab5..17ff101 100644
--- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
@@ -70,4 +70,9 @@
 			}
 		}
 	});
-</script>
\ No newline at end of file
+</script>
+
+@if(file_exists('js/custom.js'))
+	<!-- Any Custom JS -->
+	<script src="{{ asset('js/custom.js') }}"></script>
+@endif
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
index 48589d9..6d17984 100644
--- a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
@@ -14,13 +14,13 @@
 				@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 href="{{ url('login') }}" 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 fa fa-3x fa-lock"></i></a>
 				@endif
 			</div>
 
 			<div class="info">
 				<a href="{{ url('login') }}" class="d-block">{{ $user->exists ? ($user->name ?: 'No Name') : 'Login' }}</a>
-				@isset($user->lastlogin)<a span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
+				@isset($user->lastlogin)<a name="login" span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
 			</div>
 		</div>