From 374add1ef69db781e5dcc2f5f7a3420dc0b2c956 Mon Sep 17 00:00:00 2001
From: Malibu <matthieu-p93@live.fr>
Date: Thu, 19 Feb 2015 23:25:06 +0100
Subject: [PATCH] ll

---
 SRC/resources/views/referent.blade.php | 233 ++++++-------------------
 1 file changed, 49 insertions(+), 184 deletions(-)

diff --git a/SRC/resources/views/referent.blade.php b/SRC/resources/views/referent.blade.php
index 28f7836..d15095e 100755
--- a/SRC/resources/views/referent.blade.php
+++ b/SRC/resources/views/referent.blade.php
@@ -3,7 +3,8 @@
 @section('content')
 <link href="css/referent.css" rel="stylesheet" type="text/css"/>
 <br>
-<<<<<<< HEAD
+
+<!-- Navbar left -->
 <div class="col-md-3 listg">
 	<legend>Créer une liste oeuvre:</legend>
 	<form class="form-inline" method="POST" role="form" action="addListeOeuvre">
@@ -36,134 +37,8 @@
 	</table>
 </div>
 
-<div class="col-md-9 princ">
-	<div class="panel panel-default col-md-9"><br>
-  		<ul class="nav nav-tabs">
-    		<li role="presentation" class="active"><a href="#">Ma sélection</a></li>
-    		<li role="presentation"><a href="#">Ajouter des images</a></li>
- 	 	</ul>
-  		<br><br><br><br>
-	</div>
-	
-	<br><br><br>
-	<legend>Falbala: (Activer ou Désactiver la listeoeuvre)</legend>
 
-	<div class="col-md-9">
-		<span style="float: right">Sélectionner tout -- Annuler sélection</span>
-		<br>
-		<div class="panel panel-default">
-  			<div class="panel-body" id="oeuvrePic">
-
-				<!-- // TODO -->
-  			<button style="float: right" class="btn btn-primary">Enregistrer</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="col-md-3 jeux">
-	<legend>Mes jeux associés</legend>
-	<div class="col-md-8">
-		<select class="form-control">
-  			<option selected="selected">Tous les éléments</option>
-  			<option>1</option>
-  			<option>2</option>
-		</select>
-	</div>
-	<button style="margin-top: 5px" class="btn btn-primary">Ajouter</button>
-	<br><br>
-	<table class="table">
-  		<tr>
-    		<td>Montagne: noire</td>
-    		<td>Supprimer</td>
-  		</tr>
-  		<tr>
-    		<td>couleur: bleu</td>
-    		<td>Supprimer</td>
-  		</tr>
-	</table>
-</div>
-
-<div class="col-md-3 filtred">
-	<legend>Ajouter un filtre:</legend>
-	<h4>Par critère:</h4>
-	<select class="form-control">
-  		<option selected="selected">Selectionner catégorie</option>
-  		<option>1</option>
-  		<option>2</option>
-	</select>
-	<select class="form-control">
-  		<option selected="selected">Tous les éléments</option>
-  		<option>1</option>
-  		<option>2</option>
-	</select>
-	<button style="margin-top: 5px" class="btn btn-primary">Ajouter</button>
-	<br><br>
-
-	<h4>Par mot clé:</h4>
-	<form class="form-inline">
-  		<div class="col-sm-8 form-group">
-    		<div class="input-group">
-      			<input type="text" class="form-control" id="exampleInputAmount" placeholder="Par mot clé">
-    		</div>
-  		</div>
- 		<button type="submit" class="btn btn-primary">Ajouter</button>
-		<br><br>
-		<legend>Mes filtres</legend>
-		<table class="table">
-			<tr>
-				<td>Montagne: noire</td>
-				<td>Supprimer</td>
-			</tr>
-			<tr>
-				<td>couleur: bleu</td>
-				<td>Supprimer</td>
-			</tr>
-			<tr>
-				<td>âge: 10 ans</td>
-				<td>Supprimer</td>
-			</tr>
-		</table>
-	</form>
-</div>
-
-<div class="col-md-3 listRecherche">
-	<p>Liste, résultat de recherche</p>
-=======
-
-<!-- Sidebar left - Gestion des listes d'oeuvre  -->
-<div class="col-md-3 ccmd3">
-  <legend>Créer une liste oeuvre:</legend>
-  <form class="form-inline" method="POST" role="form" action="addListeOeuvre">
-    <input type="hidden" name="idUser" value="{{ $me->id }}">
-    <input type="hidden" name="_token" value="{{{ csrf_token() }}}" />
-    <div class="form-group">
-      <div class="input-group">
-        <input type="text" class="form-control" required="required" name="name" placeholder="Ajouter une liste d'oeuvre">
-      </div>
-    </div>
-    <button type="submit" class="btn btn-primary">Ajouter</button>
-  </form>
-
-  <br><br>
-  <legend>Mes listes d'oeuvres:</legend>
-  <table class="table table-hover">
-    @foreach ($listeoeuvres as $listeoeuvre)
-    <tr class="active listeoeuvre">
-      <form method="POST" role="form" action="deleteListeOeuvre">
-        <input type="hidden" name="idUser" value="{{ $me->id }}">
-        <input type="hidden" class="idListeOeuvre" name="idListeOeuvre" value="{{ $listeoeuvre->id }}">
-        <input type="hidden" name="_token" id="_token" value="{{{ csrf_token() }}}" />
-    		<td>{{$listeoeuvre->nom}}</td>
-    		<td><button type="submit" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-trash"></span></a></td>
-  	  </form>
-    </tr>
-    @endforeach
-  </table>
-</div>
-
-
-<div class="col-md-8 ccmd9">
+<div class="col-md-8 well">
 
   <legend>Falbala: </legend>
 
