From b97f89ac80a6a593a140fc075c670e297c0b0f2b Mon Sep 17 00:00:00 2001
From: alexandre-pereira <alexandre.pereira.it@gmail.com>
Date: Mon, 23 Mar 2015 16:46:50 +0100
Subject: [PATCH] dazda

---
 SRC/app/Http/Controllers/LoginController.php |  4 ++--
 SRC/resources/views/auth/password.blade.php  |  2 +-
 SRC/resources/views/auth/reset.blade.php     | 15 +++++----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/SRC/app/Http/Controllers/LoginController.php b/SRC/app/Http/Controllers/LoginController.php
index 6d35488..094267b 100755
--- a/SRC/app/Http/Controllers/LoginController.php
+++ b/SRC/app/Http/Controllers/LoginController.php
@@ -101,11 +101,11 @@ class LoginController extends Controller {
         switch ($response)
 		{
 		  case Password::INVALID_PASSWORD:
-		  	return Redirect::back()->withErrors("Votre mot de passe est invalide. Essayez-en un autre.")->withInput();
+		  	return Redirect::back()->withErrors("Votre mot de passe doit contenir au minimum 6 caractères.")->withInput();
 		  case Password::INVALID_TOKEN:
 		  	return Redirect::back()->withErrors("Erreur de token, contactez l'administrateur, merci.")->withInput();
 		  case Password::INVALID_USER:
-		    return Redirect::back()->withErrors("Utilsateur invalide")->withInput();
+		    return Redirect::back()->withErrors("L'adresse email saisie est incorrecte.")->withInput();
 		  default :
 		    return Redirect::to('/login')->withStatus("Votre mot de passe a été changé avc succès !");
 		}
diff --git a/SRC/resources/views/auth/password.blade.php b/SRC/resources/views/auth/password.blade.php
index ad28a1c..f7650c5 100755
--- a/SRC/resources/views/auth/password.blade.php
+++ b/SRC/resources/views/auth/password.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 <link href="css/home.css" rel="stylesheet" type="text/css"/>
 
-<div style="margin-top: 70px" class="container-fluid">
+<div class="container-fluid">
 	<div class="row">
 		<div class="col-md-8 col-md-offset-2">
 			<div class="panel panel-default">
diff --git a/SRC/resources/views/auth/reset.blade.php b/SRC/resources/views/auth/reset.blade.php
index 1347e26..0ca0681 100755
--- a/SRC/resources/views/auth/reset.blade.php
+++ b/SRC/resources/views/auth/reset.blade.php
@@ -1,24 +1,19 @@
 @extends('backend/template')
 
 @section('content')
-<div style="margin-top: 70px"  class="container-fluid">
+<div class="container-fluid">
 	<div class="row">
 		<div class="col-md-8 col-md-offset-2">
 			<div class="panel panel-default">
 				<div class="panel-heading">Changer votre mot de passe</div>
 				<div class="panel-body">
 					@if (count($errors) > 0)
-						<div class="alert alert-danger">
-							<strong>Oouups!</strong> Il y a un problème.<br><br>
-							<ul>
-								@foreach ($errors->all() as $error)
-									<li>{{ $error }}</li>
-								@endforeach
-							</ul>
-						</div>
+                        @foreach ($errors->all() as $error)
+                            <div class="alert alert-danger">{{ $error }}</div>
+                        @endforeach
 					@endif
 
-					<form class="form-horizontal" role="form" method="POST" action="/password/reset">
+					<form class="form-horizontal" role="form" method="POST" action="{{URL::to('password/reset')}}">
 						<input type="hidden" name="_token" value="{{ csrf_token() }}">
 						<input type="hidden" name="token" value="{{ $token }}">