Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb

.bash_history

@@ -1,6 +1,3 @@
-ls
-git commit -a
-git config --global user.email www@37.187.101.7 
 git config --global user.name www
 git commit -a
 git push
@@ -480,3 +477,24 @@ ls
 python loader
 python loader.py
 python loader.py
+ls
+git status
+git pull
+git pull
+nano SRC/config/mail.php 
+git commit -a
+git push
+ls
+ls
+ls
+nano SRC/config/mail.php 
+nano .env 
+nano SRC/.env 
+git pull
+rm SRC/resources/views/auth/reset.blade.php 
+git pull
+ls
+git commit -a
+git commit -a
+git push
+exit

SRC/app/Http/Controllers/LoginController.php

@@ -89,12 +89,12 @@ class LoginController extends Controller {
     	return View::make('auth.reset')->with('token', $token);
     }
 
-    public function update($token)
+    public function update()
     {
     	$credentials = Input::only('email', 'password','password_confirmation','token');
     	$response = Password::reset($credentials, function($user, $password)
         {
-            $user->password = Hash::make($password);
+            $user->motdepasse = Hash::make($password);
             $user->save();
         });
 

SRC/app/Http/routes.php

@@ -24,7 +24,7 @@ Route::get('password/reset/{token}', array(
   'uses' => 'LoginController@reset',
   'as' => 'password.reset'
 ));
-Route::post('password/reset/{token}', array(
+Route::post('password/reset', array(
   'uses' => 'LoginController@update',
   'as' => 'password.update'
 ));

SRC/public/js/rechercheRef.js

@@ -0,0 +1,19 @@
+// fonction qui recherche le referent donnee en parametre
+function rechercherReferent()
+{
+	// on recupere le mot cle rentrer dans le champs de recherche
+	var  motCle = document.getElementById("searchfield").value; 
+	
+	//boucle sur chaque item
+	var list = document.getElementsByClassName("item");
+	
+	for (var i = 0; i < list.length; i++)
+	{
+		referent = list[i].getElementsByClassName('nomRef')[0].innerHTML; //recupere le nom du referent referent
+		if (referent.indexOf(motCle) > -1) //on compare si la recherche correspond à un nom
+		{
+			//on remplace la classe
+			list[i].className = "item active";
+		}
+	}
+}

SRC/resources/views/auth/register.blade.php

@@ -18,7 +18,7 @@
 						</div>
 					@endif
 
-					<form class="form-horizontal" role="form" method="POST" action="/auth/register">
+					<form class="form-horizontal" role="form" method="POST" action="/password/reset">
 						<input type="hidden" name="_token" value="{{ csrf_token() }}">
 
 						<div class="form-group">

SRC/resources/views/auth/reset.blade.php

@@ -0,0 +1,60 @@
+@extends('backend/template')
+
+@section('content')
+<div style="margin-top: 70px"  class="container-fluid">
+	<div class="row">
+		<div class="col-md-8 col-md-offset-2">
+			<div class="panel panel-default">
+				<div class="panel-heading">Réinitialiser 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>
+					@endif
+
+					<form class="form-horizontal" role="form" method="POST" action="/password/reset">
+						<input type="hidden" name="_token" value="{{ csrf_token() }}">
+						<input type="hidden" name="token" value="{{ $token }}">
+						
+						<div class="form-group">
+							<label class="col-md-4 control-label">Email</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="email">
+							</div>
+						</div>
+
+
+						<div class="form-group">
+							<label class="col-md-4 control-label">Mot de passe</label>
+							<div class="col-md-6">
+								<input type="password" class="form-control" name="password">
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="col-md-4 control-label">Confirmer mot de passe</label>
+							<div class="col-md-6">
+								<input type="password" class="form-control" name="password_confirmation">
+							</div>
+						</div>
+
+						<div class="form-group">
+							<div class="col-md-6 col-md-offset-4">
+								<button type="submit" class="btn btn-primary">
+									Réinitialiser Password
+								</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+@endsection

SRC/resources/views/backend/admin_home.blade.php

@@ -4,14 +4,20 @@
    <div class="container">
        <div class="row"><div class="col-md-12">
   @if (session('message_add'))
-    <div class="alert alert-success">
+    <div class="alert alert-success alert-dismissible fade in">
       {{ Session::get('message_add') }}
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
     </div>
   @endif
 
   @if (session('message_delete'))
-    <div class="alert alert-danger">
+    <div class="alert alert-danger alert-dismissible fade in">
       {{ Session::get('message_delete') }}
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
     </div>
   @endif
 </div></div>
@@ -42,7 +48,7 @@
           <td>
               <div class="btn-group" role="group" aria-label="...">
                   <a href="{{ URL::to('admin/logAs', $user->id) }}" class="btn btn-primary"><span class="glyphicon glyphicon-zoom-in"></span></a>
-                  <a href="{{ URL::to('admin/deleteUser', $user->id) }}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
+                  <a href="{{ URL::to('admin/deleteUser', $user->id) }}" class="btn btn-danger confirm"><span class="glyphicon glyphicon-trash"></span></a>
               </div>
             </td>
         </tr>
@@ -100,3 +106,12 @@
        </div>
 </div>
 @endsection
+
+@section('page-scripts')
+<script>
+    $('.confirm').click(function(e) {
+        if (!confirm('Voulez-vous vraiment confirmer la supression ?')) e.preventDefault();
+    });
+    
+</script>
+@endsection