@@ -202,7 +77,8 @@
   <br><br><br>
 </div>
 
-<div class="col-md-8 ccmd9">
+
+<div class="col-md-8 well">
 
     <div class="col-md-9">
       <span style="float: right">Sélectionner tout -- Annuler sélection</span><br>
@@ -216,12 +92,53 @@
 </div>
 
 
+<div class="col-md-8 well">
+
+  <div class="col-md-9">
+    <legend>Ajout de filtres</legend>
+
+    <h4>Par critère:</h4>
+    <select class="form-control">
+      <option selected="selected">Selectionner catégorie</option>
+      <option>1</option>
+      <option>2</option>
+    </select>
+
+    <select class="form-control">
+      <option selected="selected">Tous les éléments</option>
+      <option>1</option>
+      <option>2</option>
+    </select>
+    <button style="margin-top: 5px" class="btn btn-primary">Ajouter</button>
+    <br><br>
+
+    <h4>Par mot clé:</h4>
+    <form class="form-inline">
+      <div class="col-sm-8 form-group">
+        <div class="input-group">
+          <input type="text" class="form-control" id="exampleInputAmount" placeholder="Par mot clé">
+        </div>
+      </div>
+      <button type="submit" class="btn btn-primary">Ajouter</button>
 
 
+        <legend>Mes filtres</legend>
 
-
-
-<div class="col-md-8 ccmd9">
+  <table class="table">
+    <tr>
+      <td>Montagne: noire</td>
+      <td>Supprimer</td>
+    </tr>
+    <tr>
+      <td>couleur: bleu</td>
+      <td>Supprimer</td>
+    </tr>
+    <tr>
+      <td>âge: 10 ans</td>
+      <td>Supprimer</td>
+    </tr>
+  </table>
+  </div>
 
     <div class="col-md-9">
       <span style="float: right">Sélectionner tout -- Annuler sélection</span><br>
@@ -250,58 +167,6 @@
       <button style="float: right" class="btn btn-primary" id="enregistrer">Enregistrer</button>
     </div>
 </div>
-
-
-
-
-
-
-<div class="col-md-3 ccmd3">
-
-  <legend>Ajouter un filtre:</legend>
-  <h4>Par critère:</h4>
-  <select class="form-control">
-    <option selected="selected">Selectionner catégorie</option>
-    <option>1</option>
-    <option>2</option>
-  </select>
-
-  <select class="form-control">
-    <option selected="selected">Tous les éléments</option>
-    <option>1</option>
-    <option>2</option>
-  </select>
-  <button style="margin-top: 5px" class="btn btn-primary">Ajouter</button>
-  <br><br>
-
-  <h4>Par mot clé:</h4>
-  <form class="form-inline">
-    <div class="col-sm-8 form-group">
-      <div class="input-group">
-        <input type="text" class="form-control" id="exampleInputAmount" placeholder="Par mot clé">
-      </div>
-    </div>
-    <button type="submit" class="btn btn-primary">Ajouter</button>
-
-  <br><br>
-  <legend>Mes filtres</legend>
-
-  <table class="table">
-    <tr>
-      <td>Montagne: noire</td>
-      <td>Supprimer</td>
-    </tr>
-    <tr>
-      <td>couleur: bleu</td>
-      <td>Supprimer</td>
-    </tr>
-    <tr>
-      <td>âge: 10 ans</td>
-      <td>Supprimer</td>
-    </tr>
-  </table>
->>>>>>> origin/master
-</div>
 	
 @endsection