Merge branch '126-spendenaufruf-einbauen' into 'development'

Ausnahme für die Uni Mainz eingefügt

Closes #126

See merge request !155

app/MetaGer.php

@@ -270,6 +270,7 @@ class MetaGer
 
         $this->results = $paginatedSearchResults;
 
+        $this->validated = false;
         if( isset($this->password) )
         {
             # Wir bieten einen bezahlten API-Zugriff an, bei dem dementsprechend die Werbung ausgeblendet wurde:
@@ -280,6 +281,7 @@ class MetaGer
             if( $this->password === $password )
             {
                 $this->ads = [];
+                $this->validated = true;
             }
         }
 	}

resources/views/metager3.blade.php

@@ -24,11 +24,13 @@
 	@else
 		<div class="col-xs-12 col-md-12 resultContainer">
 	@endif
+	@if( !$metager->validated)
 	<div class="mg-panel container" style="margin-bottom:20px;max-height:90px;text-align:left; max-width:100%; padding:0px;margin-top:0px">
 		<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}" target="_blank">
 			<img src="/img/aufruf.png" style="max-width:100%;max-height:90px;">
 		</a>
 	</div>
+	@endif
 			{{-- 3-Mal Werbung --}}
 			@for($i = 0; $i <= 2; $i++)
 				@include('layouts.ad', ['ad' => $metager->popAd()])

resources/views/metager3bilder.blade.php

@@ -19,13 +19,13 @@
 			</ul>
 		</div>
 	@endif
-	<div class="mg-panel container result ad row" style="text-align:center;">
-		<div class="col-xs-12 col-sm-8" style="margin:0 auto;">
-			<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}" target="_blank">
-				<img src="/img/aufruf.png" style="width:100%">
-			</a>
-		</div>
-	</div>
+	@if( !$metager->validated)
+	<div class="mg-panel container" id="spendenaufruf" style="margin-bottom:20px;max-height:126px;max-width:100%;text-align:center;padding:0px;margin-top:0px">
+					<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}">
+					<img src="/img/aufruf.png" style="max-width:100%;max-height:126px;">
+					</a>
+			</div>
+	@endif
 	<div id="container">
 	@foreach($metager->getResults()->items() as $result)
 		<div class="item">

resources/views/metager3bilderresults.blade.php

@@ -16,6 +16,13 @@
 			</ul>
 		</div>
 	@endif
+@if( !$metager->validated)
+	<div class="mg-panel container" id="spendenaufruf" style="margin-bottom:20px;max-height:126px;max-width:100%;text-align:center;padding:0px;margin-top:0px">
+					<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}">
+					<img src="/img/aufruf.png" style="max-width:100%;max-height:126px;">
+					</a>
+			</div>
+	@endif
 <div id="container">
 	@foreach($metager->getResults()->items() as $result)
 		<div class="item">

resources/views/metager3results.blade.php

@@ -17,6 +17,13 @@
 		</div>
 	@endif
 <div class="col-xs-12 col-md-8">
+	@if( !$metager->validated)
+		<div class="mg-panel container" style="margin-bottom:20px;max-height:90px;text-align:left; max-width:100%; padding:0px;margin-top:0px">
+			<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}" target="_blank">
+				<img src="/img/aufruf.png" style="max-width:100%;max-height:90px;">
+			</a>
+		</div>
+	@endif
 	{{-- 3-Mal Werbung --}}
 	@for($i = 0; $i <= 2; $i++)
 		@include('layouts.ad', ['ad' => $metager->popAd()])