Fix login and password resets forms

resources/themes/adminlte/lang/en/message.php

@@ -24,7 +24,7 @@ return [
     'conditions'              => 'Terms and conditions',
     'register'                => 'Register',
     'login'                   => 'Login',
-    'membreship'              => 'I already have a membership',
+    'membership'              => 'I already have a membership',
     'passwordclickreset'      => 'Click here to reset your password:',
     'signGithub'              => 'Sign in using Github',
     'signFacebook'            => 'Sign in using Facebook',
@@ -51,35 +51,21 @@ return [
     'level'                   => 'Level',
     'here'                    => 'Here',
     'recentactivity'          => 'Recent Activity',
-    'descriptionpackage'      => 'A Laravel 5 package that switchs default Laravel scaffolding/boilerplate to AdminLTE template',
     'createdby'               => 'Created by',
     'seecode'                 => 'See code at',
     'online'                  => 'Online',
     'home'                    => 'Home',
     'header'                  => 'HEADER',
-    'anotherlink'             => 'Another Link',
-    'multilevel'              => 'Multilevel',
-    'linklevel2'              => 'Link in level2',
-    'birthday'                => 'Langdon\'s Birthday',
-    'birthdaydate'            => 'Will be 23 on April 24th',
     'progress'                => 'Tasks Progress',
-    'customtemplate'          => 'Custom Template Design',
     'statstab'                => 'Stats Tab Content',
     'generalset'              => 'General Settings',
     'reportpanel'             => 'Report panel usage',
     'checked'                 => 'checked',
-    'informationsettings'     => 'Some information about this general settings option',
     'togglenav'               => 'Toggle navigation',
-    'tabmessages'             => 'You have 4 messages',
     'supteam'                 => 'Support Team',
-    'awesometheme'            => 'Why not buy a new awesome theme?',
     'allmessages'             => 'See All Messages',
-    'notifications'           => 'You have 10 notifications',
-    'newmembers'              => '5 new members joined today',
     'viewall'                 => 'View all',
-    'tasks'                   => 'You have 9 tasks',
     'alltasks'                => 'View all tasks',
-    'desbuttons'              => 'Design some buttons',
     'complete'                => 'Complete',
     'membersince'             => 'Member since',
     'followers'               => 'Followers',
@@ -87,26 +73,15 @@ return [
     'friends'                 => 'Friends',
     'profile'                 => 'Profile',
     'signout'                 => 'Sign out',
-    'landingdescription'      => 'Laravel 5 package that switchs default Laravel scaffolding/boilerplate to AdminLTE template with Bootstrap 3.0 and Pratt Landing page',
-    'landingdescriptionpratt' => 'Acacha AdminLTE Laravel package template Landing page - Using Pratt',
-    'description'             => 'Description',
     'showcase'                => 'Showcase',
     'contact'                 => 'Contact',
-    'laravelpackage'          => '5 package that switchs default Laravel',
     'to'                      => 'to',
-    'templatewith'            => 'template with',
     'and'                     => 'and',
     'gedstarted'              => 'Get Started!',
-    'amazing'                 => 'Amazing admin template',
-    'basedadminlte'           => 'Based on adminlte bootstrap theme',
-    'awesomepackaged'         => 'Awesome packaged...',
     'by'                      => 'by',
     'at'                      => 'at',
-    'readytouse'              => 'ready to use with Laravel!',
-    'designed'                => 'Designed To Excel',
     'community'               => 'Community',
     'see'                     => 'See',
-    'githubproject'           => 'Github project',
     'post'                    => 'post',
     'issues'                  => 'issues',
     'pullrequests'            => 'Pull requests',
@@ -114,10 +89,6 @@ return [
     'monitoring'              => 'Monitoring',
     'whatnew'                 => 'What\'s New?',
     'features'                => 'Some Features',
-    'design'                  => 'First Class Design',
-    'retina'                  => 'Retina Ready Theme',
-    'support'                 => 'Awesome Support',
-    'responsive'              => 'Responsive Design',
     'screenshots'             => 'Some Screenshots',
     'address'                 => 'Address',
     'dropus'                  => 'Drop Us A Line',
@@ -137,4 +108,6 @@ return [
     'entering'                => 'Entering...',
     'registered'              => 'User Registered!',
     'switchoff'               => 'Switch Back',
+    'success'                 => 'Success!',
+    'resetemaillink'          => 'We have e-mailed your password reset link!',
 ];

resources/themes/adminlte/views/auth/login.blade.php

@@ -34,8 +34,9 @@
 				@if(count(config('auth.social',[])))
 					@include('adminlte::auth.partials.social_login')
 				@endif
-            </div>
+			</div><!-- /.login-box-body -->
-        </div>
+
+		</div><!-- /.login-box -->
 	</div>
 
 	@include('adminlte::layouts.partials.scripts_auth')

resources/themes/adminlte/views/auth/passwords/email.blade.php

@@ -5,13 +5,11 @@
 @endsection
 
 @section('content')
-
+<body class="hold-transition login-page">
-<body class="login-page">
+	<div id="app" v-cloak>
-    <div id="app">
-
 		<div class="login-box">
 			<div class="login-logo">
-            <a href="{{ url('/home') }}"><b>Admin</b>LTE</a>
+				<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
 			</div><!-- /.login-logo -->
 
 			@if (session('status'))
@@ -32,28 +30,16 @@
 			@endif
 
 			<div class="login-box-body">
-            <p class="login-box-msg">Reset Password</p>
+				<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
 
 				<email-reset-password-form></email-reset-password-form>
 
 				<a href="{{ url('/login') }}">Log in</a><br>
-
 			</div><!-- /.login-box-body -->
 
 		</div><!-- /.login-box -->
 	</div>
 
 	@include('adminlte::layouts.partials.scripts_auth')
-
-    <script>
-        $(function () {
-            $('input').iCheck({
-                checkboxClass: 'icheckbox_square-blue',
-                radioClass: 'iradio_square-blue',
-                increaseArea: '20%' // optional
-            });
-        });
-    </script>
 </body>
-
 @endsection

resources/themes/adminlte/views/auth/passwords/reset.blade.php

@@ -0,0 +1,46 @@
+@extends('adminlte::layouts.auth')
+
+@section('htmlheader_title')
+	Password reset
+@endsection
+
+@section('content')
+<body class="hold-transition login-page">
+	<div id="app" v-cloak>
+		<div class="login-box">
+			<div class="login-logo">
+				<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
+			</div><!-- /.login-logo -->
+
+			@if (session('status'))
+				<div class="alert alert-success">
+					{{ session('status') }}
+				</div>
+			@endif
+
+			@if (count($errors) > 0)
+				<div class="alert alert-danger">
+					<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
+					<ul>
+						@foreach ($errors->all() as $error)
+							<li>{{ $error }}</li>
+						@endforeach
+					</ul>
+				</div>
+			@endif
+
+			<div class="login-box-body">
+				<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
+
+				<reset-password-form token="{{ $token }}">></reset-password-form>
+
+				<a href="{{ url('/login') }}">Log in</a><br>
+				<a href="{{ url('/register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
+			</div><!-- /.login-box-body -->
+
+		</div><!-- /.login-box -->
+	</div>
+
+	@include('adminlte::layouts.partials.scripts_auth')
+</body>
+@endsection