Skip to content

GitLab

Commit 5a0258b8 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Erste IFrame Version der Karten eingebaut.

parent 6e2f7a03
Hide whitespace changes
Inline Side-by-side
resources/views/metager3.blade.php
View file @ 5a0258b8
......@@ -32,15 +32,12 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
<<<<<<< HEAD
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="http://192.168.178.30:8000/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
=======
>>>>>>> development
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
......
resources/views/metager3results.blade.php
View file @ 5a0258b8
......@@ -25,15 +25,12 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
<<<<<<< HEAD
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="http://192.168.178.30:8000/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
=======
>>>>>>> development
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
......
Supports Markdown
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