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

bug

This commit is contained in:
www 2015-02-24 11:34:35 +01:00
parent 5fbb41a461
commit 4f8e9f9a38
23 changed files with 263 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
.bash_history
View File

@ -290,3 +290,64 @@ git commit -a
git pull
nano SRC/.env
nano SRC/.env
cd ..
python loadCSVAugustin2014.py
cd
git commit -a
git push
git push
git pull
rm SRC/app/Http/routes.php
git pull
gi commit -a
git commit -a
git pull
git push
git pull
git pull
git pull
git pull
git pull
git pull
git pull
git pull
git pull
git pull
exit
php artisan db:seed
cd SRC
php artisan db:seed
cd ..
git pull
exit
git pull
exit
git pull
exit
git pull
exit
git pull
exit
git pull
git pull
git pull
cd ..
python loadCSVAugustin2014.py
git pull
git pull
git pull
git pull
cd SRC/
php artisan db:seed
cd ..
python loadCSVAugustin2014.py
git pull
exit
git pull
git pull
git pull
git pull
exit
git pull
exit
git pull

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

@ -5,6 +5,11 @@ use Input;
use Request;
use App\Models\ListeOeuvre;
use App\Models\AssoListeAOeuvre;
use App\Models\Auteur;
use App\Models\Designation;
use App\Models\Domaine;
use App\Models\Matiere;
use App\Models\Technique;
use Response;
@ -31,11 +36,18 @@ class ReferentController extends Controller {
$me = User::current();
$user = User::all();
$dataSearch = [];
$dataSearch['auteur'] = Auteur::orderBy('nom')->get();
$dataSearch['designation'] = Designation::orderBy('nom')->get();
$dataSearch['domaine'] = Domaine::orderBy('nom')->get();
$dataSearch['matiere'] = Matiere::orderBy('nom')->get();
$dataSearch['technique'] = Technique::orderBy('nom')->get();
//$ListeOeuvre = ListeOeuvre::find(2);
//$ListeOeuvre->oeuvres()->attach([22, 23, 24, 25, 26]);
$listeoeuvres = ListeOeuvre::currentUser()->get();
return view('referent', ['nameRoute' => 'Référent', 'me' => $me, 'listeoeuvres' => $listeoeuvres]);
return view('referent', ['nameRoute' => 'Référent', 'me' => $me, 'listeoeuvres' => $listeoeuvres, 'data' => $dataSearch]);
}
/**

BIN
SRC/public/css/.DS_Store vendored Normal file
View File

Binary file not shown.

30
SRC/public/css/admin.css
View File

@ -5,4 +5,34 @@ body
background-repeat:no-repeat;
background-position:100% 100%;
background-size:cover;
}
table
{
border: 1px solid grey;
width : 95%;
margin-left: auto;
margin-right: auto;
box-shadow: 0 0 2px dimgrey;
}
table thead tr td /*en tete du tableau */
{
border-bottom: 1px solid silver;
padding: 2%;
font-weight: normal;
color: #139DFA;
background: white;
}
table tbody tr td /*corps du tableau */
{
padding : 1%;
background: white;
}
.addRef
{
position: fixed;
left : 70%;
}

44
SRC/public/css/app.css
View File

@ -2332,7 +2332,7 @@ output {
height: 34px;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857143;
line-height: 1.5;
color: #555555;
background-color: #ffffff;
background-image: none;
@ -2809,9 +2809,28 @@ fieldset[disabled] .btn-default.active {
background-color: #333333;
}
.btn-primary {
color: #ffffff;
/*color: #ffffff;
background-color: #337ab7;
border-color: #2e6da4;
border-color: #2e6da4;*/
/*border-radius*/
border-color: #2e6da4;
-webkit-border-radius: 5px;
-moz-border-radius: 1px;
border-radius: 3px;
color: white;
font-size: 12px;
font-weight : normal;
border-top: 1px solid #3B96D7;
padding-left: 15px;
padding-right: 15px;
background: rgb(98,186,236);
background: -moz-linear-gradient(top, rgba(98,186,236,1) 0%, rgba(18,128,211,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(98,186,236,1)), color-stop(100%,rgba(18,128,211,1)));
background: -webkit-linear-gradient(top, rgba(98,186,236,1) 0%,rgba(18,128,211,1) 100%);
background: -o-linear-gradient(top, rgba(98,186,236,1) 0%,rgba(18,128,211,1) 100%);
background: -ms-linear-gradient(top, rgba(98,186,236,1) 0%,rgba(18,128,211,1) 100%);
background: linear-gradient(top, rgba(98,186,236,1) 0%,rgba(18,128,211,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#62baec', endColorstr='#1280d3',GradientType=0 );
}
.btn-primary:hover,
.btn-primary:focus,
@ -2820,13 +2839,26 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
color: #ffffff;
background-color: #286090;
border-color: #204d74;
background: rgb(55,148,216);
background: -moz-linear-gradient(top, rgba(55,148,216,1) 0%, rgba(3,81,184,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(55,148,216,1)), color-stop(100%,rgba(3,81,184,1)));
background: -webkit-linear-gradient(top, rgba(55,148,216,1) 0%,rgba(3,81,184,1) 100%);
background: -o-linear-gradient(top, rgba(55,148,216,1) 0%,rgba(3,81,184,1) 100%);
background: -ms-linear-gradient(top, rgba(55,148,216,1) 0%,rgba(3,81,184,1) 100%);
background: linear-gradient(top, rgba(55,148,216,1) 0%,rgba(3,81,184,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3794d8', endColorstr='#0351b8',GradientType=0 );
}
.btn-primary:active,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
background-image: none;
background: #4f85bb; /* Old browsers */
background: -moz-linear-gradient(top, #4f85bb 0%, #4f85bb 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4f85bb), color-stop(100%,#4f85bb)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* IE10+ */
background: linear-gradient(to bottom, #4f85bb 0%,#4f85bb 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4f85bb', endColorstr='#4f85bb',GradientType=0 );
}
.btn-primary.disabled,
.btn-primary[disabled],

8
SRC/public/css/game.css Normal file
View File

@ -0,0 +1,8 @@
body
{
background-image:url("../pictures/homePic/fond.jpg");
background-attachment:fixed;
background-repeat:no-repeat;
background-position:100% 100%;
background-size:cover;
}

56
SRC/public/css/home.css
View File

@ -6,6 +6,27 @@ body {
background-size:cover;
}
.back_home
{
background: white;
width : 10%;
padding : 1%;
border-radius: 8px;
border: 1px solid silver;
}
.back_home img
{
width: 40%;
height: 40%;
}
.imgSearch /* image de la loupe */
{
height: 25px;
width : 25px;
}
.form-group
{
margin-top : 0.5%;
@ -17,4 +38,39 @@ body {
box-shadow: 0px 0px 3px black;
max-height : 250px;
max-width : 250px;
}
.well, .well-lg /* le nom du referent */
{
margin : 1%;
width : 40%;
box-shadow: 0 0 6px black inset;
border: 1px solid dimgrey;
}
.carousel-indicators
{
position: fixed;
bottom : 8%;
}
.carousel-indicators li { /*tous les cercles */
display: inline-block;
width: 10px;
height: 10px;
margin: 1px;
text-indent: -999px;
border: 1px solid #ffffff;
border-radius: 10px;
cursor: pointer;
background: white;
border: 1px solid silver;
}
.carousel-indicators .active { /*contour cercle actif */
margin: 0;
width: 12px;
height: 12px;
border: none;
background-color: #2AADE5;
}

22
SRC/public/css/referent.css
View File

@ -13,6 +13,16 @@ caption
text-align: center;
}
table
{
text-align: center;
}
table thead tr th
{
text-align: center;
}
.listg
{
background: #a7cfdf; /* Old browsers */
@ -28,6 +38,17 @@ background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
border-radius: 7px;
border: 1px solid grey;
box-shadow: 0px 0px 2px dimgrey;
width : 25%;
}
.tablethead
{
color: white;
}
.chosen-select /* les select */
{
width : 20%;
}
.listg legend
@ -69,6 +90,7 @@ background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
border-radius: 7px;
border: 1px solid grey;
box-shadow: 0px 0px 2px dimgrey;
width : 70%;
}
.jeux

BIN
SRC/public/pictures/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
SRC/public/pictures/homePic/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
SRC/public/pictures/pic/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
SRC/public/pictures/pic/home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
SRC/public/pictures/referent/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
SRC/public/pictures/setting_picture/.DS_Store vendored Normal file
View File

Binary file not shown.

0
SRC/public/pictures/user_picture/.gitignore vendored Normal file → Executable file
View File

0
SRC/public/pictures/user_picture/default.jpg Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
SRC/resources/views/.DS_Store vendored Normal file
View File

Binary file not shown.

6
SRC/resources/views/admin.blade.php
View File

@ -21,9 +21,10 @@
<div class="col-md-2"></div>
<div class="col-md-8">
<button style="float: right" type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">Ajouter un référent</button>
<button type="button" class="btn btn-primary addRef" data-toggle="modal" data-target="#myModal">Ajouter un référent</button>
<br><br>
<table class="table table-hover table-bordered">
<!-- class="table table-hover table-bordered" -->
<table>
<thead>
<tr style="background-color: #F7BE81">
<td>Nom</td>
@ -64,7 +65,6 @@
</form>
</div>
</tr>
@endif
@endforeach
</tbody>

2
SRC/resources/views/app.blade.php
View File

@ -8,7 +8,7 @@
<link href="/css/app.css" rel="stylesheet">
<link href="/css/chosen.min.css" rel="stylesheet">
<link href="/css/game.css" rel="stylesheet" type="text/css"/>
<!-- Fonts -->
<link href='//fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'>

6
SRC/resources/views/auth/login.blade.php
View File

@ -2,7 +2,11 @@
@section('content')
<link href="css/home.css" rel="stylesheet" type="text/css"/>
<div style="margin-top: 70px" class="container-fluid">
<div class="back_home">
<a href="/" > < Retour <img src="./pictures/pic/home.png" alt="Retour" /></a>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
@ -23,7 +27,7 @@
</ul>
</div>
@endif
<form class="form-horizontal" role="form" method="POST" action="login">
<input type="hidden" name="_token" value="{{ csrf_token() }}">

2
SRC/resources/views/home.blade.php
View File

@ -7,7 +7,7 @@
<nav>
<form class="form-inline navbar">
<div class="form-group">
<img alt="" height="35px" src="./pictures/homePic/search.png">
<img alt="" class="imgSearch" src="./pictures/homePic/search.png">
<div class="input-group">
</span><input type="text" class="form-control" placeholder="Rechercher un Référant">
</div>

81
SRC/resources/views/referent.blade.php
View File

@ -21,7 +21,7 @@
<table class="table table-hover">
<thead>
<tr>
<th>Nom</th><th>Action</th>
<th>Nom</th><th>Action</th><th>Supprimer</th>
</tr>
</thead>
<tbody>
@ -33,10 +33,12 @@
<input type="hidden" name="_token" value="{{{ csrf_token() }}}" />
<td>{{$listeoeuvre->nom}}</td>
<td>
<label class="ios7-switch">
<input type="checkbox" checked>
<span></span>
</label>
<label class="ios7-switch">
<input type="checkbox" checked>
<span></span>
</label>
</td>
<td>
<button type="submit" class="btn btn-sm btn-danger">
<span class="glyphicon glyphicon-trash"></span></button>
</td>
@ -109,45 +111,22 @@
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">Auteur</label>
<div class="col-sm-10">
<select data-placeholder="Choisissez un auteur" class="chosen-select" multiple style="width:350px;" tabindex="4">
<select data-placeholder="Choisissez un auteur" class="chosen-select" multiple tabindex="4">
<option value=""></option>
<option value="United States">United States</option>
<option value="United Kingdom">United Kingdom</option>
<option value="Afghanistan">Afghanistan</option>
<option value="Aland Islands">Aland Islands</option>
<option value="Albania">Albania</option>
<option value="Zambia">Zambia</option>
<option value="Zimbabwe">Zimbabwe</option>
</select>
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">Description</label>
<div class="col-sm-10">
<select data-placeholder="Choisissez une description" class="chosen-select" multiple style="width:350px;" tabindex="4">
<option value=""></option>
<option value="United States">United States</option>
<option value="United Kingdom">United Kingdom</option>
<option value="Afghanistan">Afghanistan</option>
<option value="Aland Islands">Aland Islands</option>
<option value="Albania">Albania</option>
<option value="Zambia">Zambia</option>
<option value="Zimbabwe">Zimbabwe</option>
@foreach ($data['auteur'] as $val)
<option value="{{$val -> id}}">{{$val -> nom}}</option>
@endforeach
</select>
</div>
</div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">Désignation</label>
<div class="col-sm-10">
<select data-placeholder="Choisissez une désignation" class="chosen-select" multiple style="width:350px;" tabindex="4">
<select data-placeholder="Choisissez une désignation" class="chosen-select" multiple tabindex="4">
<option value=""></option>
<option value="United States">United States</option>
<option value="United Kingdom">United Kingdom</option>
<option value="Afghanistan">Afghanistan</option>
<option value="Aland Islands">Aland Islands</option>
<option value="Albania">Albania</option>
<option value="Zambia">Zambia</option>
<option value="Zimbabwe">Zimbabwe</option>
@foreach ($data['designation'] as $val)
<option value="{{$val->id}}">{{$val->nom}}</option>
@endforeach
</select>
</div>
</div>
@ -156,13 +135,9 @@
<div class="col-sm-10">
<select data-placeholder="Choisissez un domaine" class="chosen-select" multiple style="width:350px;" tabindex="4">
<option value=""></option>
<option value="United States">United States</option>
<option value="United Kingdom">United Kingdom</option>
<option value="Afghanistan">Afghanistan</option>
<option value="Aland Islands">Aland Islands</option>
<option value="Albania">Albania</option>
<option value="Zambia">Zambia</option>
<option value="Zimbabwe">Zimbabwe</option>
@foreach ($data['domaine'] as $val)
<option value="{{$val->id}}">{{$val->nom}}</option>
@endforeach
</select>
</div>
</div>
@ -171,13 +146,9 @@
<div class="col-sm-10">
<select data-placeholder="Choisissez une matière" class="chosen-select" multiple style="width:350px;" tabindex="4">
<option value=""></option>
<option value="United States">United States</option>
<option value="United Kingdom">United Kingdom</option>
<option value="Afghanistan">Afghanistan</option>
<option value="Aland Islands">Aland Islands</option>
<option value="Albania">Albania</option>
<option value="Zambia">Zambia</option>
<option value="Zimbabwe">Zimbabwe</option>
@foreach ($data['matiere'] as $val)
<option value="{{$val->id}}">{{$val->nom}}</option>
@endforeach
</select>
</div>
</div>
@ -186,13 +157,9 @@
<div class="col-sm-10">
<select data-placeholder="Choisissez une technique" class="chosen-select" multiple style="width:350px;" tabindex="4">
<option value=""></option>
<option value="United States">United States</option>
<option value="United Kingdom">United Kingdom</option>
<option value="Afghanistan">Afghanistan</option>
<option value="Aland Islands">Aland Islands</option>
<option value="Albania">Albania</option>
<option value="Zambia">Zambia</option>
<option value="Zimbabwe">Zimbabwe</option>
@foreach ($data['designation'] as $val)
<option value="{{$val->id}}">{{$val->nom}}</option>
@endforeach
</select>
</div>
</div>

3
SRC/resources/views/referent_games.blade.php
View File

@ -1,10 +1,9 @@
@extends('app')
<link href="css/referent.css" rel="stylesheet" type="text/css"/>
<br>
<center><h1>Games</h1></center>
<br>
<br>
<div class="container">
<div class="col-sm-6 col-md-4">
<div class="thumbnail">