This commit is contained in:
alexandre-pereira 2015-03-17 17:21:37 +01:00
parent 6837dbcc12
commit ce899d81c1
14 changed files with 150 additions and 159 deletions

View File

@ -78,7 +78,7 @@ return [
| connection so that the application will be able to send messages.
|
*/
'password' => env('MAIL_PASSWD', ''),
'password' => env('MAIL_PASSWD', 'l3miashs2015'),
/*
|--------------------------------------------------------------------------
| Sendmail System Path

View File

@ -13,3 +13,70 @@
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
</IfModule>
<IfModule mod_deflate.c>
# Force compression for mangled headers.
# https://developer.yahoo.com/blogs/ydn/pushing-beyond-gzipping-25601.html
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
</IfModule>
</IfModule>
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Map certain file types to the specified encoding type in order to
# make Apache serve them with the appropriate `Content-Encoding` HTTP
# response header (this will NOT make Apache compress them!).
# If the following file types wouldn't be served without the appropriate
# `Content-Enable` HTTP response header, client applications (e.g.:
# browsers) wouldn't know that they first need to uncompress the response,
# and thus, wouldn't be able to understand the content.
# http://httpd.apache.org/docs/current/mod/mod_mime.html#addencoding
<IfModule mod_mime.c>
AddEncoding gzip svgz
</IfModule>
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Compress all output labeled with one of the following media types.
# IMPORTANT: For Apache versions below 2.3.7 you don't need to enable
# `mod_filter` and can remove the `<IfModule mod_filter.c>` & `</IfModule>`
# lines as `AddOutputFilterByType` is still in the core directives.
<IfModule mod_filter.c>
AddOutputFilterByType DEFLATE "application/atom+xml" \
"application/javascript" \
"application/json" \
"application/ld+json" \
"application/manifest+json" \
"application/rdf+xml" \
"application/rss+xml" \
"application/schema+json" \
"application/vnd.geo+json" \
"application/vnd.ms-fontobject" \
"application/x-font-ttf" \
"application/x-web-app-manifest+json" \
"application/xhtml+xml" \
"application/xml" \
"font/opentype" \
"image/svg+xml" \
"image/x-icon" \
"text/cache-manifest" \
"text/css" \
"text/html" \
"text/javascript" \
"text/plain" \
"text/vtt" \
"text/x-component" \
"text/xml"
</IfModule>
</IfModule>

File diff suppressed because one or more lines are too long

View File

@ -9,6 +9,8 @@ html, body {
background: #ebebeb;
background: url('../imgs/bg.png') no-repeat bottom center fixed;
background-size: cover;
font-weight:300;
}
nav {
@ -24,8 +26,6 @@ nav input {
padding: 10px 20px;
border-radius: 5px;
outline: 0;
letter-spacing: 1px;
word-spacing: 8px;
text-align: center;
font-family: 'Oswald', sans-serif;
@ -135,99 +135,26 @@ button:active {
}
/* FIL D'ARIANE */
#breadcrumb img {
height: 26px;
display: inline-block;
margin: 2px 0;
.homeTitle {
font-weight:300;
}
#breadcrumb {
list-style: none;
display: inline-block;
}
<<<<<<< HEAD
#breadcrumb li {
float: left;
line-height: 40px;
.game {
background:rgba(255, 255, 255, 0.5);
margin:20px;
display:inline-block;
width:200px;
height:200px;
border:5px solid rgba(0, 0, 0, 0.55);
padding:5px;border-radius:8px;
}
#breadcrumb li a {
color: #FFF;
display: block;
background: #3498db;
text-decoration: none;
position: relative;
height: 30px;
line-height:30px;
vertical-align:middle;
text-align: center;
margin-right: 23px;
.game:hover {
background:white;
cursor:pointer;
border:5px solid rgba(0, 0, 0, 0.95);
}
#breadcrumb li:nth-child(even) a {
background-color: #2980b9;
}
#breadcrumb li:nth-child(even) a:before {
border-color: #2980b9;
border-left-color: transparent;
}
#breadcrumb li:nth-child(even) a:after {
border-left-color: #2980b9;
}
#breadcrumb li:first-child a {
padding-left: 5px;
-moz-border-radius: 4px 0 0 4px;
-webkit-border-radius: 4px;
border-radius: 4px 0 0 4px;
}
#breadcrumb li:first-child a:before {
border: none;
}
#breadcrumb li:last-child a {
padding-right: 15px;
-moz-border-radius: 0 4px 4px 0;
-webkit-border-radius: 0;
border-radius: 0 4px 4px 0;
}
#breadcrumb li:last-child a:after {
border: none;
}
#breadcrumb li a:before, #breadcrumb li a:after {
content: "";
position: absolute;
top: 0;
border: 0 solid #3498db;
border-width: 15px 10px;
width: 0;
height: 0;
}
#breadcrumb li a:before {
left: -15px;
border-left-color: transparent;
}
#breadcrumb li a:after {
left: 100%;
border-color: transparent;
border-left-color: #3498db;
}
#breadcrumb li a:hover {
background-color: #1abc9c;
}
#breadcrumb li a:hover:before {
border-color: #1abc9c;
border-left-color: transparent;
}
#breadcrumb li a:hover:after {
border-left-color: #1abc9c;
}
#breadcrumb li a:active {
background-color: #16a085;
}
#breadcrumb li a:active:before {
border-color: #16a085;
border-left-color: transparent;
}
#breadcrumb li a:active:after {
border-left-color: #16a085;
}
=======
>>>>>>> origin/master
.game img {
width:100%;
height:100%;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

View File

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

View File

@ -1,12 +1,5 @@
@extends('backend/template')
@section('page-css')
<style>
html, body {
background-image: url('{{URL::to('imgs/adminbg.jpg')}}');
background-size: cover;
}</style>
@endsection
@section('content')
<div class="container-fluid">
<div class="row">

View File

@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Réinitialiser Mot de Passe</div>
<div class="panel-heading">Changer votre mot de passe</div>
<div class="panel-body">
@if (count($errors) > 0)
<div class="alert alert-danger">
@ -23,7 +23,7 @@
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group">
<label class="col-md-4 control-label">Email</label>
<label class="col-md-4 control-label">Email :</label>
<div class="col-md-6">
<input type="text" class="form-control" name="email">
</div>
@ -31,14 +31,14 @@
<div class="form-group">
<label class="col-md-4 control-label">Mot de passe</label>
<label class="col-md-4 control-label">Nouveau mot de passe :</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">Confirmer mot de passe</label>
<label class="col-md-4 control-label">Confirmer le mot de passe :</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password_confirmation">
</div>
@ -47,7 +47,7 @@
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary">
Réinitialiser Password
Valider
</button>
</div>
</div>

View File

@ -1,11 +1,5 @@
@extends('backend/template')
@section('page-css')
<style>
html, body {
background: url('{{URL::to('imgs/adminbg.jpg')}}');
background-size: cover;
}</style>
@endsection
@section('content')
<div class="container">
<div class="row"><div class="col-md-12">

View File

@ -19,7 +19,19 @@
<div class="panel panel-primary">
<div class="panel-heading">Mes listes d'Oeuvres</div>
<div class="panel-body">
<div class="alert alert-warning">Ci-dessous, vous pouvez associer les listes d'oeuvres à un jeu. Cliquez sur le bouton "<span class="glyphicon glyphicon-ok"> </span> Associer" quand c'est terminé. Cliquez sur le bouton <span class="glyphicon glyphicon-pencil"></span> pour modifier la liste.</div>
<form method="post" action="{{ URL::to('referent/ajouterliste') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label for="nomListe">Nouvelle liste</label>
<div class="input-group">
<input type="text" id="nomListe" name="nomListe" class="form-control" placeholder="Nom de la liste">
<span class="input-group-btn">
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-plus"></span></button>
</span>
</div>
</div>
</form>
<div class="alert alert-grey">Ci-dessous, vous pouvez associer les listes d'oeuvres à un jeu. Cliquez sur le bouton "<span class="glyphicon glyphicon-ok"> </span> Associer" quand c'est terminé.</div>
<form method="post" action="{{ URL::to('referent/changerparamliste') }}">
<table class="table">
<thead class="tablethead">
@ -55,18 +67,7 @@
</tbody>
</table>
<div class="text-center"><button type="submit" class="btn btn-xs btn-primary"><span class="glyphicon glyphicon-ok-circle"> </span> Associer</button></div>
<form method="post" action="{{ URL::to('referent/ajouterliste') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group">
<label for="nomListe">Nouvelle liste</label>
<div class="input-group">
<input type="text" id="nomListe" name="nomListe" class="form-control" placeholder="Nom de la liste">
<span class="input-group-btn">
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-plus"></span></button>
</span>
</div>
</div>
</form>
</div>
</div>
</div>
@ -235,7 +236,7 @@
</div>
</form>
@else
<div class="alert alert-warning">Veuillez selectionner une liste pour la modifier.</div>
<div class="alert alert-grey">Cliquez sur le bouton <span class="glyphicon glyphicon-pencil"></span> pour modifier une liste.</div>
@endif
</div>
</div>
@ -252,10 +253,7 @@
width:100%;
height: 100px;
}
html, body {
background: url('{{URL::to('imgs/adminbg.jpg')}}');
background-size: cover;
}
</style>
@endsection
@section('page-scripts')

