From a17832b4b63e300ba1744a5257b33480d29aae57 Mon Sep 17 00:00:00 2001 From: Malibu Date: Fri, 20 Feb 2015 18:29:57 +0100 Subject: [PATCH 01/16] modified: SRC/app/Http/Controllers/ReferentController.php modified: SRC/resources/views/referent.blade.php --- .../Http/Controllers/ReferentController.php | 14 +++- SRC/resources/views/referent.blade.php | 65 +++++-------------- 2 files changed, 28 insertions(+), 51 deletions(-) diff --git a/SRC/app/Http/Controllers/ReferentController.php b/SRC/app/Http/Controllers/ReferentController.php index fcec15a..df1157a 100755 --- a/SRC/app/Http/Controllers/ReferentController.php +++ b/SRC/app/Http/Controllers/ReferentController.php @@ -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::all(); + $dataSearch['designation'] = Designation::all(); + $dataSearch['domaine'] = Domaine::all(); + $dataSearch['matiere'] = Matiere::all(); + $dataSearch['technique'] = Technique::all(); + //$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]); } /** diff --git a/SRC/resources/views/referent.blade.php b/SRC/resources/views/referent.blade.php index 6c02c97..a80d717 100755 --- a/SRC/resources/views/referent.blade.php +++ b/SRC/resources/views/referent.blade.php @@ -111,28 +111,9 @@
-
- -
- -
-
@@ -141,13 +122,9 @@
@@ -156,13 +133,9 @@
@@ -171,13 +144,9 @@
@@ -186,13 +155,9 @@
From 4c061c4d739185eb2f26f1108223bf4b98c68b24 Mon Sep 17 00:00:00 2001 From: Malibu Date: Fri, 20 Feb 2015 18:37:58 +0100 Subject: [PATCH 02/16] modified: SRC/app/Http/Controllers/ReferentController.php --- SRC/app/Http/Controllers/ReferentController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SRC/app/Http/Controllers/ReferentController.php b/SRC/app/Http/Controllers/ReferentController.php index df1157a..9029bac 100755 --- a/SRC/app/Http/Controllers/ReferentController.php +++ b/SRC/app/Http/Controllers/ReferentController.php @@ -37,11 +37,11 @@ class ReferentController extends Controller { $user = User::all(); $dataSearch = []; - $dataSearch['auteur'] = Auteur::all(); - $dataSearch['designation'] = Designation::all(); - $dataSearch['domaine'] = Domaine::all(); - $dataSearch['matiere'] = Matiere::all(); - $dataSearch['technique'] = Technique::all(); + $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]); From 291a5c29371f87d80f46ea58c2110b886a9e1f10 Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Fri, 20 Feb 2015 22:29:41 +0100 Subject: [PATCH 03/16] remise en place des css + creation des css --- SRC/public/css/app.css | 44 +++++++++++++++++--- SRC/public/css/game.css | 8 ++++ SRC/public/css/home.css | 41 ++++++++++++++++++ SRC/public/css/referent.css | 2 + SRC/resources/views/app.blade.php | 2 +- SRC/resources/views/home.blade.php | 2 +- SRC/resources/views/referent_games.blade.php | 3 +- 7 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 SRC/public/css/game.css diff --git a/SRC/public/css/app.css b/SRC/public/css/app.css index 2bd0460..df0acf7 100755 --- a/SRC/public/css/app.css +++ b/SRC/public/css/app.css @@ -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], diff --git a/SRC/public/css/game.css b/SRC/public/css/game.css new file mode 100644 index 0000000..65e158d --- /dev/null +++ b/SRC/public/css/game.css @@ -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; +} \ No newline at end of file diff --git a/SRC/public/css/home.css b/SRC/public/css/home.css index af076fc..c963f78 100644 --- a/SRC/public/css/home.css +++ b/SRC/public/css/home.css @@ -6,6 +6,12 @@ body { background-size:cover; } +.imgSearch /* image de la loupe */ +{ + height: 25px; + width : 25px; +} + .form-group { margin-top : 0.5%; @@ -17,4 +23,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; } \ No newline at end of file diff --git a/SRC/public/css/referent.css b/SRC/public/css/referent.css index dc01aa5..0a2d304 100644 --- a/SRC/public/css/referent.css +++ b/SRC/public/css/referent.css @@ -28,6 +28,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 : 25%; } .listg legend @@ -69,6 +70,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 diff --git a/SRC/resources/views/app.blade.php b/SRC/resources/views/app.blade.php index 967b20f..2e3d936 100755 --- a/SRC/resources/views/app.blade.php +++ b/SRC/resources/views/app.blade.php @@ -8,7 +8,7 @@ - + diff --git a/SRC/resources/views/home.blade.php b/SRC/resources/views/home.blade.php index 72217d3..23dc714 100755 --- a/SRC/resources/views/home.blade.php +++ b/SRC/resources/views/home.blade.php @@ -7,7 +7,7 @@