From 090db144641caa5e8f67cb059b8f1996d8e14a5f Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Mon, 18 Jul 2016 15:13:49 +0200
Subject: [PATCH] =?UTF-8?q?Ausnahme=20f=C3=BCr=20die=20Uni=20Mainz=20einge?=
=?UTF-8?q?f=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/MetaGer.php | 2 ++
resources/views/metager3.blade.php | 2 ++
resources/views/metager3bilder.blade.php | 14 +++++++-------
resources/views/metager3bilderresults.blade.php | 7 +++++++
resources/views/metager3results.blade.php | 7 +++++++
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 1896a8255..aca8fed1a 100644
--- a/app/MetaGer.php
+++ b/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;
}
}
}
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 33e902edd..b1da99cd9 100644
--- a/resources/views/metager3.blade.php
+++ b/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()])
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index 38970c170..def2b1dcc 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/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">
diff --git a/resources/views/metager3bilderresults.blade.php b/resources/views/metager3bilderresults.blade.php
index 73fdf5da0..7983acbd9 100644
--- a/resources/views/metager3bilderresults.blade.php
+++ b/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">
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index add3ebca9..74a76920f 100644
--- a/resources/views/metager3results.blade.php
+++ b/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()])
--
GitLab