View File

@ -35,32 +35,32 @@
<input type="hidden" name="idUser" value="{{ $me->id }}" />
<div class="modal-body">
<div class="form-group">
<label for="firstname" class="col-sm-2 control-label">Prénom</label>
<div class="col-sm-10">
<label for="firstname" class="col-sm-3 control-label">Prénom :</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="firstname" name="prenom" required placeholder="Prénom" value="{{$me->prenom}}">
</div>
</div>
<div class="form-group">
<label for="lastname" class="col-sm-2 control-label">Nom</label>
<div class="col-sm-10">
<label for="lastname" class="col-sm-3 control-label">Nom :</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="lastname" name="nom" required placeholder="Nom" value="{{$me->nom}}">
</div>
</div>
<div class="form-group">
<label for="email" class="col-sm-2 control-label">Email</label>
<div class="col-sm-10">
<label for="email" class="col-sm-3 control-label">Email :</label>
<div class="col-sm-9">
<input type="email" class="form-control" id="email" name="email" required placeholder="Email" value="{{$me->email}}">
</div>
</div>
<div class="form-group">
<label for="city" class="col-sm-2 control-label">Etablissement</label>
<div class="col-sm-10">
<label for="city" class="col-sm-3 control-label">Etablissement :</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="city" name="etablissement" required placeholder="Ecole" value="{{$me->etablissement}}">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="exampleInputFile">Image</label>
<div class="col-sm-10">
<label class="col-sm-3 control-label" for="exampleInputFile">Image :</label>
<div class="col-sm-9">
<input type="file" class="form-control" name="file" id="file">
</div>
</div>

