From 0bd32aab4a53a7f74d76a77165f973026ce90444 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 1 Aug 2018 16:28:10 +1000
Subject: [PATCH] Layout updates, switch user updates

---
 resources/themes/adminlte/views/layouts/app.blade.php  |  2 +-
 .../adminlte/views/layouts/partials/footer.blade.php   |  2 +-
 .../views/layouts/partials/htmlheader.blade.php        |  7 ++++++-
 .../adminlte/views/layouts/partials/scripts.blade.php  |  4 ++--
 .../views/layouts/partials/sidebarmenu.blade.php       |  2 +-
 src/Controllers/AdminController.php                    |  6 +++---
 src/Traits/UserSwitch.php                              | 10 +++++-----
 7 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/resources/themes/adminlte/views/layouts/app.blade.php b/resources/themes/adminlte/views/layouts/app.blade.php
index b9514e0..7fbe55c 100644
--- a/resources/themes/adminlte/views/layouts/app.blade.php
+++ b/resources/themes/adminlte/views/layouts/app.blade.php
@@ -5,7 +5,7 @@
 	@include('adminlte::layouts.partials.htmlheader')
 @show
 
-<body class="fixed skin-blue sidebar-mini">
+<body class="fixed hold-transition skin-blue sidebar-mini">
 	<div id="app" v-cloak>
 		<div class="wrapper">
 			@include('adminlte::layouts.partials.mainheader')
diff --git a/resources/themes/adminlte/views/layouts/partials/footer.blade.php b/resources/themes/adminlte/views/layouts/partials/footer.blade.php
index f6e732d..6ffa108 100644
--- a/resources/themes/adminlte/views/layouts/partials/footer.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/footer.blade.php
@@ -1,5 +1,5 @@
 <!-- Main Footer -->
-<footer class="main-footer">
+<footer class="main-footer no-print">
     <!-- To the right -->
     <div class="pull-right hidden-xs">
         <a href="#"></a><b>{{ config('app.name') }}</b></a>
diff --git a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
index bc8100b..cfc2373 100644
--- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
@@ -1,5 +1,6 @@
 <head>
 	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here')</title>
 	<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 	<!-- CSRF Token -->
@@ -14,6 +15,10 @@
 	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->
 
+	<style>
+		body { color: #333; }
+	</style>
+
 	<script>
 		//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs
 		window.trans =
@@ -32,4 +37,4 @@
 
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
-</head>
+</head>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
index 579af61..4c19f45 100644
--- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
@@ -18,5 +18,5 @@
       Both of these plugins are recommended to enhance the
       user experience. Slimscroll is required when using the
       fixed layout. -->
-@js('/site/js/jquery.slimscroll.min.js','jq.slimscroll');
-@js('/site/js/fastclick.min.js','jq.fastclick');
+@js('/site/js/jquery.slimscroll.min.js','jq.slimscroll')
+@js('/site/js/fastclick.min.js','jq.fastclick')
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
index cc73e3a..62c635b 100644
--- a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
@@ -1,5 +1,5 @@
 <ul class="sidebar-menu" data-widget="tree">
-	<li class="header">Menu</li>
+	<li class="header"><b>MENU</b></li>
 		<!-- Optionally, you can add icons to the links -->
 	<li @if(Route::current()->getName() == 'home')class="active"@endif><a href="{{ url('home',['date'=>(isset($ido) ? $ido->id : NULL)]) }}"><i class='fa fa-link'></i> <span>{{ trans('adminlte_lang::message.home') }}</span></a></li>
 </ul>
diff --git a/src/Controllers/AdminController.php b/src/Controllers/AdminController.php
index 7b4ff1c..be003f8 100644
--- a/src/Controllers/AdminController.php
+++ b/src/Controllers/AdminController.php
@@ -16,9 +16,9 @@ class AdminController extends Controller
 		$this->middleware('auth');
 	}
 
-	public function switch_authorised()
+	public function switch_authorised($id)
 	{
-		return Auth::user()->isAdmin ? TRUE : FALSE;
+		return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($id)) ? TRUE : FALSE;
 	}
 
 	public function switch_session()
@@ -31,7 +31,7 @@ class AdminController extends Controller
 	 */
 	public function user_switch_start($id)
 	{
-		if ($this->switch_session() AND $this->switch_authorised())
+		if ($this->switch_session() AND $this->switch_authorised($id))
 		{
 			$uo = User::find($id);
 
diff --git a/src/Traits/UserSwitch.php b/src/Traits/UserSwitch.php
index 7503cda..5d7a917 100644
--- a/src/Traits/UserSwitch.php
+++ b/src/Traits/UserSwitch.php
@@ -9,13 +9,13 @@ use Session;
 
 trait UserSwitch
 {
-	public function GetIsAdminAttribute()
-	{
-		return isset($this->admin) ? $this->admin : FALSE;
-	}
-
 	public function getSwitchedAttribute()
 	{
 		return Session::get('orig_user');
 	}
+
+	public function isAdmin($id)
+	{
+		return isset($this->admin) ? $this->admin : FALSE;
+	}
 }
\ No newline at end of file
