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

resources/views/layouts/resultPage.blade.php

@@ -26,12 +26,6 @@
 			@yield('results')
 		</div>
 	@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>
 		<div class="row">
 			<div class="col-xs-6">

resources/views/metager3.blade.php

@@ -41,7 +41,14 @@
 				@endif
 				@include('layouts.result', ['result' => $result])
 			@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>
+
 	@if( $metager->showQuicktips() )
 		<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>

resources/views/metager3bilder.blade.php

@@ -27,7 +27,7 @@
 			</div>
 	@endif
 	<div id="container">
-	@foreach($metager->getResults()->items() as $result)
+	@foreach($metager->getResults() as $result)
 		<div class="item">
 			<div class="img">
 				<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a>
@@ -36,8 +36,10 @@
 		</div>
 	@endforeach
 	</div>
-	<nav class="pager">
-		{!! $metager->getResults()->links() !!}
+	<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>
 @endsection
-

resources/views/metager3bilderresults.blade.php

@@ -24,7 +24,7 @@
 			</div>
 	@endif
 <div id="container">
-	@foreach($metager->getResults()->items() as $result)
+	@foreach($metager->getResults() as $result)
 		<div class="item">
 			<div class="img">
 				<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a>
@@ -33,6 +33,9 @@
 		</div>
 	@endforeach
 </div>
-<nav class="pager">
-	{!! $metager->getResults()->links() !!}
-</nav>
+<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>

resources/views/metager3results.blade.php

@@ -28,17 +28,19 @@
 	@for($i = 0; $i <= 2; $i++)
 		@include('layouts.ad', ['ad' => $metager->popAd()])
 	@endfor
-	@foreach($metager->getResults()->items() as $result)
+	@foreach($metager->getResults() as $result)
 		@if($result->number % 7 === 0)
 			@include('layouts.ad', ['ad' => $metager->popAd()])
 		@endif
 		@include('layouts.result', ['result' => $result])
 	@endforeach
-	<nav class="pager">
-		{!! $metager->getResults()->links() !!}
+	<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 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>
 </div>
-