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

Quelques modifs

This commit is contained in:
alexandre-pereira 2015-03-17 19:24:29 +01:00
parent 1e484e8a8e
commit fd46a5720c
13 changed files with 54 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,8 @@ class GameController extends Controller {
* @return Response
*/
public function chooseDifMemo() {
return view('frontend/memo_level');
$nbOr = Cookie::get('referent');
return view('frontend/memo_level', ['nbOr' => $nbOr]);
}
public function playMemo($niveau) {

2
SRC/app/Http/Controllers/LoginController.php
View File

@ -65,7 +65,7 @@ class LoginController extends Controller {
{
Session::forget('admin');
Auth::logout();
return redirect('login');
return redirect()->guest('login');
}
public function forgottenPassword()

8
SRC/app/Http/Controllers/ReferentController.php
View File

@ -117,8 +117,12 @@ class ReferentController extends Controller {
Auth::user()->configjeu()->update(array('actifMemo' => 0));
Auth::user()->configjeu()->update(array('actifPuzzle' => 0));
if(Input::get('memo') != 0)
ConfigJeu::where('referent_id', '=', Auth::user()->id)->find(Input::get('memo'))->update(array('actifMemo' => 1));
if(Input::get('puzzle') != 0)
ConfigJeu::where('referent_id', '=', Auth::user()->id)->find(Input::get('puzzle'))->update(array('actifPuzzle' => 1));
Session::flash('message', 'Vous avez modifié les listes associées aux jeux avec succès.');
return redirect()->back();
}
@ -126,7 +130,8 @@ class ReferentController extends Controller {
//todo verifier user
$cj = ConfigJeu::find($id);
$cj->oeuvres()->attach(Input::get('toadd'));
Session::flash('message', 'Vous avez ajouter des oeuvres dans votre liste.');
return redirect()->back();
}
@ -137,6 +142,7 @@ class ReferentController extends Controller {
if(count(Input::get('todel')) >= 1)
$cj->oeuvres()->detach(Input::get('todel'));
Session::flash('erreur', 'Vous avez supprimer des oeuvres de votre liste.');
return redirect()->back();
}

5
SRC/public/css/frontend.css
View File

@ -147,9 +147,10 @@ button:active {
width:200px;
height:200px;
border:5px solid rgba(0, 0, 0, 0.55);
padding:5px;border-radius:8px;
padding:5px;
border-radius:8px;
}
.game:hover {
.game:hover, .game.active{
background:white;
cursor:pointer;
border:5px solid rgba(0, 0, 0, 0.95);

BIN
SRC/public/imgs/trophees/or.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 236 KiB

65
SRC/resources/views/auth/register.blade.php
View File

@ -1,65 +0,0 @@
@extends('backend/template')
@section('content')
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Register</div>
<div class="panel-body">
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<form class="form-horizontal" role="form" method="POST" action="/password/reset">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label class="col-md-4 control-label">Name</label>
<div class="col-md-6">
<input type="text" class="form-control" name="name" value="{{ old('name') }}">
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">E-Mail Address</label>
<div class="col-md-6">
<input type="email" class="form-control" name="email" value="{{ old('email') }}">
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">Password</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password">
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">Confirm Password</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password_confirmation">
</div>
</div>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary">
Register
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
@endsection

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

@ -44,7 +44,7 @@
</thead>
<tbody>
<tr>
<td>Aucune liste</td>
<td>Liste aléatoire</td>
<td><input type="radio" name="memo" value="0" checked type="checkbox"></td>
<td><input type="radio" name="puzzle" value="0" checked type="checkbox"></td>
<td></td>

43
SRC/resources/views/backend/ref_navbar.blade.php
View File

@ -1,26 +1,27 @@
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Espace Référent</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<ul class="nav navbar-nav">
<li class="active"><a href="#">Mes Listes</a></li>
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Espace Référent</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Mes Listes</a></li>
<li><a data-toggle="modal" data-target="#myModal1" href="#">Mon Compte</a></li>
<li><a href="{{ URL::to('logout') }}">Se Déconnecter</a></li>
</ul>
<p class="navbar-text navbar-right">Connecté en tant que {{ $me->prenom }} {{ $me->nom }}</p>
<!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL::to('logout') }}">Déconnexion</a></li>
</ul>
<p class="navbar-text navbar-right">Connecté en tant que {{ $me->prenom }} {{ $me->nom }}</p>
</div><!--/.nav-collapse -->
</div><!--/.container-fluid -->
</nav>
<!-- Modal -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

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

@ -7,8 +7,8 @@
<div><img style="border-radius:50%; height:100px;width:100px;margin:40px;" src="{{ $ref -> image }}"></div>
<div class="game"><img src="imgs/memo/memo2.png"></div>
<div class="game"><img src="imgs/puzzle/puzzle.png"></div>
<div class="game" onclick="location.href='{{ URL::to('memo') }}'"><img src="imgs/memo/memo2.png"></div>
<div class="game" onclick="location.href='{{ URL::to('puzzle') }}'"><img src="imgs/puzzle/puzzle.png"></div>
</div>
@endsection

4
SRC/resources/views/frontend/home.blade.php
View File

@ -5,9 +5,9 @@
<div style="text-align:center;background-color: #fcfc6b; padding:10px; margin:auto;font-size:18px;">
<h1 class="homeTitle">Les jeux du Musée des Augustins</h1>
L'objectif de ce site est de permettre aux enfants de jouer à des jeux tout en leur apportant de l'intérêt pour les différentes oeuvres d'art exposés dans le fameux musée toulousain.<br>
L'objectif de ce site est de permettre aux enfants de jouer à des jeux tout en leur apportant de l'intérêt pour les différentes oeuvres d'art exposées dans le fameux musée toulousain.<br>
<span style="color:red;">Lorsque vous aurez choisit un référent, il faudra appuyer pendant 5 secondes sur l'icone de votre référent afin de revenir sur cette page.</span><br>
Si ce site ne vous a pas été donné par un professeur, vous pouvez toujours <span style="color:#37378e;">cliquer ici pour jouer aux jeux</span>.
Si vous n'avez pas de référent, vous pouvez toujours <span style="color:#37378e;">cliquer ici pour jouer aux jeux</span>, sinon cliquez sur leur image.
</div>
<nav>

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

@ -14,7 +14,14 @@
<button onclick="location.href='{{ URL::to('memo/jouer/2') }}'"><span style="color:gold;"><span class="icon-star-full"></span><span class="icon-star-full"></span></span><span class="icon-star-full"></span></button>
<button onclick="location.href='{{ URL::to('memo/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>
<button onclick="location.href='{{ URL::to('memo/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><br>
<div style="line-height:50px;"></div><img style="height:50px; vertical-align:middle;width:50px" src="{{ URL::to('imgs/trophees/or.png') }}"><span style="vertical-align:middle;font-size:20px">{{ $nbOr }}</span>
<img style="height:50px; vertical-align:middle;width:50px" src="{{ URL::to('imgs/trophees/or.png') }}"><span style="vertical-align:middle;font-size:20px">{{ $nbOr }}</span>
<img style="height:50px; vertical-align:middle;width:50px" src="{{ URL::to('imgs/trophees/or.png') }}"><span style="vertical-align:middle;font-size:20px">{{ $nbOr }}</span>
</div>
</div>

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

@ -174,7 +174,7 @@
else {
setTimeout(function(){
nextPuzzle();
}, 5000);
}, 2000);
}
}

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

@ -3,22 +3,18 @@
@section('content')
<div class="abso referents">
<div class="referent game"
<div class="game active"
onclick='location.href = "{{ URL::to('puzzle') }}";'
style="background:url('{{ URL::to('imgs/puzzle.jpg') }}'); width: 50%;">
<div class="infos">Puzzle</div>
style="background:url('{{ URL::to('imgs/puzzle/puzzle.png') }}'); width: 50%;">
</div>
<br>
<br>
<button 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>
<br>
<button onclick="location.href='{{ URL::to('puzzle/jouer/2') }}'"><span style="color:gold;"><span class="icon-star-full"></span><span class="icon-star-full"></span></span><span class="icon-star-full"></span></button>
<br>
<button 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>
<button 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>