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

Conflicts:
	SRC/app/Http/Controllers/ReferentController.php
	SRC/public/css/game.css
	SRC/public/css/home.css
	SRC/resources/views/referent.blade.php
	SRC/resources/views/referent_games.blade.php

SRC/public/css/game.css

@@ -5,4 +5,14 @@ body
   background-repeat:no-repeat;
   background-position:100% 100%;
   background-size:cover;
-}
+<<<<<<< HEAD
+}
+=======
+}
+
+.iconGame
+{
+	width: 13%;
+	height: 23%;
+}
+>>>>>>> 407a955444da6207f59c5f05d283275510b2169c

SRC/public/css/home.css

@@ -46,6 +46,10 @@ body {
 	width : 40%;
 	box-shadow: 0 0 6px black inset;
 	border: 1px solid dimgrey;
+<<<<<<< HEAD
+=======
+	font-size: 1.5em;
+>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
 }
 
 .carousel-indicators

SRC/public/js/ListeOeuvre.js

@@ -56,3 +56,72 @@ $('#enregistrer').click(function() {
 });
 
 
+// Afficher résultat de recherche d'oeuvre
+$('#search_button, #previous, #next').click(function(event) {
+
+    event.preventDefault();
+
+    if(this.id == $('#next').attr('id') && $("#next").parent().hasClass('disabled') || this.id == $('#previous').attr('id') && $("#previous").parent().hasClass('disabled'))
+        return 0;
+
+    if (this.id == $('#next').attr('id')) {
+        str = $("#next").attr('href');
+        url = "/search?page="+/([0-9]+)/.exec(str)[0];
+    }else if (this.id == $('#previous').attr('id')) {
+        str = $("#previous").attr('href');
+        url = "/search?page="+/([0-9]+)/.exec(str)[0];
+    }else {
+        url = "/search";
+    }
+
+    $('#oeuvreRes').empty();
+    dataSend = { 
+                _token : $('#_tokenRes').val(),
+                auteur: $('#auteur').val(),
+                designation: $('#designation').val(),
+                matiere: $('#matiere').val(),
+                domaine: $('#domaine').val(),
+                technique: $('#technique').val(),
+                debut: $('#debut').val(),
+                fin: $('#fin').val()
+            };
+    $.post(url,
+        dataSend,
+        function( data ) {
+            if (data.length == 0 )
+                $("#oeuvreRes").append("Aucune Oeuvre Trouvé..");
+            data.data.forEach( function(el) {
+                $("#oeuvreRes").append('<div class="col-xs-4 col-md-3">'
+                +'<a href="#" class="thumbnail">'
+                +'<img src="http://www.augustins.org/documents/10180/156407/' + el.urlPhoto + '"/>'
+                +'</a></div>');
+            });
+
+            if(data.prev_page_url == null) {
+                $("#previous").parent().addClass('disabled');
+            }else {
+                $("#previous").attr('href', data.prev_page_url);
+                $("#previous").parent().removeClass('disabled');
+            }
+
+            if(data.next_page_url == null) {
+                $("#next").parent().addClass('disabled');                     
+            }else {
+                $("#next").attr('href', data.next_page_url);    
+                $("#next").parent().removeClass('disabled');
+            }
+            
+    }, "json" )
+    
+    .fail(function() {
+        $("#oeuvreRes").append('<div class="alert alert-danger">'
+        +'<strong>Oouups!</strong> Il y a un problème.<br><br>'
+        +'<ul>'
+        +'<li>Erreur lors de la récupération</li>'
+        +'</ul>'
+        +'</div>'
+        );
+    });
+});
+
+