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

Merge branch '603-direkte-maps-integration-aus-metager-entfernen' into 'development'

Resolve "Direkte Maps integration aus MetaGer entfernen."

Closes #603

See merge request !1071
parents e63a7f42 9cfc8a47
No related branches found
No related tags found
3 merge requests!1117Development,!1082Development,!1071Resolve "Direkte Maps integration aus MetaGer entfernen."
...@@ -7,9 +7,6 @@ return [ ...@@ -7,9 +7,6 @@ return [
"quotes.label" => "Sprüche", "quotes.label" => "Sprüche",
"quotes.on" => "anzeigen", "quotes.on" => "anzeigen",
"quotes.off" => "nicht anzeigen", "quotes.off" => "nicht anzeigen",
"maps.label" => "Maps",
"maps.on" => "anzeigen",
"maps.off" => "nicht anzeigen",
"tab.label" => "Ergebnisse öffnen:", "tab.label" => "Ergebnisse öffnen:",
"tab.new" => "In einem neuen Tab", "tab.new" => "In einem neuen Tab",
"tab.same" => "Im gleichen Tab", "tab.same" => "Im gleichen Tab",
......
...@@ -34,14 +34,6 @@ ...@@ -34,14 +34,6 @@
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
@endfor @endfor
@endif @endif
@if($metager->getMaps())
<div class="result row" id="map">
<div class="number col-sm-1 hidden-xs"></div>
<div class="resultInformation col-xs-12 col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@endif
@foreach($metager->getResults() as $result) @foreach($metager->getResults() as $result)
@if($result->number % 7 === 0) @if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
......
...@@ -26,14 +26,6 @@ ...@@ -26,14 +26,6 @@
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
@endfor @endfor
@endif @endif
@if($metager->getMaps())
<div class="result row" id="map">
<div class="number col-sm-1 hidden-xs"></div>
<div class="resultInformation col-xs-12 col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@endif
@foreach($metager->getResults() as $result) @foreach($metager->getResults() as $result)
@if($result->number % 7 === 0) @if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
......
...@@ -16,13 +16,6 @@ ...@@ -16,13 +16,6 @@
<option value="off">@lang("settings.quotes.off")</option> <option value="off">@lang("settings.quotes.off")</option>
</select> </select>
</div> </div>
<div class="col-sm-6 col-md-4 col-lg-3">
<label class="select-label">@lang("settings.maps.label")</label>
<select class="form-control settings-form-control" name="param_maps">
<option value="on" selected>@lang("settings.maps.on")</option>
<option value="off">@lang("settings.maps.off")</option>
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3"> <div class="col-sm-6 col-md-4 col-lg-3">
<label class="select-label">@lang("settings.tab.label")</label> <label class="select-label">@lang("settings.tab.label")</label>
<select class="form-control settings-form-control" name="param_newtab"> <select class="form-control settings-form-control" name="param_newtab">
......
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