Skip to content
Snippets Groups Projects
Commit bb899223 authored by Karl's avatar Karl
Browse files

Maps lassen sich in den Settings ausstellen

parent df4da43e
Branches
No related tags found
3 merge requests!619Development,!582Resolve "Settings Maps ausschaltbar machen",!567Resolve "Settings Maps ausschaltbar machen"
Show whitespace changes
Inline Side-by-side
app/MetaGer.php
+ 12
− 0
View file @ bb899223
...@@ -44,6 +44,7 @@ class MetaGer ...@@ -44,6 +44,7 @@ class MetaGer
protected $mobile; protected $mobile;
protected $resultCount; protected $resultCount;
protected $sprueche; protected $sprueche;
protected $maps;
protected $domainsBlacklisted = []; protected $domainsBlacklisted = [];
protected $urlsBlacklisted = []; protected $urlsBlacklisted = [];
protected $url; protected $url;
...@@ -880,6 +881,12 @@ class MetaGer ...@@ -880,6 +881,12 @@ class MetaGer
} else { } else {
$this->sprueche = false; $this->sprueche = false;
} }
$this->maps = $request->input('maps', 'off');
if ($this->maps === "off") {
$this->maps = true;
} else {
$this->maps = false;
}
# Theme # Theme
$this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'default')); $this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'default'));
# Ergebnisse pro Seite: # Ergebnisse pro Seite:
...@@ -1306,6 +1313,11 @@ class MetaGer ...@@ -1306,6 +1313,11 @@ class MetaGer
return $this->sprueche; return $this->sprueche;
} }
public function getMaps()
{
return $this->maps;
}
public function getCategory() public function getCategory()
{ {
return $this->category; return $this->category;
......
resources/lang/de/settings.php
+ 8
− 7
View file @ bb899223
...@@ -6,13 +6,14 @@ return [ ...@@ -6,13 +6,14 @@ return [
'allgemein.1' => 'Allgemein', 'allgemein.1' => 'Allgemein',
'allgemein.2' => 'Sprüche ausblenden', 'allgemein.2' => 'Sprüche ausblenden',
'allgemein.3' => 'Links im gleichen Tab öffnen', 'allgemein.3' => 'Maps ausblenden',
'allgemein.4' => 'Sprache auswählen:', 'allgemein.4' => 'Links im gleichen Tab öffnen',
'allgemein.5' => 'Alle Sprachen', 'allgemein.5' => 'Sprache auswählen:',
'allgemein.6' => 'Deutsch', 'allgemein.6' => 'Alle Sprachen',
'allgemein.6_1' => 'Englisch', 'allgemein.7' => 'Deutsch',
'allgemein.7' => 'Anzahl der Ergebnisse pro Seite:', 'allgemein.8' => 'Englisch',
'allgemein.8' => 'Alle', 'allgemein.9' => 'Anzahl der Ergebnisse pro Seite:',
'allgemein.10' => 'Alle',
'zeit.1' => 'Maximale Suchzeit', 'zeit.1' => 'Maximale Suchzeit',
'zeit.2' => '1 Sekunde (Standard)', 'zeit.2' => '1 Sekunde (Standard)',
......
resources/views/metager3.blade.php
+ 2
− 0
View file @ bb899223
...@@ -32,12 +32,14 @@ ...@@ -32,12 +32,14 @@
@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="result row" id="map">
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
<div class="col-sm-11"> <div class="col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe> <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div> </div>
</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()])
......
resources/views/metager3results.blade.php
+ 2
− 0
View file @ bb899223
...@@ -25,12 +25,14 @@ ...@@ -25,12 +25,14 @@
@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="result row" id="map">
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
<div class="col-sm-11"> <div class="col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe> <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div> </div>
</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()])
......
resources/views/settings.blade.php
+ 10
− 7
View file @ bb899223
...@@ -12,20 +12,23 @@ ...@@ -12,20 +12,23 @@
<label><input type="checkbox" name="param_sprueche">{!! trans('settings.allgemein.2') !!}</label> <label><input type="checkbox" name="param_sprueche">{!! trans('settings.allgemein.2') !!}</label>
</div> </div>
<div class="checkbox settings-checkbox"> <div class="checkbox settings-checkbox">
<label><input type="checkbox" name="param_tab">{!! trans('settings.allgemein.3') !!}</label> <label><input type="checkbox" name="param_maps">{!! trans('settings.allgemein.3') !!}</label>
</div> </div>
<label class="select-label">{!! trans('settings.allgemein.4') !!}</label> <div class="checkbox settings-checkbox">
<label><input type="checkbox" name="param_tab">{!! trans('settings.allgemein.4') !!}</label>
</div>
<label class="select-label">{!! trans('settings.allgemein.5') !!}</label>
<select class="form-control settings-form-control" name="param_lang"> <select class="form-control settings-form-control" name="param_lang">
<option value="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.allgemein.5') !!}</option> <option value="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.allgemein.6') !!}</option>
<option value="de">{!! trans('settings.allgemein.6') !!}</option> <option value="de">{!! trans('settings.allgemein.7') !!}</option>
<option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.6_1') !!}</option></select> <option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.8') !!}</option></select>
<label class="select-label">{!! trans('settings.allgemein.7') !!}</label> <label class="select-label">{!! trans('settings.allgemein.9') !!}</label>
<select class="form-control settings-form-control" name="param_resultCount"> <select class="form-control settings-form-control" name="param_resultCount">
<option value="10">10</option> <option value="10">10</option>
<option value="20" selected>20</option> <option value="20" selected>20</option>
<option value="50">50</option> <option value="50">50</option>
<option value="100">100</option> <option value="100">100</option>
<option value="0">{!! trans('settings.allgemein.8') !!}</option></select> <option value="0">{!! trans('settings.allgemein.10') !!}</option></select>
<label class="select-label">{!! trans('settings.zeit.1') !!}:</label> <label class="select-label">{!! trans('settings.zeit.1') !!}:</label>
<select class="form-control settings-form-control" name="param_time"> <select class="form-control settings-form-control" name="param_time">
<option value="1000" selected>{!! trans('settings.zeit.2') !!}</option> <option value="1000" selected>{!! trans('settings.zeit.2') !!}</option>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment