From 743711e21e4fd9e47164a23b5768eb155051a4b4 Mon Sep 17 00:00:00 2001
From: Kim <kim@suma-ev.de>
Date: Mon, 14 Jun 2021 12:32:18 +0200
Subject: [PATCH] add se page, integrate into updated navbar
---
resources/lang/de/search-engine.php | 20 ++++++++++++
resources/lang/de/sidebar.php | 2 ++
resources/lang/en/search-engine.php | 20 ++++++++++++
resources/less/metager/parts/sidebar.less | 5 +++
resources/views/parts/sidebar.blade.php | 38 ++++++++++++++++-------
resources/views/search-engine.blade.php | 32 +++++++++++++++++++
routes/web.php | 10 ++++--
7 files changed, 113 insertions(+), 14 deletions(-)
create mode 100644 resources/lang/de/search-engine.php
create mode 100644 resources/lang/en/search-engine.php
create mode 100644 resources/views/search-engine.blade.php
diff --git a/resources/lang/de/search-engine.php b/resources/lang/de/search-engine.php
new file mode 100644
index 000000000..e89122ca6
--- /dev/null
+++ b/resources/lang/de/search-engine.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+ 'head.1' => 'Ãœber unsere Suchmaschinen',
+ 'head.2' => 'MetaGer nutzt mehrere Suchmaschinen',
+ 'head.3' => 'leer',
+ 'head.4' => 'leer',
+ 'head.5' => 'leer',
+
+
+ 'text.1' => 'leer',
+ 'text.2.2' => 'leer',
+ 'text.3' => 'leer',
+ 'text.4' => 'leer',
+ 'text.5' => 'leer',
+
+
+
+
+];
diff --git a/resources/lang/de/sidebar.php b/resources/lang/de/sidebar.php
index 2147975d7..1fb6dad0c 100644
--- a/resources/lang/de/sidebar.php
+++ b/resources/lang/de/sidebar.php
@@ -27,6 +27,8 @@ return [
'nav27' => 'MetaGer Maps',
'nav28' => 'Einstellungen',
'nav29' => 'Transparenzerklärung',
+ 'nav30' => 'Suchmaschinen',
+ 'nav31' => 'Weitere Infos',
'navigationToggle' => 'Navigation anzeigen',
'titles.tips' => 'Tips',
'plugin' => 'MetaGer Plugin',
diff --git a/resources/lang/en/search-engine.php b/resources/lang/en/search-engine.php
new file mode 100644
index 000000000..f073552f4
--- /dev/null
+++ b/resources/lang/en/search-engine.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+ 'head.1' => 'About our search engines',
+ 'head.2' => 'MetaGer uses multiple search engines',
+ 'head.3' => 'leer',
+ 'head.4' => 'leer',
+ 'head.5' => 'leer',
+
+
+ 'text.1' => 'leer',
+ 'text.2.2' => 'leer',
+ 'text.3' => 'leer',
+ 'text.4' => 'leer',
+ 'text.5' => 'leer',
+
+
+
+
+];
\ No newline at end of file
diff --git a/resources/less/metager/parts/sidebar.less b/resources/less/metager/parts/sidebar.less
index 462a61df0..1a56fa8fd 100644
--- a/resources/less/metager/parts/sidebar.less
+++ b/resources/less/metager/parts/sidebar.less
@@ -282,4 +282,9 @@
height: 20px;
margin-left: 10px;
+}
+#sidebar-img-info {
+ height: 13px;
+ margin-left: 10px;
+ margin-right: 8px;
}
\ No newline at end of file
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index a347b2709..14bfb6e0c 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -25,6 +25,32 @@
<span>{{ trans('sidebar.nav20') }}</span>
</a>
</li>
+ <li class="metager-dropdown">
+ <input id="infoToggle" class="sidebarCheckbox" type="checkbox">
+ <label for="infoToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationInfo" tabindex=0>
+ <img src="/img/icon-contact.svg" alt="" aria-hidden="true" id="sidebar-img-info">
+ <span>{{ trans('sidebar.nav31') }}</span>
+ <span class="caret"></span>
+ </label>
+ <ul class="metager-dropdown-content">
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/transparency/") }}" >{{ trans('sidebar.nav29') }}</a>
+ </li>
+ <li>
+ <a href="https://gitlab.metager.de/open-source/MetaGer" >{{ trans('sidebar.nav24') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/search-engine/") }}" >{{ trans('sidebar.nav30') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" >{{ trans('sidebar.nav7') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tips/") }}" >{{ trans('sidebar.titles.tips') }}</a>
+ </li>
+
+ </ul>
+ </li>
<hr>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" >
@@ -66,9 +92,6 @@
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" >{{ trans('sidebar.nav6') }}</a>
</li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" >{{ trans('sidebar.nav7') }}</a>
- </li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" >{{ trans('sidebar.nav8') }}</a>
</li>
@@ -91,18 +114,9 @@
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" >{{ trans('sidebar.nav22') }}</a>
</li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/transparency/") }}" >{{ trans('sidebar.nav29') }}</a>
- </li>
<li>
<a href="{{ action('Assoziator@asso') }}" >{{ trans('sidebar.nav11') }}</a>
</li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tips/") }}" >{{ trans('sidebar.titles.tips') }}</a>
- </li>
- <li>
- <a href="https://gitlab.metager.de/open-source/MetaGer" >{{ trans('sidebar.nav24') }}</a>
- </li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tor/") }}" >{{ trans('sidebar.nav14') }}</a>
</li>
diff --git a/resources/views/search-engine.blade.php b/resources/views/search-engine.blade.php
new file mode 100644
index 000000000..9e167a064
--- /dev/null
+++ b/resources/views/search-engine.blade.php
@@ -0,0 +1,32 @@
+@extends('layouts.subPages')
+
+@section('title', $title )
+
+@section('content')
+
+ <div>
+ <h1 class="page-title">{{ trans('search-engine.head.1') }}</h1>
+ <div class="card-heavy">
+ <h2>{{ trans('search-engine.head.2') }}</h2>
+ <p>{!! trans('search-engine.text.1', ["sourcecode" => "https://gitlab.metager.de/open-source/MetaGer", "license" => "https://gitlab.metager.de/open-source/MetaGer/-/blob/development/LICENSE", "sumalink" => "https://suma-ev.de"]) !!}</p>
+ </div>
+ <div class="card-heavy">
+ <h2>{{ trans('search-engine.head.3') }}</h2>
+ <img src="/img/transparency-metaindex.svg" id="transparency-metaindex-img">
+
+ <p>{{ trans('search-engine.text.2.1') }}</p>
+ <p>{{ trans('search-engine.text.2.2') }}</p>
+ </div>
+ <div class="card-heavy">
+ <h2>{{ trans('search-engine.head.4') }}</h2>
+ <p>{{ trans('search-engine.text.3') }}</p>
+ </div>
+ <div class="card-heavy">
+ <h2>{{ trans('search-engine.head.5') }}</h2>
+ <p>{{ trans('search-engine.text.4') }}</p>
+ </div>
+ <div class="card-heavy">
+ <p>{!! trans('search-engine.text.5', ["contact" => LaravelLocalization::getLocalizedUrl(LaravelLocalization::getCurrentLocale(), route('contact'))]) !!}</p>
+ </div>
+ </div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 1c5d12de2..0a9871f76 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -57,7 +57,7 @@ Route::group(
Route::get('about', function () {
return view('about')
->with('title', trans('titles.about'))
- ->with('navbarFocus', 'kontakt');
+ ->with('navbarFocus', 'info');
});
Route::get('team', function () {
return view('team.team')
@@ -126,7 +126,13 @@ Route::group(
Route::get('transparency', function () {
return view('transparency')
->with('title', trans('titles.transparency'))
- ->with('navbarFocus', 'kontakt');
+ ->with('navbarFocus', 'info');
+ });
+
+ Route::get('search-engine', function () {
+ return view('search-engine')
+ ->with('title', trans('titles.search-engine'))
+ ->with('navbarFocus', 'info');
});
Route::get('hilfe', function () {
--
GitLab