Commit 0e583c63 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch...

Merge branch '182-wir-fragen-immer-nur-die-ersten-ergebnisse-einer-suchmaschine-ab' into 'development'

Pagination wird nun an der richtigen Stelle ausgegeben

Closes #182

See merge request !310
parents 015ecdfe beb39a64
...@@ -26,12 +26,6 @@ ...@@ -26,12 +26,6 @@
@yield('results') @yield('results')
</div> </div>
@endif @endif
<nav aria-label="...">
<ul class="pager">
<li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">Zurück</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">Weiter Suchen</a></li>
</ul>
</nav>
<footer> <footer>
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-6">
......
...@@ -41,7 +41,14 @@ ...@@ -41,7 +41,14 @@
@endif @endif
@include('layouts.result', ['result' => $result]) @include('layouts.result', ['result' => $result])
@endforeach @endforeach
<nav aria-label="...">
<ul class="pager">
<li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">Zurück</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">Weiter Suchen</a></li>
</ul>
</nav>
</div> </div>
@if( $metager->showQuicktips() ) @if( $metager->showQuicktips() )
<div class="hidden-xs col-md-4" id="quicktips"> <div class="hidden-xs col-md-4" id="quicktips">
<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe> <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
@endif @endif
<div id="container"> <div id="container">
@foreach($metager->getResults()->items() as $result) @foreach($metager->getResults() as $result)
<div class="item"> <div class="item">
<div class="img"> <div class="img">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a> <a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a>
...@@ -36,8 +36,10 @@ ...@@ -36,8 +36,10 @@
</div> </div>
@endforeach @endforeach
</div> </div>
<nav class="pager"> <nav aria-label="...">
{!! $metager->getResults()->links() !!} <ul class="pager">
<li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">Zurück</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">Weiter Suchen</a></li>
</ul>
</nav> </nav>
@endsection @endsection
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
@endif @endif
<div id="container"> <div id="container">
@foreach($metager->getResults()->items() as $result) @foreach($metager->getResults() as $result)
<div class="item"> <div class="item">
<div class="img"> <div class="img">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a> <a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a>
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
</div> </div>
@endforeach @endforeach
</div> </div>
<nav class="pager"> <nav aria-label="...">
{!! $metager->getResults()->links() !!} <ul class="pager">
</nav> <li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">Zurück</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">Weiter Suchen</a></li>
</ul>
</nav>
...@@ -28,17 +28,19 @@ ...@@ -28,17 +28,19 @@
@for($i = 0; $i <= 2; $i++) @for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
@endfor @endfor
@foreach($metager->getResults()->items() as $result) @foreach($metager->getResults() as $result)
@if($result->number % 7 === 0) @if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
@endif @endif
@include('layouts.result', ['result' => $result]) @include('layouts.result', ['result' => $result])
@endforeach @endforeach
<nav class="pager"> <nav aria-label="...">
{!! $metager->getResults()->links() !!} <ul class="pager">
<li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">Zurück</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">Weiter Suchen</a></li>
</ul>
</nav> </nav>
</div> </div>
<div class="hidden-xs col-md-4" id="quicktips"> <div class="hidden-xs col-md-4" id="quicktips">
<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe> <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
</div> </div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment