diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index cbb47ad124a78744f250814f922c1c9a5263f799..107246539467222596f5a091cecbeb80b0fcad97 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -15,6 +15,9 @@ class MetaGerSearch extends Controller
public function search(Request $request, MetaGer $metager, $timing = false)
{
+ if ($request->filled("chrome-plugin")) {
+ return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin"));
+ }
$timings = null;
if ($timing) {
$timings = ['starttime' => microtime(true)];
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 55364eb843c62393d056cc57409b1f20b6a8dd08..d38be544d90d51cdb86b1b06d9e010e43203914e 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -45,7 +45,7 @@ class StartpageController extends Controller
return view('index')
->with('title', trans('titles.index'))
->with('homeIcon')
- ->with('browser', (new Agent())->browser())
+ ->with('agent', new Agent())
->with('navbarFocus', 'suche')
->with('focus', $request->input('focus', 'web'))
->with('time', $request->input('param_time', '1500'))
diff --git a/browserstack.err b/browserstack.err
new file mode 100644
index 0000000000000000000000000000000000000000..a6e141486fb5e5d6d75f084eae3f379fd21e36c2
--- /dev/null
+++ b/browserstack.err
@@ -0,0 +1 @@
+[object Object]
\ No newline at end of file
diff --git a/resources/lang/de/plugin-page.php b/resources/lang/de/plugin-page.php
index 8890a276f35b1dbf93469b90bb89dbb0898a0053..92e9024bd338f1bc1ec3f21db2a9055c10c91256 100644
--- a/resources/lang/de/plugin-page.php
+++ b/resources/lang/de/plugin-page.php
@@ -82,4 +82,16 @@ return [
'vivaldi.8' => 'MetaGer als Startseite im :browser einrichten',
'vivaldi.9' => 'Klicken Sie in Ihrem Browser oben links auf das rote Vivaldi Logo und wählen Sie zuerst "Werkzeuge", dann im Untermenü "Einstellungen".',
'vivaldi.10' => 'Tragen Sie im Feld "Startseite" "https://metager.de" ein.',
+
+ 'mobileff.1' => 'Tippen Sie in Ihrem Browser unten rechts auf "<i class="fas fa-ellipsis-v"></i>" um das Browsermenü zu öffnen.',
+ 'mobileff.2' => 'Wählen Sie den Menüpunkt Einstellungen.',
+ 'mobileff.3' => 'In dem dann erscheinenden Menü wählen Sie in der Kategorie "Allgemein" den Menüpunkt "Suchen".',
+ 'mobileff.4' => 'Tippen Sie auf "+ Suchmaschine hinzufügen".',
+ 'mobileff.5' => 'Wählen Sie nun "Andere" aus. Tragen Sie darunter den Namen (MetaGer) und den Such-String ein (https://metager.de/meta/meta.ger3?eingabe=%s).',
+
+ 'mobilechr.1' => 'Tippen Sie in Ihrem Browser oben rechts auf "<i class="fas fa-ellipsis-v"></i>" um das Browsermenü zu öffnen.',
+ 'mobilechr.2' => 'Wählen Sie den Menüpunkt Einstellungen.',
+ 'mobilechr.3' => 'In dem dann erscheinenden Menü wählen Sie in der Kategorie "Grundeinstellungen" den Menüpunkt "Suchmaschine".',
+ 'mobilechr.4' => 'Tippen Sie in der Kategorie "Kürzlich besucht" auf MetaGer.',
+
];
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index fe90db69edee374bcda816a9d8f2c9efd9252b8e..d2cfdeac4fd63356aac14f25ed1681c6e8b3c8f1 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -13,7 +13,13 @@
<input type="hidden" name="key" value="{{ Request::input('key','') }}" form="searchForm">
@endif
<div id="plugin-btn-div">
+ @if($agent->isMobile() && $agent->browser() === "Chrome")
+ <input type="hidden" name="eingabe" value="chrome" />
+ <button type="submit" id="plugin-btn" form="searchForm" title="{{ trans('index.plugin-title') }}" name="chrome-plugin" value="true"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a>
+ @else
+
<a id="plugin-btn" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin") }}" title="{{ trans('index.plugin-title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a>
+ @endif
</div>
<div id="about-us">
<div class="m-row">
diff --git a/resources/views/parts/searchbar.blade.php b/resources/views/parts/searchbar.blade.php
index af89e43e96135a9399b113e1817861ac815fb7b6..b14b8918583f4582e8a0aa7da354acb1b99da10e 100644
--- a/resources/views/parts/searchbar.blade.php
+++ b/resources/views/parts/searchbar.blade.php
@@ -8,7 +8,7 @@
</a>
</div>
<div class="search-input">
- <input type="search" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if(\Request::is('/') && !\Request::filled('mgapp')) autofocus @endif autocomplete="off" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="0">
+ <input type="search" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" @if(\Request::is('/') && !\Request::filled('mgapp')) autofocus @endif autocomplete="off" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="0">
<button id="search-delete-btn" name="delete-search-input" type="button" tabindex="-1">
×
</button>
diff --git a/resources/views/plugin-page.blade.php b/resources/views/plugin-page.blade.php
index 61e51fce94b3c04f1ca5ef1965bcacba8c0f6680..8bd75fe7dea831f824c217b2f05ef0851b219091 100644
--- a/resources/views/plugin-page.blade.php
+++ b/resources/views/plugin-page.blade.php
@@ -24,153 +24,178 @@
$(".seperator").addClass("hidden");
@endif
</h1>
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- <div class="card-medium">
- <h3>{!! trans('plugin-page.firefox.plugin') !!}</h3>
- </div>
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search', ['browser' => $browser]) !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.firefox.1') !!}
- @if(LaravelLocalization::getCurrentLocale() == "de")
- <img src="/img/Firefox.png" width="100%" />
- @elseif(LaravelLocalization::getCurrentLocale() == "es")
- <img src="/img/FirefoxEs.png" width="100%" />
- @else
- <img src="/img/FirefoxEn.png" width="100%" />
- @endif
- </li>
- <li>{!! trans('plugin-page.firefox.2') !!}
- @if(LaravelLocalization::getCurrentLocale() == "de")
- <img src="/img/Firefox_Standard.png" width="100%" />
- @elseif(LaravelLocalization::getCurrentLocale() == "es")
- <img src="/img/FirefoxEs_Standard.png" width="100%" />
- @else
- <img src="/img/FirefoxEn_Standard.png" width="100%" />
- @endif
- </li>
- </ol>
- </div>
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.firefox.3', ['browser' => $browser]) !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.firefox.4') !!}</li>
- <li>{!! trans('plugin-page.firefox.5') !!}</li>
- </ol>
- </div>
- <div class="card-heavy">
- <h4>{{ trans('plugin-page.head.8') }}</h4>
- <ol>
- <li>{!! trans('plugin-page.firefox-klar.1') !!}</li>
- <li>{{ trans('plugin-page.firefox-klar.2')}}</li>
- <li>{{ trans('plugin-page.firefox-klar.3') }}</li>
- <li>{{ trans('plugin-page.firefox-klar.4') }}</li>
- </ol>
- </div>
- @elseif ($browser === 'Chrome')
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search') !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.chrome.1') !!}</li>
- <li>{!! trans('plugin-page.chrome.2') !!}</li>
- <li>{{ trans('plugin-page.chrome.3') }}</li>
- </ol>
- </div>
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.chrome.4', ['browser' => $browser]) !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.chrome.5') !!}</li>
- <li>{!! trans('plugin-page.chrome.6') !!}</li>
- <li>{!! trans('plugin-page.chrome.7') !!}</li>
- <li>{!! trans('plugin-page.chrome.8') !!}</li>
- </ol>
- </div>
- @elseif ($browser === 'Opera')
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search') !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.opera.1') !!}</li>
- <li>{!! trans('plugin-page.opera.2') !!}</li>
- <li>{!! trans('plugin-page.opera.3') !!}</li>
- <li>{!! trans('plugin-page.opera.4') !!}</li>
- <li><small>{!! trans('plugin-page.opera.5') !!}</small>
- </ol>
- </div>
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.opera.6', ['browser' => $browser]) !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.opera.7') !!}</li>
- <li>{!! trans('plugin-page.opera.8') !!}</li>
- <li>{!! trans('plugin-page.opera.9') !!}</li>
- <li>{!! trans('plugin-page.opera.10') !!}</li>
- </ol>
- </div>
- @elseif ($browser === 'IE')
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search') !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.IE.1') !!}</li>
- <li>{!! trans('plugin-page.IE.4') !!} (<i class="fa fa-cog" aria-hidden="true"></i>)</li>
- <li>{!! trans('plugin-page.IE.5') !!}</li>
- <li>{!! trans('plugin-page.IE.6') !!}</li>
- <li>{!! trans('plugin-page.IE.7') !!}</li>
- </ol>
- </div>
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.IE.8', ['browser' => $browser]) !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.IE.9') !!}</li>
- <li>{!! trans('plugin-page.IE.10') !!}</li>
- <li>{!! trans('plugin-page.IE.11') !!}</li>
- </ol>
- </div>
- @elseif ($browser === 'Edge')
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search') !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.edge.1') !!}<i class="fa fa-ellipsis-h" aria-hidden="true"></i>{!! trans('plugin-page.edge.2') !!}</li>
- <li>{!! trans('plugin-page.edge.3') !!}</li>
- <li>{!! trans('plugin-page.edge.4') !!}</li>
- <li>{!! trans('plugin-page.edge.5') !!}</li>
- </ol>
- </div>
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.edge.6', ['browser' => $browser]) !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.edge.7') !!}</li>
- <li>{!! trans('plugin-page.edge.8') !!}</li>
- <li>{!! trans('plugin-page.edge.9') !!}</li>
- <li>{!! trans('plugin-page.edge.10') !!}</li>
- <li>{!! trans('plugin-page.edge.11') !!}</li>
- </ol>
- </div>
- @elseif ($browser === 'Safari')
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search') !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.safari.1') !!}</li>
- </ol>
- </div>
- @elseif ($browser === 'Vivaldi')
- <div class="card-heavy">
- <h3>{!! trans('plugin-page.default-search') !!}</h3>
- <ol>
- <li>{!! trans('plugin-page.vivaldi.1') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.2') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.3') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.4') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.5') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.6') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.7') !!}</li>
- </ol>
- </div>
- <div class="card-heavy">
- <h4>{!! trans('plugin-page.vivaldi.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('plugin-page.vivaldi.9') !!}</li>
- <li>{!! trans('plugin-page.vivaldi.10') !!}</li>
- </ol>
- </div>
+ @if ($agent->isDesktop())
+ @if ($browser === 'Firefox' || $browser === 'Mozilla')
+ <div class="card-medium">
+ <h3>{!! trans('plugin-page.firefox.plugin') !!}</h3>
+ </div>
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search', ['browser' => $browser]) !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.firefox.1') !!}
+ @if(LaravelLocalization::getCurrentLocale() == "de")
+ <img src="/img/Firefox.png" width="100%" />
+ @elseif(LaravelLocalization::getCurrentLocale() == "es")
+ <img src="/img/FirefoxEs.png" width="100%" />
+ @else
+ <img src="/img/FirefoxEn.png" width="100%" />
+ @endif
+ </li>
+ <li>{!! trans('plugin-page.firefox.2') !!}
+ @if(LaravelLocalization::getCurrentLocale() == "de")
+ <img src="/img/Firefox_Standard.png" width="100%" />
+ @elseif(LaravelLocalization::getCurrentLocale() == "es")
+ <img src="/img/FirefoxEs_Standard.png" width="100%" />
+ @else
+ <img src="/img/FirefoxEn_Standard.png" width="100%" />
+ @endif
+ </li>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.firefox.3', ['browser' => $browser]) !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.firefox.4') !!}</li>
+ <li>{!! trans('plugin-page.firefox.5') !!}</li>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h4>{{ trans('plugin-page.head.8') }}</h4>
+ <ol>
+ <li>{!! trans('plugin-page.firefox-klar.1') !!}</li>
+ <li>{{ trans('plugin-page.firefox-klar.2')}}</li>
+ <li>{{ trans('plugin-page.firefox-klar.3') }}</li>
+ <li>{{ trans('plugin-page.firefox-klar.4') }}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'Chrome')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.chrome.1') !!}</li>
+ <li>{!! trans('plugin-page.chrome.2') !!}</li>
+ <li>{{ trans('plugin-page.chrome.3') }}</li>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.chrome.4', ['browser' => $browser]) !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.chrome.5') !!}</li>
+ <li>{!! trans('plugin-page.chrome.6') !!}</li>
+ <li>{!! trans('plugin-page.chrome.7') !!}</li>
+ <li>{!! trans('plugin-page.chrome.8') !!}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'Opera')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.opera.1') !!}</li>
+ <li>{!! trans('plugin-page.opera.2') !!}</li>
+ <li>{!! trans('plugin-page.opera.3') !!}</li>
+ <li>{!! trans('plugin-page.opera.4') !!}</li>
+ <li><small>{!! trans('plugin-page.opera.5') !!}</small>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.opera.6', ['browser' => $browser]) !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.opera.7') !!}</li>
+ <li>{!! trans('plugin-page.opera.8') !!}</li>
+ <li>{!! trans('plugin-page.opera.9') !!}</li>
+ <li>{!! trans('plugin-page.opera.10') !!}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'IE')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.IE.1') !!}</li>
+ <li>{!! trans('plugin-page.IE.4') !!} (<i class="fa fa-cog" aria-hidden="true"></i>)</li>
+ <li>{!! trans('plugin-page.IE.5') !!}</li>
+ <li>{!! trans('plugin-page.IE.6') !!}</li>
+ <li>{!! trans('plugin-page.IE.7') !!}</li>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.IE.8', ['browser' => $browser]) !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.IE.9') !!}</li>
+ <li>{!! trans('plugin-page.IE.10') !!}</li>
+ <li>{!! trans('plugin-page.IE.11') !!}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'Edge')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.edge.1') !!}<i class="fa fa-ellipsis-h" aria-hidden="true"></i>{!! trans('plugin-page.edge.2') !!}</li>
+ <li>{!! trans('plugin-page.edge.3') !!}</li>
+ <li>{!! trans('plugin-page.edge.4') !!}</li>
+ <li>{!! trans('plugin-page.edge.5') !!}</li>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.edge.6', ['browser' => $browser]) !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.edge.7') !!}</li>
+ <li>{!! trans('plugin-page.edge.8') !!}</li>
+ <li>{!! trans('plugin-page.edge.9') !!}</li>
+ <li>{!! trans('plugin-page.edge.10') !!}</li>
+ <li>{!! trans('plugin-page.edge.11') !!}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'Safari')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.safari.1') !!}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'Vivaldi')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.vivaldi.1') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.2') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.3') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.4') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.5') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.6') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.7') !!}</li>
+ </ol>
+ </div>
+ <div class="card-heavy">
+ <h4>{!! trans('plugin-page.vivaldi.8', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('plugin-page.vivaldi.9') !!}</li>
+ <li>{!! trans('plugin-page.vivaldi.10') !!}</li>
+ </ol>
+ </div>
+ @endif
+ @elseif ($agent->isPhone())
+ @if ($browser === 'Firefox')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.mobileff.1') !!}</li>
+ <li>{{ trans('plugin-page.mobileff.2') }}</li>
+ <li>{{ trans('plugin-page.mobileff.3') }}</li>
+ <li>{{ trans('plugin-page.mobileff.4') }}</li>
+ <li>{{ trans('plugin-page.mobileff.5') }}</li>
+ </ol>
+ </div>
+ @elseif ($browser === 'Chrome')
+ <div class="card-heavy">
+ <h3>{!! trans('plugin-page.default-search') !!}</h3>
+ <ol>
+ <li>{!! trans('plugin-page.mobilechr.1') !!}</li>
+ <li>{{ trans('plugin-page.mobilechr.2') }}</li>
+ <li>{{ trans('plugin-page.mobilechr.3') }}</li>
+ <li>{{ trans('plugin-page.mobilechr.4') }}</li>
+ </ol>
+ </div>
+ @endif
@endif
-@endsection
+ @endsection
diff --git a/routes/web.php b/routes/web.php
index eee19eb939a61320d06ac1de1684f8ee774569c9..e10e1da677313d2e23f24e4653502411e373f3dd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -165,6 +165,7 @@ Route::group(
return view('plugin-page')
->with('title', trans('titles.plugin'))
->with('navbarFocus', 'dienste')
+ ->with('agent', new Agent())
->with('browser', (new Agent())->browser())
->with('request', $this->input('request', 'GET'));
});