From 05ff2b256c8ded02dd626a73e2009b84b0a95444 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 20 Mar 2018 17:39:35 +0800
Subject: [PATCH] Update reset password views

Remove unused files
---
 resources/lang/en/passwords.php                        | 12 ++++++------
 resources/lang/id/passwords.php                        | 11 ++++++-----
 resources/views/auth/partials/_notifications.blade.php | 15 ---------------
 resources/views/auth/passwords/email.blade.php         | 14 +++++++++-----
 resources/views/auth/passwords/reset.blade.php         | 13 ++++++-------
 5 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 resources/views/auth/partials/_notifications.blade.php

diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index e73b56d..b076092 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -13,10 +13,10 @@ return [
     |
     */
 
-    'password' => 'Passwords must be at least six characters and match the confirmation.',
-    'user'     => "We can't find a user with that e-mail address.",
-    'token'    => 'This password reset token is invalid.',
-    'sent'     => 'We have e-mailed your password reset link!',
-    'reset'    => 'Your password has been reset!',
-
+    'password'      => 'Passwords must be at least six characters and match the confirmation.',
+    'user'          => "We can't find a user with that e-mail address.",
+    'token'         => 'This password reset token is invalid.',
+    'sent'          => 'We have e-mailed your password reset link!',
+    'reset'         => 'Your password has been reset!',
+    'back_to_login' => 'Back to Login',
 ];
diff --git a/resources/lang/id/passwords.php b/resources/lang/id/passwords.php
index 6659543..08826eb 100644
--- a/resources/lang/id/passwords.php
+++ b/resources/lang/id/passwords.php
@@ -13,9 +13,10 @@ return [
     |
     */
 
-    'password'  => 'Password harus minimal enam karakter dan cocok dengan konfirmasi.',
-    'user'      => 'Kami tidak dapat menemukan pengguna dengan email tersebut.',
-    'token'     => 'Token Reset Password tidak sah.',
-    'sent'      => 'Kami sudah mengirim email yang berisi tautan untuk mereset Password Anda!',
-    'reset'     => 'Password Anda sudah direset!',
+    'password'      => 'Password harus minimal enam karakter dan cocok dengan konfirmasi.',
+    'user'          => 'Kami tidak dapat menemukan pengguna dengan email tersebut.',
+    'token'         => 'Token Reset Password tidak sah.',
+    'sent'          => 'Kami sudah mengirim email yang berisi tautan untuk mereset Password Anda!',
+    'reset'         => 'Password Anda sudah direset!',
+    'back_to_login' => 'Kembali ke Login',
 ];
diff --git a/resources/views/auth/partials/_notifications.blade.php b/resources/views/auth/partials/_notifications.blade.php
deleted file mode 100644
index 6b772f4..0000000
--- a/resources/views/auth/partials/_notifications.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@if (session('status'))
-    <div class="alert alert-success">
-        {{ session('status') }}
-    </div>
-@endif
-@if (count($errors) > 0)
-    <div class="alert alert-danger">
-        <strong>Ups!</strong> Mohon cek kembali form berikut.
-        <ul>
-            @foreach ($errors->all() as $error)
-                <li>{{ $error }}</li>
-            @endforeach
-        </ul>
-    </div>
-@endif
\ No newline at end of file
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index edf3d94..442abc0 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,17 +1,21 @@
 @extends('layouts.guest')
 
-@section('title', trans('auth.reset_password'))
+@section('title', __('auth.reset_password'))
 
 @section('content')
 <div class="col-md-4 col-md-offset-4">
 	<div class="login-panel panel panel-default">
-		<div class="panel-heading"><h3 class="panel-title">{{ trans('auth.reset_password') }}</h3></div>
+		<div class="panel-heading"><h3 class="panel-title">{{ __('auth.reset_password') }}</h3></div>
 		<div class="panel-body">
-            @include('auth.partials._notifications')
+            @if (session('status'))
+                <div class="alert alert-success">
+                    {{ session('status') }}
+                </div>
+            @endif
 			{!! Form::open(['route'=>'auth.reset-email']) !!}
             {!! FormField::email('email') !!}
-            {!! Form::submit(trans('auth.send_reset_password_link'), ['class'=>'btn btn-success btn-block']) !!}
-            {!! link_to_route('auth.login','Back to Login', [],['class'=>'btn btn-default btn-block']) !!}
+            {!! Form::submit(__('auth.send_reset_password_link'), ['class'=>'btn btn-success btn-block']) !!}
+            {!! link_to_route('auth.login', __('passwords.back_to_login'), [], ['class'=>'btn btn-default btn-block']) !!}
             {!! Form::close() !!}
 		</div>
     </div>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 8857fc8..6bb5203 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -1,22 +1,21 @@
 @extends('layouts.guest')
 
-@section('title', trans('auth.reset_password'))
+@section('title', __('auth.reset_password'))
 
 @section('content')
 <div class="col-md-6 col-md-offset-3">
     <div class="login-panel panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title">{{ trans('auth.reset_password') }}</h3></div>
+        <div class="panel-heading"><h3 class="panel-title">{{ __('auth.reset_password') }}</h3></div>
         {!! Form::open(['route' => 'reset-password']) !!}
         <div class="panel-body">
-            @include('auth.partials._notifications')
-            <p>{{ trans('auth.reset_password_instruction') }} :</p>
+            <p>{{ __('auth.reset_password_hint') }} :</p>
             {!! FormField::email('email') !!}
-            {!! FormField::password('password', ['label' => trans('auth.new_password')]) !!}
-            {!! FormField::password('password_confirmation', ['label' => trans('auth.new_password_confirmation')]) !!}
+            {!! FormField::password('password', ['label' => __('auth.new_password')]) !!}
+            {!! FormField::password('password_confirmation', ['label' => __('auth.new_password_confirmation')]) !!}
             {!! Form::hidden('token', $token) !!}
         </div>
         <div class="panel-footer">
-            {!! Form::submit(trans('auth.reset_password'), ['class'=>'btn btn-info']) !!}
+            {!! Form::submit(__('auth.reset_password'), ['class'=>'btn btn-info']) !!}
         </div>
         {!! Form::close() !!}
     </div>