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

SRC/.gitignore

@@ -1,3 +1,5 @@
 /vendor
 /node_modules
 .env
+_ide_helper.php
+/.idea

SRC/app/Http/Controllers/GameController.php

@@ -51,6 +51,7 @@ class GameController extends Controller {
 
         $idRef = Cookie::get('referent');
         $ref = Referent::find($idRef);
+
         $configjeu = $ref->configjeu()->where('actifPuzzle', '=', '1')->first();
 
         if($configjeu && count($configjeu->oeuvres) >= 1) {

SRC/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "6c08ae99a1a7676a1c006b9be992507a",
+    "hash": "56b538e03a4420d3e05d8613783de93e",
     "packages": [
         {
             "name": "classpreloader/classpreloader",

SRC/public/css/frontend.css

@@ -4,13 +4,13 @@
     box-sizing: border-box;   
 }
 
-html, body {
+
+body {
     font-family: 'Oswald', sans-serif;
     background: #ebebeb;
     background: url('../imgs/bg.png') no-repeat bottom center fixed;
     background-size: cover;
     font-weight:300;
-
 }
 
 nav {

SRC/public/js/bootstrap-multiselect.js

@@ -400,7 +400,6 @@
 
             // Set max height of dropdown menu to activate auto scrollbar.
             if (this.options.maxHeight) {
-                // TODO: Add a class for this option to move the css declarations.
                 this.$ul.css({
                     'max-height': this.options.maxHeight + 'px',
                     'overflow-y': 'auto',

SRC/public/js/memory.js

@@ -367,7 +367,7 @@ Memory.prototype._winGame = function() {
       <button id="mg__onend--restart" class="mg__button"><span class="icon-spinner11"></span></button>';
 
       var audio = new Audio();
-      var texte = "http://translate.google.com/translate_tts?ie=UTF-8&q=bravo%20tu%20as%20gagn%C3%A9%20en%20"+this.numMoves+"%20coups&tl=fr";
+      var texte = 'http://translate.google.com/translate_tts?ie=UTF-8&q=bravo%20tu%20as%20gagn%C3%A9%20en%20"'+this.numMoves+'"%20coups&tl=fr';
       audio.src =texte;
       audio.play();
     this.game.appendChild(this.gameMessages);

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

@@ -22,7 +22,7 @@
             <form method="post" action="{{ URL::to('referent/ajouterliste') }}">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <div class="form-group">
-                    <label for="nomListe">Nouvelle liste</label>
+                    <label for="nomListe">Nouvelle liste :</label>
                     <div class="input-group">
                         <input type="text" id="nomListe" name="nomListe" class="form-control" placeholder="Nom de la liste">
                         <span class="input-group-btn">
@@ -88,7 +88,7 @@
                     @if(count($mesoeuvres->oeuvres) == 0)
 
 
-                        <h3>Aucune oeuvre dans la liste.</h3>
+                        <h5>Aucune oeuvre dans la liste.</h5>
                     @else
                                         <form method="post" action="{{ URL::to('referent/modifierliste/supprimer', $mesoeuvres->id) }}">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
@@ -293,7 +293,8 @@ $('#imagesSearched').on('click', '.pagination a', function (event) {
 $('#recherche select').multiselect({
     enableFiltering: true,
     buttonWidth: '100%',
-    maxHeight: 200
+    maxHeight: 200,
+    enableCaseInsensitiveFiltering: true
 });
 
 $("#recherche").on('submit', function(event){

SRC/resources/views/frontend/memo_level.blade.php

@@ -21,6 +21,9 @@
 
 </div>
 
+<div style="position: relative; left: 0; bottom:40%; padding-left:1%; ">
+    <a href="/"><img style="height: 80px;" src="{{ URL::to('imgs/previouspage.png') }}"></a>
+</div>
 
 @section('page-css')
 <link href="{{ URL::to('css/fonts/style.css') }}" rel="stylesheet" type="text/css"/>

SRC/resources/views/frontend/puzzle.blade.php

@@ -180,10 +180,9 @@
                         setTimeout(function(){
                             location.href = "{{URL::to('/')}}";
                         }, 4000);
-                        
+                        // TODO appel ajax
                         //var t1 = game.world.create(game.world.centerX,game.world.centerY, "tableau1");
                         //t1.anchor.setTo(0.5,0.5);
-                      
                     }
                     else {
                         setTimeout(function(){

SRC/resources/views/frontend/puzzle_level.blade.php

@@ -17,7 +17,7 @@
 <button class="level" onclick="location.href='{{ URL::to('puzzle/jouer/3') }}'"><span style="color:gold;"><span class="icon-star-full"></span><span class="icon-star-full"></span><span class="icon-star-full"></span></span></button>
 </div>
 
-<div style="position: relative; left: 0; bottom:-10%; padding-left:1%; ">
+<div style="position: absolute; left: 10px; top: 10px;">
     <a href="/"><img style="height: 80px;" src="{{ URL::to('imgs/previouspage.png') }}"></a>
 </div>