Skip to content
Snippets Groups Projects
Commit 58e39718 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

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

Spendenaufruf Layout verbessert

Closes #126

See merge request !154
parents b19c211a 767c2253
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 30 deletions
public/css/style.css
+ 6
− 1
View file @ 58e39718
...@@ -348,4 +348,9 @@ header ul li{ ...@@ -348,4 +348,9 @@ header ul li{
background-color: white; 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); -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
public/img/aufruf.png
+ 0
− 0
View replaced file @ b19c211a View file @ 58e39718
public/img/aufruf.png

129 KiB | W: | H:

public/img/aufruf.png

160 KiB | W: | H:

public/img/aufruf.png
public/img/aufruf.png
public/img/aufruf.png
public/img/aufruf.png
  • 2-up
  • Swipe
  • Onion skin
public/js/scriptResultPage.js
+ 1
− 12
View file @ 58e39718
$(document).ready(function(){ $(document).ready(function(){
if( top != self ){
postSize($(document).height());
}
getDocumentReadyForUse(); 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(){ function tabs(){
//return; //return;
$("#foki a").each(function(){ $("#foki a").each(function(){
...@@ -54,7 +43,7 @@ function theme(){ ...@@ -54,7 +43,7 @@ function theme(){
localStorage.removeItem("theme"); localStorage.removeItem("theme");
}else{ }else{
theme = theme.split(","); 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]);
} }
} }
} }
......
resources/views/layouts/researchandtabs.blade.php
+ 1
− 0
View file @ 58e39718
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
</ul> </ul>
</nav> </nav>
</header> </header>
<ul class="nav nav-tabs" id="foki" role="tablist"> <ul class="nav nav-tabs" id="foki" role="tablist">
@if( $metager->getFokus() === "web" ) @if( $metager->getFokus() === "web" )
<li id="webTabSelector" role="presentation" data-loaded="1" class="active"> <li id="webTabSelector" role="presentation" data-loaded="1" class="active">
......
resources/views/layouts/resultPage.blade.php
+ 2
− 2
View file @ 58e39718
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@if( isset($mobile) && $mobile ) @if( isset($mobile) && $mobile )
<link href="/css/styleResultPageMobile.css" rel="stylesheet" /> <link href="/css/styleResultPageMobile.css" rel="stylesheet" />
@endif @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="icon" type="image/x-icon" />
<link href="/favicon.ico" rel="shortcut 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" /> <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
@include('layouts.researchandtabs') @include('layouts.researchandtabs')
@else @else
<div class="tab-content container-fluid"> <div class="tab-content container-fluid">
@yield('results') @yield('results')
</div> </div>
@endif @endif
<footer> <footer>
......
resources/views/layouts/staticPages.blade.php
+ 6
− 7
View file @ 58e39718
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<body> <body>
<header> <header>
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"> <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> <span class="sr-only">{{ trans('staticPages.navigationToggle') }}</span>
...@@ -31,10 +31,9 @@ ...@@ -31,10 +31,9 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
</div>
<div>
@yield('homeIcon') @yield('homeIcon')
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse"> <div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif > <li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
...@@ -87,10 +86,10 @@ ...@@ -87,10 +86,10 @@
</nav> </nav>
</header> </header>
<div class="wrapper"> <div class="wrapper">
<div class="mg-panel container" style="margin-bottom:20px;text-align:center;padding:0px;width:50%;margin-top:0px"> <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") }}"> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}">
<img src="/img/aufruf.png" style="width:100%;"> <img src="/img/aufruf.png" style="max-width:100%;max-height:126px;">
</a> </a>
</div> </div>
<main class="mg-panel container"> <main class="mg-panel container">
@if (isset($success)) @if (isset($success))
......
resources/views/metager3.blade.php
+ 5
− 0
View file @ 58e39718
...@@ -24,6 +24,11 @@ ...@@ -24,6 +24,11 @@
@else @else
<div class="col-xs-12 col-md-12 resultContainer"> <div class="col-xs-12 col-md-12 resultContainer">
@endif @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 --}} {{-- 3-Mal Werbung --}}
@for($i = 0; $i <= 2; $i++) @for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
......
resources/views/metager3bilder.blade.php
+ 7
− 0
View file @ 58e39718
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
</ul> </ul>
</div> </div>
@endif @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"> <div id="container">
@foreach($metager->getResults()->items() as $result) @foreach($metager->getResults()->items() as $result)
<div class="item"> <div class="item">
......
resources/views/quicktip.blade.php
+ 1
− 8
View file @ 58e39718
...@@ -4,14 +4,7 @@ ...@@ -4,14 +4,7 @@
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" /> <link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/css/quicktips.css" /> <link rel="stylesheet" type="text/css" href="/css/quicktips.css" />
</head> </head>
<body> <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>
@if( $spruch !== "" ) @if( $spruch !== "" )
<blockquote id="spruch">{!! $spruch !!}</blockquote> <blockquote id="spruch">{!! $spruch !!}</blockquote>
@endif @endif
......
resources/views/spende/spendenaufruf.blade.php
+ 20
− 0
View file @ 58e39718
...@@ -124,6 +124,26 @@ im Internet weiter entwickelt und betrieben werden kann: ...@@ -124,6 +124,26 @@ im Internet weiter entwickelt und betrieben werden kann:
</form> </form>
<p>{{ trans('spenden.lastschrift.10') }}</p> <p>{{ trans('spenden.lastschrift.10') }}</p>
</div> </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>
<div id="left" class="col-lg-6 col-md-12 col-sm-12 others"> <div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment