From fe630d6683a10ce9329b1c3348ffff5cf7620f27 Mon Sep 17 00:00:00 2001
From: Malibu <matthieu-p93@live.fr>
Date: Tue, 17 Feb 2015 22:10:27 +0100
Subject: [PATCH] blabla

---
 SRC/app/Http/Controllers/AdminController.php |  2 +-
 SRC/resources/views/admin.blade.php          | 33 +++++---------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/SRC/app/Http/Controllers/AdminController.php b/SRC/app/Http/Controllers/AdminController.php
index 49be1eb..c198cbf 100755
--- a/SRC/app/Http/Controllers/AdminController.php
+++ b/SRC/app/Http/Controllers/AdminController.php
@@ -58,7 +58,7 @@ class AdminController extends Controller {
 		$idUser = Input::get('idUser');
 		$user = User::find($idUser);
 		$user->delete();
-		return redirect('/admin');
+		return redirect('/admin')->with('message_delete', 'Referent supprimé avec succès');
 	}
 
 }
diff --git a/SRC/resources/views/admin.blade.php b/SRC/resources/views/admin.blade.php
index f6be183..134c72d 100755
--- a/SRC/resources/views/admin.blade.php
+++ b/SRC/resources/views/admin.blade.php
@@ -2,12 +2,9 @@
 
 @section('content')
 
-<<<<<<< HEAD
 {{ Session::get('message_add') }}
 {{ Session::get('message_delete') }}
 
-=======
->>>>>>> baac10fe2346f5271d81bf13195da790a3f484f3
   <br>
   <div class="col-md-2"></div>
 
@@ -18,8 +15,10 @@
       <thead>
         <tr style="background-color: #F7BE81">
           <td>Nom</td>
+          <td>Prénom</td>
           <td>Mail</td>
           <td>Lieu</td>
+          <td>Type</td>
           <td>Se connecter</td>
           <td>Supprimer</td>
         </tr>
@@ -30,22 +29,17 @@
         <input type="hidden" name="idUser" value="{{ $user->id }}">
         <input type="hidden" name="_token" value="{{{ csrf_token() }}}" />
         <tr style="background-color: #F6E3CE">
-          <td>{{$user->name}}</td>
+          <td>{{$user->firstname}}</td>
+          <td>{{$user->lastname}}</td>
           <td>{{$user->email}}</td>
-<<<<<<< HEAD
           <td>{{$user->city}}</td>
           @if ($user->admin == 0)
             <td>Référent</td>
           @else
             <td>Admin</td>
           @endif
-          <td><a href="#" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-ok"></span></a></td>
-          <td><button type="submit" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-trash"></span></a></td>
-=======
-          <td>Toulouse</td>
           <td><a href="#" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-log-in"></span></a></td>
-          <td><a href="#" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-trash"></span></a></td>
->>>>>>> baac10fe2346f5271d81bf13195da790a3f484f3
+          <td><button type="submit" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-trash"></span></a></td>
         </tr>
         </form>
       @endforeach
@@ -63,6 +57,7 @@
         <h4 class="modal-title" id="myModalLabel">Créer un nouvel adhérent</h4>
       </div>
       <form class="form-horizontal" method="POST" role="form" action="addUser">
+        <input type="hidden" name="_token" value="{{{ csrf_token() }}}" />
       <div class="modal-body">
             <div class="form-group">
               <label for="firstname" class="col-sm-2 control-label">Prénom</label>
@@ -73,27 +68,18 @@
             <div class="form-group">
               <label for="lastname" class="col-sm-2 control-label">Nom</label>
               <div class="col-sm-10">
-<<<<<<< HEAD
                 <input type="text" class="form-control" id="lastname" name="lastname" required placeholder="Nom">
-=======
-                <input type="text" class="form-control" id="lastname" placeholder="Nom">
->>>>>>> baac10fe2346f5271d81bf13195da790a3f484f3
               </div>
             </div>
             <div class="form-group">
               <label for="email" class="col-sm-2 control-label">Email</label>
               <div class="col-sm-10">
-<<<<<<< HEAD
                 <input type="email" class="form-control" id="email" name="email" required placeholder="Email">
-=======
-                <input type="email" class="form-control" id="email" placeholder="Email">
->>>>>>> baac10fe2346f5271d81bf13195da790a3f484f3
               </div>
             </div>
             <div class="form-group">
               <label for="city" class="col-sm-2 control-label">Ville</label>
               <div class="col-sm-10">
-<<<<<<< HEAD
                 <input type="text" class="form-control" id="city" name="city" required placeholder="Ville">
               </div>
             </div>
@@ -104,17 +90,12 @@
                     <input name="isadmin" type="checkbox"> Est administrateur
                   </label>
                 </div>
-=======
-                <input type="text" class="form-control" id="city" placeholder="Ville">
->>>>>>> baac10fe2346f5271d81bf13195da790a3f484f3
               </div>
             </div>
-          
-
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
-        <button type="button" class="btn btn-primary">Enregistrer</button>
+        <button type="submit" class="btn btn-primary">Enregistrer</button>
       </div>
       </form>
     </div>