From fb9e49a621f4bbe9c073acfbd996a645feb33e8e Mon Sep 17 00:00:00 2001
From: Davide <davide@suma-ev.de>
Date: Tue, 6 Oct 2020 13:27:03 +0200
Subject: [PATCH] code block for search string, new less/css for plugin
---
.gitignore | 4 +++-
resources/lang/de/plugin-page.php | 2 +-
resources/less/metager/pages/plugin.less | 4 ++++
resources/views/layouts/staticPages.blade.php | 2 +-
resources/views/plugin-page.blade.php | 1 +
routes/web.php | 3 ++-
webpack.mix.js | 3 +++
7 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 resources/less/metager/pages/plugin.less
diff --git a/.gitignore b/.gitignore
index b60d09df8..7cf28df55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,6 @@ npm-debug.log
/.project
composer.lock
-local.log
\ No newline at end of file
+local.log
+
+browserstack.err
\ No newline at end of file
diff --git a/resources/lang/de/plugin-page.php b/resources/lang/de/plugin-page.php
index 92e9024bd..ff9666fe6 100644
--- a/resources/lang/de/plugin-page.php
+++ b/resources/lang/de/plugin-page.php
@@ -87,7 +87,7 @@ return [
'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).',
+ 'mobileff.5' => 'Wählen Sie "Andere" aus und tragen darunter den Namen (MetaGer) und den Such-String ein.',
'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.',
diff --git a/resources/less/metager/pages/plugin.less b/resources/less/metager/pages/plugin.less
new file mode 100644
index 000000000..67db3aaec
--- /dev/null
+++ b/resources/less/metager/pages/plugin.less
@@ -0,0 +1,4 @@
+#search{
+ color: orangered;
+ background-color:white;
+}
\ No newline at end of file
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index b315f5f1e..16e63d595 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -39,7 +39,7 @@
@foreach($css as $cssFile)
<link href="{{ $cssFile }}" rel="stylesheet" />
@endforeach
- @else
+ @endif
@endif
</head>
<body>
diff --git a/resources/views/plugin-page.blade.php b/resources/views/plugin-page.blade.php
index 8bd75fe7d..d7e9de1ac 100644
--- a/resources/views/plugin-page.blade.php
+++ b/resources/views/plugin-page.blade.php
@@ -183,6 +183,7 @@
<li>{{ trans('plugin-page.mobileff.3') }}</li>
<li>{{ trans('plugin-page.mobileff.4') }}</li>
<li>{{ trans('plugin-page.mobileff.5') }}</li>
+ <code id=search>"https://metager.de/meta/meta.ger3?eingabe=%s"</code>
</ol>
</div>
@elseif ($browser === 'Chrome')
diff --git a/routes/web.php b/routes/web.php
index e10e1da67..9b18899a3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -167,7 +167,8 @@ Route::group(
->with('navbarFocus', 'dienste')
->with('agent', new Agent())
->with('browser', (new Agent())->browser())
- ->with('request', $this->input('request', 'GET'));
+ ->with('request', $this->input('request', 'GET'))
+ ->with('css', [mix('/css/plugin.css')]);
});
Route::group(['middleware' => ['auth.basic'], 'prefix' => 'admin'], function () {
diff --git a/webpack.mix.js b/webpack.mix.js
index 91565c2e2..3cdaa1a71 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -46,6 +46,9 @@ mix
.less("resources/less/utility.less", "public/css/utility.css", {
strictMath: true
})
+ .less("resources/less/metager/pages/plugin.less", "public/css/plugin.css",{
+ strictMath: true
+ })
// js
.babel(
[
--
GitLab