From dff658cd8ea66c28441952b9806d86c5ce2e0753 Mon Sep 17 00:00:00 2001
From: DonRenando <renan.husson@hotmail.fr>
Date: Mon, 16 Mar 2015 18:22:02 +0100
Subject: [PATCH] css

---
 SRC/app/Http/Controllers/GameController.php   |  1 +
 SRC/public/css/memory.css                     | 18 ++++----
 SRC/public/js/memory.js                       |  2 +-
 .../views/backend/ref_home.blade.php          | 42 +++++++++----------
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/SRC/app/Http/Controllers/GameController.php b/SRC/app/Http/Controllers/GameController.php
index 94ba20e..1011245 100755
--- a/SRC/app/Http/Controllers/GameController.php
+++ b/SRC/app/Http/Controllers/GameController.php
@@ -33,6 +33,7 @@ class GameController extends Controller {
             $oes = $configjeu->oeuvres;
         } else {
             $oes = Oeuvre::orderByRaw("RAND()")->take(5)->get();
+						$niveau = 1;
         }
 				$params = json_decode($configjeu->parametres);
 
diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css
index 6e8a77a..3efda0b 100755
--- a/SRC/public/css/memory.css
+++ b/SRC/public/css/memory.css
@@ -98,24 +98,24 @@
 
 /* game__level-1 styles */
 .mg__level-1 .mg__tile {
-  width: 25%;
-  height: 50%;
+  width: 20%;
+  height: 40%;
 }
 
 .mg__level-1 .mg__tile-1 {
-  top: 0%;
-  left: 0%;
+  top: 20%;
+  left: 15%;
 }
 .mg__level-1 .mg__tile-2 {
-  top: 0%;
-  left: 25%;
+  top: 20%;
+  left: 35%;
 }
 .mg__level-1 .mg__tile-3 {
-  top: 0%;
-  left: 50%;
+  top: 20%;
+  left: 55%;
 }
 .mg__level-1 .mg__tile-4 {
-  top: 0%;
+  top: 20%;
   left: 75%;
 }
 .mg__level-1 .mg__tile-5 {
diff --git a/SRC/public/js/memory.js b/SRC/public/js/memory.js
index 5da9b2f..4d3a216 100755
--- a/SRC/public/js/memory.js
+++ b/SRC/public/js/memory.js
@@ -315,7 +315,7 @@
 
   Memory.prototype._gameCounterPlusOne = function() {
     this.numMoves = this.numMoves + 1;
-    this.moveCounterUpdate = document.getElementById("mg__meta--moves").innerHTML = this.numMoves;
+    //this.moveCounterUpdate = document.getElementById("mg__meta--moves").innerHTML = this.numMoves;
   };
 
   /**
diff --git a/SRC/resources/views/backend/ref_home.blade.php b/SRC/resources/views/backend/ref_home.blade.php
index 804fc40..aee0091 100755
--- a/SRC/resources/views/backend/ref_home.blade.php
+++ b/SRC/resources/views/backend/ref_home.blade.php
@@ -97,7 +97,7 @@
         </div>
         <div role="tabpanel" class="tab-pane" id="tabconfig">
             <div class="col-md-8 col-md-offset-2" style="margin-top:30px">
-                
+
                 <form class="form-horizontal" method="post" action="{{URL::to('referent/changeParamListe', $mesoeuvres->id)}}">
                                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
@@ -130,19 +130,19 @@
                                 <div class="form-group">
                                     <label for="m1" class="col-sm-4 control-label">Nb. de tableaux 1 étoile</label>
                                     <div class="col-sm-6">
-                                        <input type="number" min="1" max="10" class="form-control" value="{{$paramjeu->m1}}" name="m1" id="m1" placeholder="2">
+                                        <input type="number" min="1" max="2" class="form-control" value="{{$paramjeu->m1}}" name="m1" id="m1" placeholder="2">
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <label for="m2" class="col-sm-4 control-label">Nb. de tableaux 2 étoiles</label>
                                     <div class="col-sm-6">
-                                        <input type="number" min="1" max="10" class="form-control" value="{{$paramjeu->m2}}" name="m2" id="m2" placeholder="3">
+                                        <input type="number" min="1" max="4" class="form-control" value="{{$paramjeu->m2}}" name="m2" id="m2" placeholder="3">
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <label for="m3" class="col-sm-4 control-label">Nb. de tableaux 3 étoiles</label>
                                     <div class="col-sm-6">
-                                        <input type="number" min="1" max="10" class="form-control" value="{{$paramjeu->m3}}" name="m3" id="m3" placeholder="4">
+                                        <input type="number" min="1" max="8" class="form-control" value="{{$paramjeu->m3}}" name="m3" id="m3" placeholder="4">
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -157,7 +157,7 @@
                                     </div>
                                 </div>
                             </form>
-                
+
             </div>
         </div>
         <div role="tabpanel" class="tab-pane" id="profile">
@@ -239,7 +239,7 @@
 <link rel="stylesheet" href="{{ URL::to('css/bootstrap-multiselect.css') }}">
 <style>
     .thumbnails .thumbnail {
-        margin-bottom: 0;   
+        margin-bottom: 0;
     }
     .thumbnail img {
         width:100px;
@@ -251,9 +251,9 @@
 <script src="{{ URL::to('js/image-picker.min.js') }}"></script>
 <script src="{{ URL::to('js/bootstrap-multiselect.js') }}"></script>
 <script>
-$("select.multiple").imagepicker(); 
-    
-    
+$("select.multiple").imagepicker();
+
+
 $('#imagesSearched').load('{{ URL::to('api/searchOeuvres') }}', function(){$("select.multiple").imagepicker();});
 
 
@@ -263,7 +263,7 @@ $('#imagesSearched').load('{{ URL::to('api/searchOeuvres') }}', function(){$("se
             gutterWidth: 10
     }).masonry('reload');
 };*/
-    
+
 $('#imagesSearched').on('click', '.pagination a', function (event) {
     event.preventDefault();
     if ( $(this).attr('href') != '#' ) {
@@ -278,13 +278,13 @@ $('#imagesSearched').on('click', '.pagination a', function (event) {
 
 });
 
-    
+
 $('#recherche select').multiselect({
     enableFiltering: true,
     buttonWidth: '100%',
     maxHeight: 200
 });
-    
+
 $("#recherche").on('submit', function(event){
     event.preventDefault();
     $('#imagesSearched').empty();
@@ -295,30 +295,30 @@ $("#recherche").on('submit', function(event){
         $('#imagesSearched').append(data);
         $("select.multiple").imagepicker();
     });
-    
+
 });
 
 /*
-    
-    
-        
+
+
+
     $("#search").click(function(){
             event.preventDefault();
             $('#imagesSearched').empty();
             $('#imagesSearched').append("Recherche en cours");
-    
+
         $.get(" {{ URL::to('api/searchOeuvres') }}", { domaine : $('#domaine').val() },
         function(data){
             $('#imagesSearched').empty();
-            $('#imagesSearched').append('<select multiple="multiple" id="toadd" name="toadd[]">');                 
+            $('#imagesSearched').append('<select multiple="multiple" id="toadd" name="toadd[]">');
             $(data.data).each(function(id, elt){
                 $('#toadd').append("<option data-img-src='http://www.augustins.org/documents/10180/156407/" + elt.image +"' value=\""+ elt.id+"\"></option>");
             });
             $('#imagesSearched').append('<button type="submit" id="search" class="btn btn-default">Ajouter</button>');
-    
+
             $("#toadd").imagepicker();
         }, "json");
     });*/
-                        
+
 </script>
-@endsection
\ No newline at end of file
+@endsection