diff --git a/.bash_history b/.bash_history index db3be36..da4f95c 100755 --- a/.bash_history +++ b/.bash_history @@ -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 diff --git a/SRC/app/Http/Controllers/ReferentController.php b/SRC/app/Http/Controllers/ReferentController.php index fcec15a..9029bac 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::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]); } /** diff --git a/SRC/public/css/.DS_Store b/SRC/public/css/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/SRC/public/css/.DS_Store differ diff --git a/SRC/public/css/admin.css b/SRC/public/css/admin.css index 23c0b91..407c2c2 100644 --- a/SRC/public/css/admin.css +++ b/SRC/public/css/admin.css @@ -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%; } \ No newline at end of file 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..4083860 100644 --- a/SRC/public/css/home.css +++ b/SRC/public/css/home.css @@ -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; } \ No newline at end of file diff --git a/SRC/public/css/referent.css b/SRC/public/css/referent.css index dc01aa5..6438a7c 100644 --- a/SRC/public/css/referent.css +++ b/SRC/public/css/referent.css @@ -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 diff --git a/SRC/public/pictures/.DS_Store b/SRC/public/pictures/.DS_Store new file mode 100644 index 0000000..a508ec9 Binary files /dev/null and b/SRC/public/pictures/.DS_Store differ diff --git a/SRC/public/pictures/homePic/.DS_Store b/SRC/public/pictures/homePic/.DS_Store new file mode 100644 index 0000000..f6bb762 Binary files /dev/null and b/SRC/public/pictures/homePic/.DS_Store differ diff --git a/SRC/public/pictures/pic/.DS_Store b/SRC/public/pictures/pic/.DS_Store new file mode 100644 index 0000000..2b184a2 Binary files /dev/null and b/SRC/public/pictures/pic/.DS_Store differ diff --git a/SRC/public/pictures/pic/home.png b/SRC/public/pictures/pic/home.png new file mode 100644 index 0000000..e8e8626 Binary files /dev/null and b/SRC/public/pictures/pic/home.png differ diff --git a/SRC/public/pictures/referent/.DS_Store b/SRC/public/pictures/referent/.DS_Store new file mode 100644 index 0000000..6e989db Binary files /dev/null and b/SRC/public/pictures/referent/.DS_Store differ diff --git a/SRC/public/pictures/setting_picture/.DS_Store b/SRC/public/pictures/setting_picture/.DS_Store new file mode 100644 index 0000000..85bc805 Binary files /dev/null and b/SRC/public/pictures/setting_picture/.DS_Store differ diff --git a/SRC/public/pictures/user_picture/.gitignore b/SRC/public/pictures/user_picture/.gitignore old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/user_picture/default.jpg b/SRC/public/pictures/user_picture/default.jpg old mode 100644 new mode 100755 diff --git a/SRC/resources/views/.DS_Store b/SRC/resources/views/.DS_Store new file mode 100644 index 0000000..b4fb9bf Binary files /dev/null and b/SRC/resources/views/.DS_Store differ diff --git a/SRC/resources/views/admin.blade.php b/SRC/resources/views/admin.blade.php index 44b737b..3f0af2d 100755 --- a/SRC/resources/views/admin.blade.php +++ b/SRC/resources/views/admin.blade.php @@ -21,9 +21,10 @@
- +

- + +
@@ -64,7 +65,6 @@ - @endif @endforeach 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/auth/login.blade.php b/SRC/resources/views/auth/login.blade.php index dd0f6ba..2a00961 100755 --- a/SRC/resources/views/auth/login.blade.php +++ b/SRC/resources/views/auth/login.blade.php @@ -2,7 +2,11 @@ @section('content') +
+
+ < Retour Retour +
@@ -23,7 +27,7 @@
@endif - +
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 @@
Nom
- + @@ -33,10 +33,12 @@ + @@ -109,45 +111,22 @@
- - - - - - - - - -
-
-
- -
-
- - - - - - - - + @foreach ($data['designation'] as $val) + + @endforeach
@@ -156,13 +135,9 @@
@@ -171,13 +146,9 @@
@@ -186,13 +157,9 @@
diff --git a/SRC/resources/views/referent_games.blade.php b/SRC/resources/views/referent_games.blade.php index a95ab97..aba6c43 100644 --- a/SRC/resources/views/referent_games.blade.php +++ b/SRC/resources/views/referent_games.blade.php @@ -1,10 +1,9 @@ @extends('app') - +

Games



-
NomActionNomActionSupprimer
{{$listeoeuvre->nom}} - + +