This commit is contained in:
alexandre-pereira 2015-03-18 15:24:25 +01:00
parent 4c8802f7bb
commit 90ba3ac6af
9 changed files with 23 additions and 52 deletions

@ -52,7 +52,7 @@ class LoginController extends Controller {
{
return redirect()->intended('referent');
}
return redirect('login')->withErrors(['erreur' => 'Mail ou mot de passe incorrect!',]);
return redirect('login')->withErrors(['erreur' => 'Vos identifiants sont incorrects.',]);
}
else
{
@ -78,9 +78,9 @@ class LoginController extends Controller {
switch ($response = Password:: sendResetLink(Input::only('email')))
{
case Password::INVALID_USER:
return redirect('forgotten')->withErrors("Mail Invalide !")->withInput();
return redirect('forgotten')->withErrors("L'adresse email saisie est incorrecte.")->withInput();
default :
return redirect('forgotten')->withStatus("Mail de réinitialisation envoyée !")->withInput();
return redirect('forgotten')->withStatus("Un email vous a été envoyé à votre adresse mail. Il peut se retrouver dans la boite Spam.")->withInput();
}
}
@ -107,7 +107,7 @@ class LoginController extends Controller {
case Password::INVALID_USER:
return Redirect::back()->withErrors("Utilsateur invalide")->withInput();
default :
return Redirect::to('/login')->withStatus("Mot de passe réinitialisaté avec succès !");
return Redirect::to('/login')->withStatus("Votre mot de passe réinitialisé avec succès !");
}
}

@ -404,6 +404,8 @@ left: 56.3333%%;
.mg__tile--outside {
background-color: #dcdee1;
box-shadow: 0 0 0 1px #787a80;
background-size: cover;
background-position: center center;
}
.mg__tile--inside {
@ -457,6 +459,9 @@ left: 56.3333%%;
*
* A simple helper class for game buttons. Edit at your will.
*/
.mg__button span {
vertical-align:middle;
}
.mg__button {
margin: 0;
display: inline-block;
@ -464,6 +469,8 @@ left: 56.3333%%;
color: #fff;
font-family: "Roboto Slab", serif;
font-size: 14px;
line-height:18px;
appearance: none;
background: #ff3c50;
border: none;

@ -1,6 +1,6 @@
var bits=80; // how many bits
var bits=120; // how many bits
var speed=33; // how fast - smaller is faster
var bangs=5; // how many can be launched simultaneously (note that using too many can slow the script down)
var bangs=15; // how many can be launched simultaneously (note that using too many can slow the script down)
var colours=new Array("#03f", "#f03", "#0e0", "#93f", "#0cf", "#f93", "#f0c");
// blue red green purple cyan orange pink

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,19 +0,0 @@
// fonction qui recherche le referent donnee en parametre
function rechercherReferent()
{
// on recupere le mot cle rentrer dans le champs de recherche
var motCle = document.getElementById("searchfield").value;
//boucle sur chaque item
var list = document.getElementsByClassName("item");
for (var i = 0; i < list.length; i++)
{
referent = list[i].getElementsByClassName('nomRef')[0].innerHTML; //recupere le nom du referent referent
if (referent.indexOf(motCle) > -1) //on compare si la recherche correspond à un nom
{
//on remplace la classe
list[i].className = "item active";
}
}
}

@ -13,28 +13,26 @@
</div>
@endif
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>Oouups!</strong> Il y a un problème avec votre saisie.<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@foreach ($errors->all() as $error)
<div class="alert alert-danger">
{{ $error }}
</div>
@endforeach
@endif
<form class="form-horizontal" role="form" method="POST" action="login">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label class="col-md-4 control-label">Adresse mail</label>
<label class="col-md-4 control-label">Adresse email :</label>
<div class="col-md-6">
<input type="email" class="form-control" name="email" value="{{ old('email') }}" required>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">Mot de passe</label>
<label class="col-md-4 control-label">Mot de passe :</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password" required>
</div>

@ -1,6 +1,7 @@
@extends('frontend/template')
@section('content')
<script src="/js/firework.js"></script>
<script src="{{ URL::to('js/phaser.min.js') }}"></script>
<script src="{{ URL::to('js/responsivevoice.js') }}"></script>
<script type="text/javascript">
@ -152,6 +153,7 @@
pieces.forEach(function(item){item.input.draggable = false;});
if(nbToPlay == currentPlayed)
{
firework();
leftEmitter = game.add.emitter(50, 50);
leftEmitter.bounce.setTo(0.5, 0.5);
leftEmitter.setXSpeed(100, 200);