From 24a03b42fcf58e5c70c7771ac635f66ffaaf4e7b Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 17 Oct 2017 10:50:03 +0200
Subject: [PATCH] Merge branch
'603-direkte-maps-integration-aus-metager-entfernen' into 'development'
Resolve "Direkte Maps integration aus MetaGer entfernen."
Closes #603
See merge request open-source/MetaGer!1071
(cherry picked from commit 458c5421469c5cf95f84efdb193d3d84436cb1cd)
9cfc8a47 Removed the Maps IFrame from the results page and the maps setting from the settings page.
---
resources/lang/de/settings.php | 3 ---
resources/views/metager3.blade.php | 8 --------
resources/views/metager3results.blade.php | 8 --------
resources/views/settings.blade.php | 7 -------
4 files changed, 26 deletions(-)
diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index 620046d3d..467168e61 100644
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -7,9 +7,6 @@ return [
"quotes.label" => "Sprüche",
"quotes.on" => "anzeigen",
"quotes.off" => "nicht anzeigen",
- "maps.label" => "Maps",
- "maps.on" => "anzeigen",
- "maps.off" => "nicht anzeigen",
"tab.label" => "Ergebnisse öffnen:",
"tab.new" => "In einem neuen Tab",
"tab.same" => "Im gleichen Tab",
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index cd41558e1..3ffb3feb4 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -34,14 +34,6 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@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)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index a1f66a4e8..8dd47444f 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -26,14 +26,6 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@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)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 1bfa47e08..b2c8c24c8 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -16,13 +16,6 @@
<option value="off">@lang("settings.quotes.off")</option>
</select>
</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">
<label class="select-label">@lang("settings.tab.label")</label>
<select class="form-control settings-form-control" name="param_newtab">
--
GitLab