Merge remote-tracking branch 'origin/master'

Conflicts:
	SRC/public/css/frontend.css
This commit is contained in:
alexandre-pereira
2015-03-17 12:07:59 +01:00
15 changed files with 318 additions and 18 deletions

View File

@ -1,10 +1,10 @@
<legend>Résultat de ma recherche</legend>
<select multiple="multiple" class="multiple" id="toadd" name="toadd[]">
@foreach($oeuvres as $oeuvre)
<option data-img-src='http://www.augustins.org/documents/10180/156407/{{$oeuvre->image}}' value='{{$oeuvre->id}}'></option>
<option data-img-src='/image/200/{{$oeuvre->image}}' value='{{$oeuvre->id}}'></option>
@endforeach
</select>
<div class="text-center">
{!! $oeuvres->render() !!}
</div>
<button type="submit" class="btn btn-primary">Ajouter à la liste courante</button>
<button type="submit" class="btn btn-primary">Ajouter à la liste courante</button>