diff --git a/public/css/style.css b/public/css/style.css
index 4ef7e5d0d45b8ccf314d298960993c9fc9722377..3fbf1e9b6b8b957bde428eeb6d90f214d499be68 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -348,4 +348,9 @@ header ul li{
background-color: white;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0,0,0,0.3); -moz-box-shadow: 1px 1px 3px 1px rgba(0,0,0,0.3); box-shadow: 1px 1px 3px 1px rgba(0,0,0,0.3);
-}
\ No newline at end of file
+}
+
+
+
+
+
diff --git a/public/img/aufruf.png b/public/img/aufruf.png
index e29f8b02dcdf4d67773495c8bd90b1459cb4b1d4..fc0443ff91146f0368ba0265bf40e7a9d60e3649 100644
Binary files a/public/img/aufruf.png and b/public/img/aufruf.png differ
diff --git a/public/js/scriptResultPage.js b/public/js/scriptResultPage.js
index 9af84b26388b5de2261afaf7827ec0f3b31731c6..bae64e8e5cedae5ab68f5bd28072716fe61d8ddf 100644
--- a/public/js/scriptResultPage.js
+++ b/public/js/scriptResultPage.js
@@ -1,18 +1,7 @@
$(document).ready(function(){
- if( top != self ){
- postSize($(document).height());
- }
getDocumentReadyForUse();
});
-function postSize(height){
- var target = parent.postMessage ? parent : (parent.document.postMessage ? parent.document : undefined);
-
- if(typeof target != "undefined" && document.body.scrollHeight){
- target.postMessage(height, "*");
- }
-}
-
function tabs(){
//return;
$("#foki a").each(function(){
@@ -54,7 +43,7 @@ function theme(){
localStorage.removeItem("theme");
}else{
theme = theme.split(",");
- $($("head link")[2]).attr("href", "/css/theme.css.php?r=" + theme[0] + "&g=" + theme[1] + "&b=" + theme[2] + "&a=" + theme[3]);
+ $("#theme").attr("href", "/css/theme.css.php?r=" + theme[0] + "&g=" + theme[1] + "&b=" + theme[2] + "&a=" + theme[3]);
}
}
}
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 2ee981228f3eade5de98c12478c2672d48079357..d1955939fca08c7b1e06300e22c8726d41634680 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -31,6 +31,7 @@
</ul>
</nav>
</header>
+
<ul class="nav nav-tabs" id="foki" role="tablist">
@if( $metager->getFokus() === "web" )
<li id="webTabSelector" role="presentation" data-loaded="1" class="active">
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 581c107c390b3d8c049bd542cdc09d2037e3d948..cb5fe241cf9b28ab5a7a2294fc7d42b31e20e0fa 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -8,7 +8,7 @@
@if( isset($mobile) && $mobile )
<link href="/css/styleResultPageMobile.css" rel="stylesheet" />
@endif
- <link href="/css/theme.css.php" rel="stylesheet" />
+ <link id="theme" href="/css/theme.css.php" rel="stylesheet" />
<link href="/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
@@ -21,7 +21,7 @@
@include('layouts.researchandtabs')
@else
<div class="tab-content container-fluid">
- @yield('results')
+ @yield('results')
</div>
@endif
<footer>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 8c1b6b5decac49ced4f20a89919e4e7421f6768e..68c23951abef8862f89667bf6ea18455fa9d4f4a 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -23,7 +23,7 @@
<body>
<header>
<nav class="navbar navbar-default">
- <div class="container">
+ <div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
<span class="sr-only">{{ trans('staticPages.navigationToggle') }}</span>
@@ -31,10 +31,9 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- </div>
- <div>
@yield('homeIcon')
</div>
+
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
@@ -87,10 +86,10 @@
</nav>
</header>
<div class="wrapper">
- <div class="mg-panel container" style="margin-bottom:20px;text-align:center;padding:0px;width:50%;margin-top:0px">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}">
- <img src="/img/aufruf.png" style="width:100%;">
- </a>
+ <div class="mg-panel container" id="spendenaufruf" style="margin-bottom:20px;max-height:126px;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>
<main class="mg-panel container">
@if (isset($success))
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index b169b36fdd325ffb7a80a91543383df2f57d8e96..33e902eddb3f0643390b4995ca8046f6e1cffa1b 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -24,6 +24,11 @@
@else
<div class="col-xs-12 col-md-12 resultContainer">
@endif
+ <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>
{{-- 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 c0ba4a325ecbc06bafd1632a8ef78a69b468d80b..38970c170350fe35652094f6e4bc74b3e23759cc 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -19,6 +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>
<div id="container">
@foreach($metager->getResults()->items() as $result)
<div class="item">
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
index 2585b868bb521acee653b3296d4e64d8ba0e1288..06ce78ae37cee9637be8051f0e61f1b4379af1be 100644
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -4,14 +4,7 @@
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/css/quicktips.css" />
</head>
- <body>
- <div class="quicktip aufruf bg-danger">
- <h1>MetaGer sagt <i>Danke</i></h1>
- Vielen Dank für mehr als 20 Jahre Unterstützung.
- <br>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}" class="btn btn-sm btn-danger" style="margin-top:5px;" target="_blank">Lesen Sie den Spendenaufruf</a>
- </div>
-
+ <body>
@if( $spruch !== "" )
<blockquote id="spruch">{!! $spruch !!}</blockquote>
@endif
diff --git a/resources/views/spende/spendenaufruf.blade.php b/resources/views/spende/spendenaufruf.blade.php
index 70471c311ea86dcfe7bebe5fd6be1df4444dc517..26b17e8373b65cb261e1534c07597dc92dad5a54 100644
--- a/resources/views/spende/spendenaufruf.blade.php
+++ b/resources/views/spende/spendenaufruf.blade.php
@@ -124,6 +124,26 @@ im Internet weiter entwickelt und betrieben werden kann:
</form>
<p>{{ trans('spenden.lastschrift.10') }}</p>
</div>
+ <div class="col-md-6">
+ <h2 id="mails">Aus den EMails vorheriger Spender:</h2>
+ <ul style="text-align:left; list-style-type: initial;">
+ <li>"Danke, dass es metager gibt."</li>
+ <li>"Ich (85J.) möchte für Ihre aufwändige Arbeit 200 Euro spenden. Bleibt stark gegen die Kraken."</li>
+ <li>"Ihre Arbeit halte ich für sehr wertvoll"</li>
+ <li>"Danke für Ihre gute Arbeit!"</li>
+ <li>"Super das neue MetaGer!"</li>
+ <li>"Suchmaschine wie von Ihnen entwickelt und betrieben ist sehr begrüßenswert. Meine Spende dazu"</li>
+ <li>"Als kleinen Beitrag für Ihre große und großartige Arbeit spende ich"</li>
+ <li>"Bitte buchen Sie 100,-EUR für Ihre gute Arbeit ab."</li>
+ <li>"Gerade in der heutigen Zeit braucht es eine Suchmaschine aus sicherer Hand und guten Absichten."</li>
+ <li>"Ihre Arbeit ist Spitze. Deshalb möchte Ihr Projekt fördern."</li>
+ <li>"Ich verwende schon seit Jahren Metager und danke mit einer Spende"</li>
+ <li>"MetaGer ist Spitze! Ich spende"</li>
+ <li>"Armer Rentner spendet gerne 5,00 Euro"</li>
+ <li>"Ich verwende fast nur noch die MetaGer-Suche und bin damit sehr zufrieden"</li>
+ <li>"Danke für euer Werk!"</li>
+ </ul>
+ </div>
</div>
<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">