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

Auswahl der ersten 3 Settings Punkte jetzt über Dropdown

parent bb899223
No related branches found
No related tags found
3 merge requests!619Development,!582Resolve "Settings Maps ausschaltbar machen",!567Resolve "Settings Maps ausschaltbar machen"
Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 64 deletions
app/MetaGer.php
+ 13
− 15
View file @ f7ff60f7
...@@ -45,6 +45,7 @@ class MetaGer ...@@ -45,6 +45,7 @@ class MetaGer
protected $resultCount; protected $resultCount;
protected $sprueche; protected $sprueche;
protected $maps; protected $maps;
protected $newtab;
protected $domainsBlacklisted = []; protected $domainsBlacklisted = [];
protected $urlsBlacklisted = []; protected $urlsBlacklisted = [];
protected $url; protected $url;
...@@ -875,18 +876,24 @@ class MetaGer ...@@ -875,18 +876,24 @@ class MetaGer
$this->agent = new Agent(); $this->agent = new Agent();
$this->mobile = $this->agent->isMobile(); $this->mobile = $this->agent->isMobile();
# Sprüche # Sprüche
$this->sprueche = $request->input('sprueche', 'off'); $this->sprueche = $request->input('sprueche', 'on');
if ($this->sprueche === "off") { if ($this->sprueche === "on") {
$this->sprueche = true; $this->sprueche = true;
} else { } else {
$this->sprueche = false; $this->sprueche = false;
} }
$this->maps = $request->input('maps', 'off'); $this->maps = $request->input('maps', 'on');
if ($this->maps === "off") { if ($this->maps === "on") {
$this->maps = true; $this->maps = true;
} else { } else {
$this->maps = false; $this->maps = false;
} }
$this->newtab = $request->input('newtab', 'off');
if ($this->newtab === "on") {
$this->newtab = "_blank";
} else {
$this->newtab = "_self";
}
# 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:
...@@ -919,15 +926,6 @@ class MetaGer ...@@ -919,15 +926,6 @@ class MetaGer
$this->time = 5000; $this->time = 5000;
$this->cache = "cache"; $this->cache = "cache";
} }
if ($request->has('tab')) {
if ($request->input('tab') === "off") {
$this->tab = "_blank";
} else {
$this->tab = "_self";
}
} else {
$this->tab = "_blank";
}
if ($request->has('password')) { if ($request->has('password')) {
$this->password = $request->input('password'); $this->password = $request->input('password');
} }
...@@ -1259,9 +1257,9 @@ class MetaGer ...@@ -1259,9 +1257,9 @@ class MetaGer
return $this->site; return $this->site;
} }
public function getTab() public function getNewtab()
{ {
return $this->tab; return $this->newtab;
} }
public function getResults() public function getResults()
......
resources/lang/de/settings.php
+ 11
− 3
View file @ f7ff60f7
...@@ -5,9 +5,17 @@ return [ ...@@ -5,9 +5,17 @@ return [
'head.2' => 'Hier können Sie Ihr MetaGer anpassen: Nach Anklicken Ihrer gewünschten Einstellungen müssen Sie <a href="#unten">unten auf dieser Seite</a> wählen, ob Sie die Einstellungen dauerhaft speichern, oder nur einmalig setzen wollen.', 'head.2' => 'Hier können Sie Ihr MetaGer anpassen: Nach Anklicken Ihrer gewünschten Einstellungen müssen Sie <a href="#unten">unten auf dieser Seite</a> wählen, ob Sie die Einstellungen dauerhaft speichern, oder nur einmalig setzen wollen.',
'allgemein.1' => 'Allgemein', 'allgemein.1' => 'Allgemein',
'allgemein.2' => 'Sprüche ausblenden',
'allgemein.3' => 'Maps ausblenden', 'allgemein.2.1' => 'Sprüche',
'allgemein.4' => 'Links im gleichen Tab öffnen', 'allgemein.2.2' => 'anzeigen',
'allgemein.2.3' => 'nicht anzeigen',
'allgemein.3.1' => 'Maps',
'allgemein.3.2' => 'anzeigen',
'allgemein.3.3' => 'nicht anzeigen',
'allgemein.4.1' => 'Ergebnisse öffnen:',
'allgemein.4.2' => 'In einem neuen Tab',
'allgemein.4.3' => 'Im gleichen Tab',
'allgemein.5' => 'Sprache auswählen:', 'allgemein.5' => 'Sprache auswählen:',
'allgemein.6' => 'Alle Sprachen', 'allgemein.6' => 'Alle Sprachen',
'allgemein.7' => 'Deutsch', 'allgemein.7' => 'Deutsch',
......
resources/lang/en/settings.php
+ 23
− 26
View file @ f7ff60f7
<?php <?php
return [ return [
"head.1" => "Settings", "head.1" => "Settings",
"head.2" => "Here you can customize your MetaGer: After selecting your desired settings, you have to choose, whether you want to save the settings permanently, or just for once, <a href=\"#unten\">on the bottom of this page.</a>", "head.2" => "Here you can customize your MetaGer: After selecting your desired settings, you have to choose, whether you want to save the settings permanently, or just for once, <a href=\"#unten\">on the bottom of this page.</a>",
"allgemein.1" => "General", "allgemein.1" => "General",
"allgemein.2" => "disable quotes", "allgemein.5" => "all languages",
"allgemein.3" => "open links in same tab", "allgemein.6" => "german",
"allgemein.4" => "select language:", "allgemein.6_1" => "english",
"allgemein.5" => "all languages", "allgemein.7" => "number of results per page:",
"allgemein.6" => "german", "allgemein.8" => "all",
"allgemein.6_1" => "english", "zeit.1" => "maximum search time",
"allgemein.7" => "number of results per page:", "zeit.2" => "1 second (standard)",
"allgemein.8" => "all", "zeit.3" => "2 seconds",
"zeit.1" => "maximum search time", "zeit.4" => "5 seconds",
"zeit.2" => "1 second (standard)", "zeit.5" => "10 seconds",
"zeit.3" => "2 seconds", "zeit.6" => "20 seconds",
"zeit.4" => "5 seconds", "suchmaschinen.1" => "search engines",
"zeit.5" => "10 seconds", "suchmaschinen.2" => "(deselect all)",
"zeit.6" => "20 seconds", "suchmaschinen.3" => "(select / deselect all)",
"suchmaschinen.1" => "search engines", "speichern.1" => "Create a startpage for one-time use",
"suchmaschinen.2" => "(deselect all)", "speichern.2" => "Save settings permanently",
"suchmaschinen.3" => "(select / deselect all)", "speichern.3" => "Generate plugin with these settings",
"speichern.1" => "Create a startpage for one-time use", "speichern.4" => "Reset saved settings",
"speichern.2" => "Save settings permanently", "request" => "Which method should query MetaGer (GET, POST)?",
"speichern.3" => "Generate plugin with these settings", ];
"speichern.4" => "Reset saved settings",
"request" => "Which method should query MetaGer (GET, POST)?"
];
\ No newline at end of file
resources/views/layouts/ad.blade.php
+ 2
− 2
View file @ f7ff60f7
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="number col-sm-1"></div> <div class="number col-sm-1"></div>
<div class="resultInformation col-sm-10"> <div class="resultInformation col-sm-10">
<p class="title"> <p class="title">
<a class="title" href="{{ $ad['link'] }}" target="{{ $metager->getTab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0"> <a class="title" href="{{ $ad['link'] }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0">
{{ $ad['titel'] }} {{ $ad['titel'] }}
</a> </a>
</p> </p>
<p class="link"> <p class="link">
<a href="{{ $ad['link'] }}" target="{{ $metager->getTab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0"> <a href="{{ $ad['link'] }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0">
{{ $ad['anzeigeLink'] }} {{ $ad['anzeigeLink'] }}
</a> </a>
<span class="hoster"> <span class="hoster">
......
resources/views/layouts/result.blade.php
+ 5
− 5
View file @ f7ff60f7
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<div class="resultInformation col-xs-12 col-sm-11"> <div class="resultInformation col-xs-12 col-sm-11">
<div class="col-xs-10 col-sm-11" style="padding:0; "> <div class="col-xs-10 col-sm-11" style="padding:0; ">
<p class="title"> <p class="title">
<a class="title" href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener"> <a class="title" href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
{{ $result->titel }} {{ $result->titel }}
</a> </a>
</p> </p>
<div class="link"> <div class="link">
<div> <div>
<div class="link-link"> <div class="link-link">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener"> <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
{{ $result->anzeigeLink }} {{ $result->anzeigeLink }}
</a> </a>
</div> </div>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
</span> </span>
@endif @endif
<a class="proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übetragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="{{ $result->proxyLink }}" target="{{ $metager->getTab() }}" rel="noopener"> <a class="proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übetragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
<img src="/img/proxyicon.png" alt="" /> <img src="/img/proxyicon.png" alt="" />
{!! trans('result.options.5') !!} {!! trans('result.options.5') !!}
</a> </a>
...@@ -62,14 +62,14 @@ ...@@ -62,14 +62,14 @@
</div> </div>
@if( isset($result->logo) ) @if( isset($result->logo) )
<div class="col-xs-2 col-sm-1" style="padding: 0;"> <div class="col-xs-2 col-sm-1" style="padding: 0;">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}"> <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
<img src="{{ $metager->getImageProxyLink($result->logo) }}" alt="" /> <img src="{{ $metager->getImageProxyLink($result->logo) }}" alt="" />
</a> </a>
</div> </div>
@endif @endif
@if( $result->image !== "" ) @if( $result->image !== "" )
<div class="description"> <div class="description">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener"> <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
<img src="{{ $metager->getImageProxyLink($result->image) }}" align="left" width="120px" height="60px" alt="" /> <img src="{{ $metager->getImageProxyLink($result->image) }}" align="left" width="120px" height="60px" alt="" />
</a> </a>
{!! $result->descr !!} {!! $result->descr !!}
......
resources/views/metager3bilder.blade.php
+ 1
− 1
View file @ f7ff60f7
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
@foreach($metager->getResults() as $result) @foreach($metager->getResults() as $result)
<div class="item"> <div class="item">
<div class="img"> <div class="img">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a> <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a>
<span class="label label-default hostlabel">{!! $result->gefVon !!}</span> <span class="label label-default hostlabel">{!! $result->gefVon !!}</span>
</div> </div>
</div> </div>
......
resources/views/metager3bilderresults.blade.php
+ 1
− 1
View file @ f7ff60f7
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
@foreach($metager->getResults() as $result) @foreach($metager->getResults() as $result)
<div class="item"> <div class="item">
<div class="img"> <div class="img">
<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a> <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a>
<span class="label label-default hostlabel">{{ strip_tags($result->gefVon) }}</span> <span class="label label-default hostlabel">{{ strip_tags($result->gefVon) }}</span>
</div> </div>
</div> </div>
......
resources/views/settings.blade.php
+ 17
− 11
View file @ f7ff60f7
...@@ -8,27 +8,33 @@ ...@@ -8,27 +8,33 @@
<p id="lead">{!! trans('settings.head.2') !!}</p> <p id="lead">{!! trans('settings.head.2') !!}</p>
<h2>{!! trans('settings.allgemein.1') !!}</h2> <h2>{!! trans('settings.allgemein.1') !!}</h2>
<input type="hidden" name="focus" value="angepasst"> <input type="hidden" name="focus" value="angepasst">
<div class="checkbox settings-checkbox"> <label class="select-label">@lang("settings.allgemein.2.1")</label>
<label><input type="checkbox" name="param_sprueche">{!! trans('settings.allgemein.2') !!}</label> <select class="form-control settings-form-control" name="param_sprueche">
</div> <option value="on" selected>@lang("settings.allgemein.2.2")</option>
<div class="checkbox settings-checkbox"> <option value="off">@lang("settings.allgemein.2.3")</option>
<label><input type="checkbox" name="param_maps">{!! trans('settings.allgemein.3') !!}</label> </select><label class="select-label">@lang("settings.allgemein.3.1")</label>
</div> <select class="form-control settings-form-control" name="param_maps">
<div class="checkbox settings-checkbox"> <option value="on" selected>@lang("settings.allgemein.3.2")</option>
<label><input type="checkbox" name="param_tab">{!! trans('settings.allgemein.4') !!}</label> <option value="off">@lang("settings.allgemein.3.3")</option>
</div> </select><label class="select-label">@lang("settings.allgemein.4.1")</label>
<select class="form-control settings-form-control" name="param_newtab">
<option value="on">@lang("settings.allgemein.4.2")</option>
<option value="off" selected>@lang("settings.allgemein.4.3")</option>
</select>
<label class="select-label">{!! trans('settings.allgemein.5') !!}</label> <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.6') !!}</option> <option value="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.allgemein.6') !!}</option>
<option value="de">{!! trans('settings.allgemein.7') !!}</option> <option value="de">{!! trans('settings.allgemein.7') !!}</option>
<option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.8') !!}</option></select> <option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.8') !!}</option>
</select>
<label class="select-label">{!! trans('settings.allgemein.9') !!}</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.10') !!}</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.
Finish editing this message first!
Please register or to comment