Die Blade Dateien der Ergebnisausgabe haben jetzt eine kürzere benennung

Einige Dinge wurden Zusammengefasst und Redundanzen entfernt

resources/views/metager3.blade.php

-@extends('layouts.resultPage')
-
-@section('results')
-	{{-- Show all errors --}}
-	@if(sizeof($errors) > 0)
-		<div class="alert alert-danger">
-			<ul>
-				@foreach($errors as $error)
-					<li>{!! $error !!}</li>
-				@endforeach
-			</ul>
-		</div>
-	@endif
-	{{-- Show all warnings --}}
-	@if(sizeof($warnings) > 0)
-		<div class="alert alert-warning">
-			<ul>
-				@foreach($warnings as $warning)
-					<li>{!! $warning !!}</li>
-				@endforeach
-			</ul>
-		</div>
-	@endif
-	<main id="results">
-		{{-- Show initial ads --}}
-		@if($mobile)
-			@include('layouts.ad', ['ad' => $metager->popAd()])
-		@else
-			@for($i = 0; $i <= 2; $i++)
-				@include('layouts.ad', ['ad' => $metager->popAd()])
-			@endfor
-		@endif
-		{{-- Show map --}}
-		{{-- Create results and ongoing ads --}}
-		@foreach($metager->getResults() as $result)
-			@if($mobile)
-				@if($result->number % 4 === 0)
-					@include('layouts.ad', ['ad' => $metager->popAd()])
-				@endif
-			@else
-				@if($result->number % 7 === 0)
-					@include('layouts.ad', ['ad' => $metager->popAd()])
-				@endif
-			@endif
-			@include('layouts.result', ['result' => $result])
-		@endforeach
-		{{-- Show pagination --}}
-		<nav class="mg-pager" aria-label="...">
-			<div @if($metager->getPage() === 1) class="disabled" @endif>
-				<a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
-			</div>
-			<div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
-				<a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
-			</div>
-		</nav>
-	</main>
-@endsection

resources/views/metager3bilder.blade.php

-@extends('layouts.resultPage')
-
-@section('results')
-	@if(sizeof($errors) > 0)
-		<div class="alert alert-danger">
-			<ul>
-				@foreach($errors as $error)
-					<li>{!! $error !!}</li>
-				@endforeach
-			</ul>
-		</div>
-	@endif
-	@if(sizeof($warnings) > 0)
-		<div class="alert alert-warning">
-			<ul>
-				@foreach($warnings as $warning)
-					<li>{!! $warning !!}</li>
-				@endforeach
-			</ul>
-		</div>
-	@endif
-	<div id="container" class="image-container">
-	@foreach($metager->getResults() as $result)
-		<div class="item image-item">
-			<div class="img">
-				<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a>
-				<span class="label label-default hostlabel">{!! $result->gefVon !!}</span>
-			</div>
-		</div>
-	@endforeach
-	</div>
-	<nav aria-label="...">
-		<ul class="pager">
-			<li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
-			<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
-		</ul>
-	</nav>
-@endsection

resources/views/metager3resultsatom10.blade.php

-<?xmlversion = "1.0"encoding = "UTF-8"?>
- <feed xmlns="http://www.w3.org/2005/Atom" 
-       xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
-       xmlns:mg="http://metager.de/opensearch/"
-       xmlns:ad="http://a9.com/-/opensearch/extensions/advertisement/1.0/">
-     <title>{!! htmlspecialchars($eingabe, ENT_XML1, 'UTF-8'); !!} - MetaGer</title>
-     <link href="{{ url()->full() }}"/>
-     <updated>{{ date('c') }}</updated>
-     <opensearch:totalResults>{{ $resultcount }}</opensearch:totalResults>
-     <opensearch:Query role="request" searchTerms="{{ htmlspecialchars($eingabe, ENT_QUOTES) }}"/>
-     <link rel="next" href="{{ htmlspecialchars($metager->nextSearchLink() ,ENT_QUOTES) }}" type="application/atom+xml"/>
-     <id>urn:uuid:1d634a8c-2764-424f-b082-6c96494b7240</id>
-     @include('layouts.atom10ad', ['ad' => $metager->popAd()])
-    @foreach($metager->getResults() as $result)
-      @if($result->number % 5 === 0)
-        @include('layouts.atom10ad', ['ad' => $metager->popAd()])
-      @endif
-       <entry>
-         <title>{!! htmlspecialchars($result->titel, ENT_XML1, 'UTF-8'); !!}</title>
-         <link href="{!! htmlspecialchars($result->link, ENT_XML1, 'UTF-8'); !!}" />
-         <mg:anzeigeLink>{!! htmlspecialchars($result->anzeigeLink, ENT_XML1, 'UTF-8'); !!}</mg:anzeigeLink>
-         <content type="text">
-            {!! htmlspecialchars($result->descr, ENT_XML1, 'UTF-8'); !!}
-         </content>
-       </entry>
-    @endforeach
- </feed>
\ No newline at end of file

resources/views/parts/errors.blade.php

+{{-- Show all errors --}}
+@if(sizeof($errors) > 0)
+	<div class="alert alert-danger">
+		<ul>
+			@foreach($errors as $error)
+				<li>{!! $error !!}</li>
+			@endforeach
+		</ul>
+	</div>
+@endif
\ No newline at end of file

resources/views/parts/pager.blade.php

+{{-- Show pagination --}}
+<nav class="mg-pager" aria-label="...">
+    <div @if($metager->getPage() === 1) class="disabled" @endif>
+        <a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
+    </div>
+    <div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
+        <a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
+    </div>
+</nav>
\ No newline at end of file

resources/views/parts/warnings.blade.php

+{{-- Show all warnings --}}
+@if(sizeof($warnings) > 0)
+	<div class="alert alert-warning">
+		<ul>
+			@foreach($warnings as $warning)
+				<li>{!! $warning !!}</li>
+			@endforeach
+		</ul>
+	</div>
+@endif
\ No newline at end of file

resources/views/resultpages/metager3resultsatom10.blade.php

+<?xmlversion = "1.0"encoding = "UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" 
+      xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
+      xmlns:mg="http://metager.de/opensearch/"
+      xmlns:ad="http://a9.com/-/opensearch/extensions/advertisement/1.0/">
+  <title>{!! htmlspecialchars($eingabe, ENT_XML1, 'UTF-8'); !!} - MetaGer</title>
+  <link href="{{ url()->full() }}"/>
+  <updated>{{ date('c') }}</updated>
+  <opensearch:totalResults>{{ $resultcount }}</opensearch:totalResults>
+  <opensearch:Query role="request" searchTerms="{{ htmlspecialchars($eingabe, ENT_QUOTES) }}"/>
+  <link rel="next" href="{{ htmlspecialchars($metager->nextSearchLink() ,ENT_QUOTES) }}" type="application/atom+xml"/>
+  <id>urn:uuid:1d634a8c-2764-424f-b082-6c96494b7240</id>
+  @include('layouts.atom10ad', ['ad' => $metager->popAd()])
+  @foreach($metager->getResults() as $result)
+    @if($result->number % 5 === 0)
+      @include('layouts.atom10ad', ['ad' => $metager->popAd()])
+    @endif
+    <entry>
+      <title>{!! htmlspecialchars($result->titel, ENT_XML1, 'UTF-8'); !!}</title>
+      <link href="{!! htmlspecialchars($result->link, ENT_XML1, 'UTF-8'); !!}" />
+      <mg:anzeigeLink>{!! htmlspecialchars($result->anzeigeLink, ENT_XML1, 'UTF-8'); !!}</mg:anzeigeLink>
+      <content type="text">
+        {!! htmlspecialchars($result->descr, ENT_XML1, 'UTF-8'); !!}
+      </content>
+    </entry>
+  @endforeach
+</feed>
\ No newline at end of file

resources/views/metager3resultsrss20.blade.php → resources/views/resultpages/metager3resultsrss20.blade.php

@@ -8,18 +8,17 @@
      <opensearch:totalResults>{{ $resultcount }}</opensearch:totalResults>
      <opensearch:Query role="request" searchTerms="{{ htmlspecialchars($eingabe, ENT_QUOTES) }}"/>
      <mg:nextSearchResults url="{{htmlspecialchars($metager->nextSearchLink() ,ENT_QUOTES)}}" />
-
-  @if($apiAuthorized)
-  @foreach($metager->getResults() as $result)
-     <item>
-       <title>{!! htmlspecialchars($result->titel, ENT_XML1, 'UTF-8'); !!}</title>
-       <link>{!! htmlspecialchars($result->link, ENT_XML1, 'UTF-8'); !!}</link>
-       <mg:anzeigeLink>{!! htmlspecialchars($result->anzeigeLink, ENT_XML1, 'UTF-8'); !!}</mg:anzeigeLink>
-       <description>
-          {!! htmlspecialchars($result->longDescr, ENT_XML1, 'UTF-8'); !!}
-       </description>
-     </item>
-  @endforeach
-  @endif
-   </channel>
+      @if($apiAuthorized)
+        @foreach($metager->getResults() as $result)
+          <item>
+            <title>{!! htmlspecialchars($result->titel, ENT_XML1, 'UTF-8'); !!}</title>
+            <link>{!! htmlspecialchars($result->link, ENT_XML1, 'UTF-8'); !!}</link>
+            <mg:anzeigeLink>{!! htmlspecialchars($result->anzeigeLink, ENT_XML1, 'UTF-8'); !!}</mg:anzeigeLink>
+            <description>
+              {!! htmlspecialchars($result->longDescr, ENT_XML1, 'UTF-8'); !!}
+            </description>
+          </item>
+        @endforeach
+      @endif
+    </channel>
  </rss>

resources/views/resultpages/resultpage.blade.php

+@extends('layouts.resultPage')
+
+@section('results')
+	@include('resultpages.results')
+@endsection

resources/views/resultpages/resultpage_images.blade.php

+@extends('layouts.resultPage')
+
+@section('results')
+	@include('resultpages.results_images')
+@endsection

resources/views/metager3results.blade.php → resources/views/resultpages/results.blade.php

-{{-- Show all errors --}}
-@if(sizeof($errors) > 0)
-	<div class="alert alert-danger">
-		<ul>
-			@foreach($errors as $error)
-				<li>{!! $error !!}</li>
-			@endforeach
-		</ul>
-	</div>
-@endif
-{{-- Show all warnings --}}
-@if(sizeof($warnings) > 0)
-	<div class="alert alert-warning">
-		<ul>
-			@foreach($warnings as $warning)
-				<li>{!! $warning !!}</li>
-			@endforeach
-		</ul>
-	</div>
-@endif
+@include('parts.errors')
+@include('parts.warnings')
 <div id="results">
 	@if($mobile)
 		@include('layouts.ad', ['ad' => $metager->popAd()])
@@ -26,7 +8,6 @@
 			@include('layouts.ad', ['ad' => $metager->popAd()])
 		@endfor
 	@endif
-	{{-- Show map --}}
 	{{-- Create results and ongoing ads --}}
 	@foreach($metager->getResults() as $result)
 		@if($mobile)
@@ -40,15 +21,7 @@
 		@endif
 		@include('layouts.result', ['result' => $result])
 	@endforeach
-	{{-- Show pagination --}}
-	<nav class="mg-pager" aria-label="...">
-		<div @if($metager->getPage() === 1) class="disabled" @endif>
-			<a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
-		</div>
-		<div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
-			<a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
-		</div>
-	</nav>
+	@include('parts.pager')
 </div>
 @if( $metager->showQuicktips() )
 	<div id="quicktips"></div>

resources/views/metager3bilderresults.blade.php → resources/views/resultpages/results_images.blade.php

-@if( sizeof($errors) > 0 )
-	<div class="alert alert-danger">
-		<ul>
-			@foreach($errors as $error)
-				<li>{!! $error !!}</li>
-			@endforeach
-		</ul>
-	</div>
-@endif
-@if( sizeof($warnings) > 0)
-	<div class="alert alert-warning">
-		<ul>
-			@foreach($warnings as $warning)
-				<li>{!! $warning !!}</li>
-			@endforeach
-		</ul>
-	</div>
-@endif
+@include('parts.errors')
+@include('parts.warnings')
 <div id="container" class="image-container">
 	@foreach($metager->getResults() as $result)
 		<div class="item image-item">
@@ -26,9 +10,4 @@
 		</div>
 	@endforeach
 </div>
-<nav aria-label="...">
-	<ul class="pager">
-		<li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
-		<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
-	</ul>
-</nav>
+@include('parts.pager')