Commit fe83a2e1 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '89-quelle-fur-suchergebnisse-nominatim-von-openstreetmap' into 'development'

Resolve "Quelle für Suchergebnisse: Nominatim von OpenStreetMap"

Closes #89

See merge request !528
parents 727cc257 a042cf48
......@@ -3581,7 +3581,8 @@ return(65535&d)<<16|65535&c},C=function(a,b,c,d){var e=(65535&a)+(65535&b)+(6553
$(document).ready(function() {
getDocumentReadyForUse($("#foki > li.active > a").attr("aria-controls"));
$('iframe').iFrameResize({
'autoResize': false
'autoResize': true,
'heightCalculationMethod': 'documentElementScroll'
});
botProtection();
});
......
This diff is collapsed.
$(document).ready(function() {
getDocumentReadyForUse($("#foki > li.active > a").attr("aria-controls"));
$('iframe').iFrameResize({
'autoResize': false
'autoResize': true,
'heightCalculationMethod': 'documentElementScroll'
});
botProtection();
});
......
......@@ -149,7 +149,7 @@
<label id="anpassen-label" for="angepasst">
<span class="glyphicon glyphicon-cog"></span>
<span class="content">
<a class="mutelink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/settings") }}">
<a class="mutelink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
@if ($focus === 'angepasst')
{{ trans('index.foki.angepasst') }}
@else
......
......@@ -32,6 +32,12 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="https://maps.metager.de/?q={{ $metager->getQ() }}&controls=false&limit=3" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
......
......@@ -25,6 +25,12 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="https://maps.metager.de/?q={{ $metager->getQ() }}&controls=false&limit=3" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
......
Markdown is supported
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