From 628c8344504fb16c342b47232a77a1d259c342a7 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Mon, 8 Jan 2018 11:42:01 +0100
Subject: [PATCH] Spendenaufruf refactoring
---
resources/assets/less/metager/result-page.less | 9 +++++++++
resources/assets/less/metager/start-page.less | 11 +++++++++--
resources/views/layouts/staticPages.blade.php | 12 +-----------
resources/views/metager3.blade.php | 10 +---------
resources/views/metager3results.blade.php | 10 +---------
resources/views/parts/spendenaufruf.blade.php | 5 +++++
6 files changed, 26 insertions(+), 31 deletions(-)
create mode 100644 resources/views/parts/spendenaufruf.blade.php
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 693dc711b..0d9503374 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -367,3 +367,12 @@ a {
width: @quicktip-width;
}
}
+
+#spendenaufruf {
+ margin-bottom: 10px;
+ a {
+ background-color: white;
+ display: inline-block;
+ width: 100%;
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less
index 89925dd1d..33421627f 100644
--- a/resources/assets/less/metager/start-page.less
+++ b/resources/assets/less/metager/start-page.less
@@ -110,5 +110,12 @@
}
#spendenaufruf {
- margin-bottom: 50px;
-}
+ text-align: center;
+ a {
+ background-color: white;
+ display: inline-block;
+ width: 100%;
+ max-width: 770px;
+ margin-bottom: 10px;
+ }
+}
\ No newline at end of file
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index a82e89959..30cc570de 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -39,17 +39,7 @@
@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
<div class="wrapper">
@if(LaravelLocalization::getCurrentLocale() == "de" && strpos(url()->current(), '/beitritt') === false && strpos(url()->current(), '/spendenaufruf') === false)
- <div id="spendenaufruf" style="text-align: center;">
- <a href="/spendenaufruf" target="_blank" style="
- background-color: white;
- display: inline-block;
- width: 100%;
- max-width: 770px;
- margin-bottom: 10px;
- ">
- <img src="/img/aufruf.png" alt="Spendenaufruf SuMa eV" width="100%">
- </a>
- </div>
+ @include('parts.spendenaufruf')
@endif
<main class="mg-panel container">
@if (isset($success))
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 1d6eb8b46..386e53025 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -24,15 +24,7 @@
<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)
- <div id="spendenaufruf" style="margin-bottom: 10px">
- <a href="/spendenaufruf" target="_blank" style="
- background-color: white;
- display: inline-block;
- width: 100%;
- ">
- <img src="/img/aufruf.png" alt="Spendenaufruf SuMa eV" width="100%">
- </a>
- </div>
+ @include('parts.spendenaufruf')
@endif
@if($metager->hasProducts())
@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index 98ad96bde..254b04394 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -20,15 +20,7 @@
@endif
<div id="results">
@if(!$apiAuthorized && !$metager->validated && LaravelLocalization::getCurrentLocale() == "de" && strpos(url()->current(), '/beitritt') === false && strpos(url()->current(), '/spendenaufruf') === false)
- <div id="spendenaufruf" style="margin-bottom: 10px">
- <a href="/spendenaufruf" target="_blank" style="
- background-color: white;
- display: inline-block;
- width: 100%;
- ">
- <img src="/img/aufruf.png" alt="Spendenaufruf SuMa eV" width="100%">
- </a>
- </div>
+ @include('parts.spendenaufruf')
@endif
{{-- Show initial products or a
@if($metager->hasProducts())
diff --git a/resources/views/parts/spendenaufruf.blade.php b/resources/views/parts/spendenaufruf.blade.php
new file mode 100644
index 000000000..12d0eca7c
--- /dev/null
+++ b/resources/views/parts/spendenaufruf.blade.php
@@ -0,0 +1,5 @@
+<div id="spendenaufruf">
+ <a href="/spendenaufruf" target="_blank">
+ <img src="/img/aufruf.png" alt="Spendenaufruf SuMa eV" width="100%">
+ </a>
+</div>
\ No newline at end of file
--
GitLab