QRouland
/
ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

css

This commit is contained in:
DonRenando 2015-03-16 18:22:02 +01:00
parent 1ccdae5f95
commit dff658cd8e
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SRC/app/Http/Controllers/GameController.php
View File

@ -33,6 +33,7 @@ class GameController extends Controller {
$oes = $configjeu->oeuvres; $oes = $configjeu->oeuvres;
} else { } else {
$oes = Oeuvre::orderByRaw("RAND()")->take(5)->get(); $oes = Oeuvre::orderByRaw("RAND()")->take(5)->get();
$niveau = 1;
} }
$params = json_decode($configjeu->parametres); $params = json_decode($configjeu->parametres);

18
SRC/public/css/memory.css
View File

@ -98,24 +98,24 @@
/* game__level-1 styles */ /* game__level-1 styles */
.mg__level-1 .mg__tile { .mg__level-1 .mg__tile {
width: 25%; width: 20%;
height: 50%; height: 40%;
} }
.mg__level-1 .mg__tile-1 { .mg__level-1 .mg__tile-1 {
top: 0%; top: 20%;
left: 0%; left: 15%;
} }
.mg__level-1 .mg__tile-2 { .mg__level-1 .mg__tile-2 {
top: 0%; top: 20%;
left: 25%; left: 35%;
} }
.mg__level-1 .mg__tile-3 { .mg__level-1 .mg__tile-3 {
top: 0%; top: 20%;
left: 50%; left: 55%;
} }
.mg__level-1 .mg__tile-4 { .mg__level-1 .mg__tile-4 {
top: 0%; top: 20%;
left: 75%; left: 75%;
} }
.mg__level-1 .mg__tile-5 { .mg__level-1 .mg__tile-5 {

2
SRC/public/js/memory.js
View File

@ -315,7 +315,7 @@
Memory.prototype._gameCounterPlusOne = function() { Memory.prototype._gameCounterPlusOne = function() {
this.numMoves = this.numMoves + 1; 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;
}; };
/** /**

42
SRC/resources/views/backend/ref_home.blade.php
View File

@ -97,7 +97,7 @@
</div> </div>
<div role="tabpanel" class="tab-pane" id="tabconfig"> <div role="tabpanel" class="tab-pane" id="tabconfig">
<div class="col-md-8 col-md-offset-2" style="margin-top:30px"> <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)}}"> <form class="form-horizontal" method="post" action="{{URL::to('referent/changeParamListe', $mesoeuvres->id)}}">
<input type="hidden" name="_token" value="{{ csrf_token() }}"> <input type="hidden" name="_token" value="{{ csrf_token() }}">
@ -130,19 +130,19 @@
<div class="form-group"> <div class="form-group">
<label for="m1" class="col-sm-4 control-label">Nb. de tableaux 1 étoile</label> <label for="m1" class="col-sm-4 control-label">Nb. de tableaux 1 étoile</label>
<div class="col-sm-6"> <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> </div>
<div class="form-group"> <div class="form-group">
<label for="m2" class="col-sm-4 control-label">Nb. de tableaux 2 étoiles</label> <label for="m2" class="col-sm-4 control-label">Nb. de tableaux 2 étoiles</label>
<div class="col-sm-6"> <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> </div>
<div class="form-group"> <div class="form-group">
<label for="m3" class="col-sm-4 control-label">Nb. de tableaux 3 étoiles</label> <label for="m3" class="col-sm-4 control-label">Nb. de tableaux 3 étoiles</label>
<div class="col-sm-6"> <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> </div>
<div class="form-group"> <div class="form-group">
@ -157,7 +157,7 @@
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="profile"> <div role="tabpanel" class="tab-pane" id="profile">
@ -239,7 +239,7 @@
<link rel="stylesheet" href="{{ URL::to('css/bootstrap-multiselect.css') }}"> <link rel="stylesheet" href="{{ URL::to('css/bootstrap-multiselect.css') }}">
<style> <style>
.thumbnails .thumbnail { .thumbnails .thumbnail {
margin-bottom: 0; margin-bottom: 0;
} }
.thumbnail img { .thumbnail img {
width:100px; width:100px;
@ -251,9 +251,9 @@
<script src="{{ URL::to('js/image-picker.min.js') }}"></script> <script src="{{ URL::to('js/image-picker.min.js') }}"></script>
<script src="{{ URL::to('js/bootstrap-multiselect.js') }}"></script> <script src="{{ URL::to('js/bootstrap-multiselect.js') }}"></script>
<script> <script>
$("select.multiple").imagepicker(); $("select.multiple").imagepicker();
$('#imagesSearched').load('{{ URL::to('api/searchOeuvres') }}', function(){$("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 gutterWidth: 10
}).masonry('reload'); }).masonry('reload');
};*/ };*/
$('#imagesSearched').on('click', '.pagination a', function (event) { $('#imagesSearched').on('click', '.pagination a', function (event) {
event.preventDefault(); event.preventDefault();
if ( $(this).attr('href') != '#' ) { if ( $(this).attr('href') != '#' ) {
@ -278,13 +278,13 @@ $('#imagesSearched').on('click', '.pagination a', function (event) {
}); });
$('#recherche select').multiselect({ $('#recherche select').multiselect({
enableFiltering: true, enableFiltering: true,
buttonWidth: '100%', buttonWidth: '100%',
maxHeight: 200 maxHeight: 200
}); });
$("#recherche").on('submit', function(event){ $("#recherche").on('submit', function(event){
event.preventDefault(); event.preventDefault();
$('#imagesSearched').empty(); $('#imagesSearched').empty();
@ -295,30 +295,30 @@ $("#recherche").on('submit', function(event){
$('#imagesSearched').append(data); $('#imagesSearched').append(data);
$("select.multiple").imagepicker(); $("select.multiple").imagepicker();
}); });
}); });
/* /*
$("#search").click(function(){ $("#search").click(function(){
event.preventDefault(); event.preventDefault();
$('#imagesSearched').empty(); $('#imagesSearched').empty();
$('#imagesSearched').append("Recherche en cours"); $('#imagesSearched').append("Recherche en cours");
$.get(" {{ URL::to('api/searchOeuvres') }}", { domaine : $('#domaine').val() }, $.get(" {{ URL::to('api/searchOeuvres') }}", { domaine : $('#domaine').val() },
function(data){ function(data){
$('#imagesSearched').empty(); $('#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){ $(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>"); $('#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>'); $('#imagesSearched').append('<button type="submit" id="search" class="btn btn-default">Ajouter</button>');
$("#toadd").imagepicker(); $("#toadd").imagepicker();
}, "json"); }, "json");
});*/ });*/
</script> </script>
@endsection @endsection