Merged updates from other projects

resources/theme/backend/adminlte/auth/login.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.auth')
+@extends('adminlte::layouts.auth')
 
 @section('htmlheader_title')
 	Log in
@@ -14,7 +14,7 @@
 
 			@if (count($errors) > 0)
 				<div class="alert alert-danger">
-					<strong>Whoops!</strong> {{ trans('message.someproblems') }}<br><br>
+					<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
 					<ul>
 						@foreach ($errors->all() as $error)
 							<li>{{ $error }}</li>
@@ -24,20 +24,21 @@
 			@endif
 
 			<div class="login-box-body">
-				<p class="login-box-msg"> {{ trans('message.siginsession') }} </p>
+				<p class="login-box-msg"> {{ trans('adminlte_lang::message.siginsession') }} </p>
 
 				<login-form name="{{ config('auth.providers.users.field','email') }}"
 					domain="{{ config('auth.defaults.domain','') }}"></login-form>
 
-				<a href="{{ url('/password/reset') }}">{{ trans('message.forgotpassword') }}</a><br>
+				<a href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a><br>
 
-				@if(isset($site_social))
-					@include('auth.partials.social_login')
+				@if(count(config('auth.social',[])))
+					@include('adminlte::auth.partials.social_login')
 				@endif
 			</div>
 		</div>
 	</div>
-	@include('layouts.partials.scripts_auth')
+
+	@include('adminlte::layouts.partials.scripts_auth')
 
 	<script>
 		$(function () {

resources/theme/backend/adminlte/layouts/partials/mainheader.blade.php

@@ -4,15 +4,15 @@
 	<!-- Logo -->
 	<a href="{{ url('/home') }}" class="logo">
 		<!-- mini logo for sidebar mini 50x50 pixels -->
-		<span class="logo-mini">{!! config('name_html_short','<b>A</b>N') !!}</span>
+		<span class="logo-mini">{!! config('app.name_html_short','<b>A</b>N') !!}</span>
 		<!-- logo for regular state and mobile devices -->
-		<span class="logo-lg">{!! config('name_html_long','<b>App</b>Name') !!}</span>
+		<span class="logo-lg">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
 	</a>
 
 	<!-- Header Navbar -->
 	<nav class="navbar navbar-static-top" role="navigation">
 		<!-- Sidebar toggle button-->
-		<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+		<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
 			<span class="sr-only">{{ trans('message.togglenav') }}</span>
 		</a>
 		<!-- Navbar Right Menu -->

resources/theme/backend/adminlte/layouts/partials/sidebar.blade.php

@@ -30,7 +30,7 @@
 		<!-- /.search form -->
 
 		<!-- Sidebar Menu -->
-		<ul class="sidebar-menu">
+		<ul class="sidebar-menu" data-widget="tree">
 			<li class="header">Menu</li>
 			<!-- Optionally, you can add icons to the links -->
 			<li class="active"><a href="{{ url('home',['date'=>(isset($ido) ? $ido->id : NULL)]) }}"><i class='fa fa-link'></i> <span>{{ trans('message.home') }}</span></a></li>