Skip to content
Snippets Groups Projects
Commit 884f860a authored by Davide's avatar Davide
Browse files

added instructions for firefox and chrome mobile (newest) and different... 

added instructions for firefox and chrome mobile (newest) and different instructions for desktop and mobile
parent 6b93b5f8
No related branches found
No related tags found
3 merge requests!1712Development,!1705Development,!1688Resolve "dynamic instructions for adding metager as default search engine"
Hide whitespace changes
Inline Side-by-side
Showing
with 198 additions and 150 deletions
app/Http/Controllers/MetaGerSearch.php
+ 3
− 0
View file @ 884f860a
......@@ -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)];
......
app/Http/Controllers/StartpageController.php
+ 1
− 1
View file @ 884f860a
......@@ -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'))
......
browserstack.err 0 → 100644
+ 1
− 0
View file @ 884f860a
[object Object]
\ No newline at end of file
resources/lang/de/plugin-page.php
+ 12
− 0
View file @ 884f860a
......@@ -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.',
];
resources/views/index.blade.php
+ 6
− 0
View file @ 884f860a
......@@ -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">
......
resources/views/parts/searchbar.blade.php
+ 1
− 1
View file @ 884f860a
......@@ -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">
&#xd7;
</button>
......
resources/views/plugin-page.blade.php
+ 173
− 148
View file @ 884f860a
......@@ -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
routes/web.php
+ 1
− 0
View file @ 884f860a
......@@ -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'));
});
......
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