View File

@ -2,16 +2,13 @@
@extends('frontend/template')
@section('content')
<div class="titreIcon">
<img src="imgs/games.png" />
<div style="text-align:center">
<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>
<ul id="breadcrumb">
<li>
<a href=""><img src="imgs/puzzle/iconPuzzle.png" alt="puzzle"/></a>
</li>
<li>
<a href="#">Test</a>
</li>
</ul>
@endsection

View File

@ -2,7 +2,14 @@
@section('content')
@if ($referents != [])
<h1 class="homeTitle"> Jeux Educatifs du musée Augustin </h1>
<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>
<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>.
</div>
<nav>
<input name="searchterm" class="icon-search" id="searchterm" placeholder="&#xe986; Rechercher un référent" type="text">
</nav>
@ -19,9 +26,6 @@
@else
<h1>Aucun référent trouvé</h1>
@endif
<div class="about">
<a href="#"><span class="icon-info" style="font-size: 55px; color:black;"></span></a>
</div>
@endsection
@section('page-css')

View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no">
<title>Les Jeux du Musée</title>
<link href='http://fonts.googleapis.com/css?family=Oswald' rel='stylesheet' type='text/css'>
<link href="http://fonts.googleapis.com/css?family=Oswald:700,300" rel="stylesheet" type="text/css">
<link href="{{ URL::to('css/frontend.css') }}" rel="stylesheet" type="text/css"/>
@yield('page-css')
</head>