Merge branch 'search' into dev

This commit is contained in:
Michal Kváček
2016-03-15 14:03:45 +01:00
9 changed files with 141 additions and 15 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<form action="{{route('search')}}" method="get">
<div class="input-group">
<input type="text" class="input-group-field" value="@if(isset($search)) {{old('search', $search)}} @else {{old('search')}} @endif" placeholder="@lang('search.term')" name="search" />
<input type="text" class="input-group-field" value="@if(isset($search)){{$search}}@endif" placeholder="@lang('search.term')" name="search" />
<div class="input-group-button">
<button class="button success"><i class="fa fa-search"></i></button>
@@ -8,6 +8,18 @@
<h2>@lang('search.pageTitle')</h2>
</div>
@if (session('success'))
<div data-alert class="callout success">
<strong>{{ session('success') }}</strong>
</div>
@endif
@if (session('error'))
<div data-alert class="callout alert">
<strong>{{ session('error') }}</strong>
</div>
@endif
@if ($search)
<div class="row">
<div class="column large-8">