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

Merge branch...

Merge branch '151-spendenaufruf-sollte-in-der-englischen-version-nicht-angezeigt-werden' into 'development'

Spendenaufruf aus der englischen Version entfernt

Closes #151

See merge request !200
parents 5dd25cf6 8e430a9a
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
...@@ -343,6 +343,7 @@ header ul li{ ...@@ -343,6 +343,7 @@ header ul li{
.mg-panel { .mg-panel {
margin: 0 auto; margin: 0 auto;
margin-top:7%;
padding: 10px 20px; padding: 10px 20px;
margin-bottom: 0; margin-bottom: 0;
background-color: white; background-color: white;
......
...@@ -88,11 +88,13 @@ ...@@ -88,11 +88,13 @@
</nav> </nav>
</header> </header>
<div class="wrapper"> <div class="wrapper">
<div class="mg-panel container" id="spendenaufruf" style="margin-bottom:20px;max-height:126px;text-align:center;padding:0px;margin-top:0px"> @if( App::isLocale('de') )
<div class="mg-panel container" id="spendenaufruf" style="margin-bottom:-6%;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="max-width:100%;max-height:126px;"> <img src="/img/aufruf.png" style="max-width:100%;max-height:126px;">
</a> </a>
</div> </div>
@endif
<main class="mg-panel container"> <main class="mg-panel container">
@if (isset($success)) @if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div> <div class="alert alert-success" role="alert">{{ $success }}</div>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
@else @else
<div class="col-xs-12 col-md-12 resultContainer"> <div class="col-xs-12 col-md-12 resultContainer">
@endif @endif
@if( !$metager->validated) @if( !$metager->validated && App::isLocale('de') )
<div class="mg-panel container" style="margin-bottom:20px;max-height:90px;text-align:left; max-width:100%; padding:0px;margin-top:0px"> <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"> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}" target="_blank">
<img src="/img/aufruf.png" style="max-width:100%;max-height:90px;"> <img src="/img/aufruf.png" style="max-width:100%;max-height:90px;">
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</ul> </ul>
</div> </div>
@endif @endif
@if( !$metager->validated) @if( !$metager->validated && App::isLocale('de') )
<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"> <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") }}"> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}">
<img src="/img/aufruf.png" style="max-width:100%;max-height:126px;"> <img src="/img/aufruf.png" style="max-width:100%;max-height:126px;">
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</ul> </ul>
</div> </div>
@endif @endif
@if( !$metager->validated) @if( !$metager->validated && App::isLocale('de') )
<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"> <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") }}"> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}">
<img src="/img/aufruf.png" style="max-width:100%;max-height:126px;"> <img src="/img/aufruf.png" style="max-width:100%;max-height:126px;">
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
@endif @endif
<div class="col-xs-12 col-md-8"> <div class="col-xs-12 col-md-8">
@if( !$metager->validated) @if( !$metager->validated && App::isLocale('de') )
<div class="mg-panel container" style="margin-bottom:20px;max-height:90px;text-align:left; max-width:100%; padding:0px;margin-top:0px"> <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"> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spendenaufruf") }}" target="_blank">
<img src="/img/aufruf.png" style="max-width:100%;max-height:90px;"> <img src="/img/aufruf.png" style="max-width:100%;max-height:90px;">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment