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

hh

This commit is contained in:
Malibu 2015-03-20 19:38:05 +01:00
parent d3da88d547 550ca526b9
commit aa90311348
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,12 @@ class GameController extends Controller {
default: default:
break; break;
} }
<<<<<<< HEAD
Response::make('records')->withCookie(Cookie::forever('trophee', $values)); Response::make('records')->withCookie(Cookie::forever('trophee', $values));
=======
$response->withCookie(Cookie::forever('trophee', $values));
>>>>>>> 550ca526b9ba7c2d56b4b5096b3bce0d7e567414
} }
} }

2
SRC/resources/views/frontend/games.blade.php
View File

@ -23,8 +23,6 @@
<img style="height:100px; vertical-align:middle;width:100px" src="{{ URL::to('imgs/trophees/or.png') }}"><br> <img style="height:100px; vertical-align:middle;width:100px" src="{{ URL::to('imgs/trophees/or.png') }}"><br>
{{$nbOr}} {{$nbOr}}
</div> </div>
</div> </div>
@endsection @endsection

3
SRC/resources/views/frontend/memo_level.blade.php
View File

@ -5,8 +5,7 @@
<div class="referents"> <div class="referents">
<div class="referent game" <div class="referent game"
onclick='location.href = "{{ URL::to('memo') }}";' onclick='location.href = "{{ URL::to('memo') }}";'
style="background:url('{{ URL::to('imgs/memo.jpg') }}'); width: 50%;"> style="background:url('{{ URL::to('imgs/memo/memo2.png') }}'); background-repeat:no-repeat; background-size: contain; border: none; margin-top: 10%;">
<div class="infos">Mémo</div>
</div> </div>
<br> <br>

10
SRC/resources/views/frontend/puzzle_level.blade.php
View File

@ -5,10 +5,16 @@
<div class="abso referents"> <div class="abso referents">
<div class="game active" <div class="game active"
onclick='location.href = "{{ URL::to('puzzle') }}";' onclick='location.href = "{{ URL::to('puzzle') }}";'
style="background:url('{{ URL::to('imgs/puzzle/puzzle.png') }}'); width: 50%;"> style="background:url('{{ URL::to('imgs/puzzle/puzzle.png') }}'); background-repeat:no-repeat; background-size: contain; border: none; margin-top: 10%;">
</div> </div>
<br> <br>
<button class="level" onclick="location.href='{{ URL::to('puzzle/jouer/1') }}'"><span style="color:gold;"><span class="icon-star-full"></span></span><span class="icon-star-full"></span><span class="icon-star-full"></span></button> <button class="level" onclick="location.href='{{ URL::to('puzzle/jouer/1') }}'">
<span style="color:gold;">
<span class="icon-star-full"></span>
</span>
<span class="icon-star-full"></span>
<span class="icon-star-full"></span>
</button>