From 98b7b9f6a80274f40c7c02f3281ba78ecfb27603 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 8 Aug 2018 00:14:48 +1000 Subject: [PATCH] Fix login and password resets forms --- resources/themes/adminlte/lang/en/message.php | 33 +------- .../adminlte/views/auth/login.blade.php | 75 +++++++++--------- .../views/auth/passwords/email.blade.php | 76 ++++++++----------- .../views/auth/passwords/reset.blade.php | 46 +++++++++++ 4 files changed, 118 insertions(+), 112 deletions(-) create mode 100644 resources/themes/adminlte/views/auth/passwords/reset.blade.php diff --git a/resources/themes/adminlte/lang/en/message.php b/resources/themes/adminlte/lang/en/message.php index fa6276e..345e906 100644 --- a/resources/themes/adminlte/lang/en/message.php +++ b/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!', ]; diff --git a/resources/themes/adminlte/views/auth/login.blade.php b/resources/themes/adminlte/views/auth/login.blade.php index 686fd5b..007d3d2 100644 --- a/resources/themes/adminlte/views/auth/login.blade.php +++ b/resources/themes/adminlte/views/auth/login.blade.php @@ -1,53 +1,54 @@ @extends('adminlte::layouts.auth') @section('htmlheader_title') - Log in + Log in @endsection @section('content') -
- +
- + @include('adminlte::layouts.partials.scripts_auth') + + @endsection \ No newline at end of file diff --git a/resources/themes/adminlte/views/auth/passwords/email.blade.php b/resources/themes/adminlte/views/auth/passwords/email.blade.php index e1ce641..27a8f32 100644 --- a/resources/themes/adminlte/views/auth/passwords/email.blade.php +++ b/resources/themes/adminlte/views/auth/passwords/email.blade.php @@ -1,59 +1,45 @@ @extends('adminlte::layouts.auth') @section('htmlheader_title') - Password recovery + Password recovery @endsection @section('content') + +
+ -
- - @include('adminlte::layouts.partials.scripts_auth') - - + @include('adminlte::layouts.partials.scripts_auth') - -@endsection +@endsection \ No newline at end of file diff --git a/resources/themes/adminlte/views/auth/passwords/reset.blade.php b/resources/themes/adminlte/views/auth/passwords/reset.blade.php new file mode 100644 index 0000000..2788f15 --- /dev/null +++ b/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') + +
+ +
+ + @include('adminlte::layouts.partials.scripts_auth') + +@endsection \ No newline at end of file