From 6f115809d87c68f11287b978aa1fbb2b1f4e3cac Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 9 Jan 2018 09:12:06 +0100
Subject: [PATCH] Spendenaufruf entfernt
---
resources/views/layouts/staticPages.blade.php | 3 ---
resources/views/metager3.blade.php | 5 +----
resources/views/metager3results.blade.php | 5 +----
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 30cc570de..48889b58c 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -38,9 +38,6 @@
</header>
@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
<div class="wrapper">
- @if(LaravelLocalization::getCurrentLocale() == "de" && strpos(url()->current(), '/beitritt') === false && strpos(url()->current(), '/spendenaufruf') === false)
- @include('parts.spendenaufruf')
- @endif
<main class="mg-panel container">
@if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div>
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 386e53025..ccb415550 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -23,15 +23,12 @@
@endif
<main id="results">
{{-- Show initial products or ads --}}
- @if(!$apiAuthorized && !$metager->validated && LaravelLocalization::getCurrentLocale() == "de" && strpos(url()->current(), '/beitritt') === false && strpos(url()->current(), '/spendenaufruf') === false)
- @include('parts.spendenaufruf')
- @endif
@if($metager->hasProducts())
@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
@include('layouts.products', ['products' => $metager->getProducts()])
@endif
@else
- @for($i = 0; $i <= 1; $i++)
+ @for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index 254b04394..1665affc1 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -19,16 +19,13 @@
</div>
@endif
<div id="results">
- @if(!$apiAuthorized && !$metager->validated && LaravelLocalization::getCurrentLocale() == "de" && strpos(url()->current(), '/beitritt') === false && strpos(url()->current(), '/spendenaufruf') === false)
- @include('parts.spendenaufruf')
- @endif
{{-- Show initial products or a
@if($metager->hasProducts())
@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
@include('layouts.products', ['products' => $metager->getProducts()])
@endif
@else
- @for($i = 0; $i <= 1; $i++)
+ @for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
--
GitLab