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

fix bug

Browse Source
This commit is contained in:
Malibu 2015-02-24 12:06:24 +01:00
parent d661ecb9f8
commit 95ff2cadcf
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@ use App\Models\Matiere;
use App\Models\Technique; use App\Models\Technique;
use App\Models\Oeuvre; use App\Models\Oeuvre;
use Response; use Response;
use Illuminate\Pagination\Paginator as Paginator;
class ReferentController extends Controller { class ReferentController extends Controller {

12
SRC/composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "24c3946acc997e3f3eca7fc5c99585b2", "hash": "b7c7a8d3e8a26898c1ee45bb2564f7bb",
"packages": [ "packages": [
{ {
"name": "classpreloader/classpreloader", "name": "classpreloader/classpreloader",
@ -410,16 +410,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.0.5", "version": "v5.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "b1aea041cbc0cd54563e2d3709a54a71eed57653" "reference": "43637b796f1ac0b1a960984231251ff04b438006"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/b1aea041cbc0cd54563e2d3709a54a71eed57653", "url": "https://api.github.com/repos/laravel/framework/zipball/43637b796f1ac0b1a960984231251ff04b438006",
"reference": "b1aea041cbc0cd54563e2d3709a54a71eed57653", "reference": "43637b796f1ac0b1a960984231251ff04b438006",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -531,7 +531,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2015-02-13 19:10:59" "time": "2015-02-20 16:22:21"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",

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

@ -112,11 +112,7 @@
<div class="form-group"> <div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">Auteur</label> <label for="inputEmail3" class="col-sm-2 control-label">Auteur</label>
<div class="col-sm-10"> <div class="col-sm-10">
<<<<<<< HEAD
<select data-placeholder="Choisissez un auteur" class="chosen-select" multiple tabindex="4">
=======
<select data-placeholder="Choisissez un auteur" id="auteur" name="auteur[]" class="chosen-select" multiple tabindex="4"> <select data-placeholder="Choisissez un auteur" id="auteur" name="auteur[]" class="chosen-select" multiple tabindex="4">
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
<option value=""></option> <option value=""></option>
@foreach ($data['auteur'] as $val) @foreach ($data['auteur'] as $val)
<option value="{{$val -> id}}">{{$val -> nom}}</option> <option value="{{$val -> id}}">{{$val -> nom}}</option>
@ -127,11 +123,7 @@
<div class="form-group"> <div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">Désignation</label> <label for="inputEmail3" class="col-sm-2 control-label">Désignation</label>
<div class="col-sm-10"> <div class="col-sm-10">
<<<<<<< HEAD
<select data-placeholder="Choisissez une désignation" class="chosen-select" multiple tabindex="4">
=======
<select data-placeholder="Choisissez une désignation" id="designation" name="designation[]" class="chosen-select" multiple tabindex="4"> <select data-placeholder="Choisissez une désignation" id="designation" name="designation[]" class="chosen-select" multiple tabindex="4">
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
<option value=""></option> <option value=""></option>
@foreach ($data['designation'] as $val) @foreach ($data['designation'] as $val)
<option value="{{$val->id}}">{{$val->nom}}</option> <option value="{{$val->id}}">{{$val->nom}}</option>
@ -166,11 +158,7 @@
<div class="col-sm-10"> <div class="col-sm-10">
<select data-placeholder="Choisissez une technique" id="technique" name="technique[]" class="chosen-select" multiple tabindex="4"> <select data-placeholder="Choisissez une technique" id="technique" name="technique[]" class="chosen-select" multiple tabindex="4">
<option value=""></option> <option value=""></option>
<<<<<<< HEAD
@foreach ($data['designation'] as $val)
=======
@foreach ($data['technique'] as $val) @foreach ($data['technique'] as $val)
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
<option value="{{$val->id}}">{{$val->nom}}</option> <option value="{{$val->id}}">{{$val->nom}}</option>
@endforeach @endforeach
</select> </select>

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

@ -1,13 +1,13 @@
@extends('app') @extends('app')
<<<<<<< HEAD
<link href="css/referent.css" rel="stylesheet" type="text/css"/> <link href="css/referent.css" rel="stylesheet" type="text/css"/>
<br> <br>
<center><h1>Games</h1></center> <center><h1>Games</h1></center>
<br> <br>
<br> <br>
=======
<center><img src="/pictures/pic/game.png" alt="Game" class="iconGame"/></center> <!-- <center><img src="/pictures/pic/game.png" alt="Game" class="iconGame"/></center> -->
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
<div class="container"> <div class="container">
<div class="col-sm-6 col-md-4"> <div class="col-sm-6 col-md-4">
<div class="thumbnail"> <div class="thumbnail">