Merge branch 'development' into '707-metager-spruche'

# Conflicts:
#   app/Models/Quicktips/Quicktips.php

app/Http/Controllers/MetaGerSearch.php

@@ -6,8 +6,7 @@ use App;
 use App\MetaGer;
 use Illuminate\Http\Request;
 
-const TIP_SERVER = 'https://quicktips.metager3.de/tips.xml';
-#const TIP_SERVER = 'http://localhost:63825/tips.xml';
+const TIP_SERVER = 'http://localhost:63825/tips.xml';
 
 class MetaGerSearch extends Controller
 {
@@ -77,7 +76,7 @@ class MetaGerSearch extends Controller
     public function tips(Request $request)
     {
         $tips_text = file_get_contents(TIP_SERVER);
-        $tips = [];
+        $tips      = [];
         try {
             $tips_xml = simplexml_load_string($tips_text);
 

resources/lang/de/sidebar.php

 <?php
 
 return [
-    'nav1' => 'Suche',
-    'nav2' => 'Spenden',
-    'nav3' => 'Datenschutz',
-    'nav4' => 'Forum',
-    'nav5' => 'Kontakt',
-    'nav6' => 'Team',
-    'nav7' => 'Über uns',
-    'nav8' => 'Impressum',
-    'nav9' => 'Hilfe',
-    'nav10' => 'Widget',
-    'nav11' => 'Assoziator',
-    'nav13' => 'URL-Verkürzer',
-    'nav14' => 'TOR-Hidden-Service',
-    'nav15' => 'Dienste',
-    'nav16' => 'Fördern',
-    'nav17' => 'Einkaufen bei MetaGer-Fördershops',
-    'nav18' => 'Kontakt',
-    'nav19' => 'Sprache',
-    'nav20' => 'Hilfe',
-    'nav21' => 'FAQ',
-    'nav22' => 'Zitatsuche',
-    'nav23' => 'Aufnahmeantrag SUMA-EV',
-    'nav24' => 'MetaGer Quellcode',
-    'nav25' => 'MetaGer App',
-    'nav26' => 'MetaGer-Fanshop',
+    'nav1'             => 'Suche',
+    'nav2'             => 'Spenden',
+    'nav3'             => 'Datenschutz',
+    'nav4'             => 'Forum',
+    'nav5'             => 'Kontakt',
+    'nav6'             => 'Team',
+    'nav7'             => 'Über uns',
+    'nav8'             => 'Impressum',
+    'nav9'             => 'Hilfe',
+    'nav10'            => 'Widget',
+    'nav11'            => 'Assoziator',
+    'nav14'            => 'TOR-Hidden-Service',
+    'nav15'            => 'Dienste',
+    'nav16'            => 'Fördern',
+    'nav17'            => 'Einkaufen bei MetaGer-Fördershops',
+    'nav18'            => 'Kontakt',
+    'nav19'            => 'Sprache',
+    'nav20'            => 'Hilfe',
+    'nav21'            => 'FAQ',
+    'nav22'            => 'Zitatsuche',
+    'nav23'            => 'Aufnahmeantrag SUMA-EV',
+    'nav24'            => 'MetaGer Quellcode',
+    'nav25'            => 'MetaGer App',
+    'nav26'            => 'MetaGer-Fanshop',
     'navigationToggle' => 'Navigation anzeigen',
-    'titles.tips' => 'Tips',
+    'titles.tips'      => 'Tips',
 ];

resources/lang/en/sidebar.php

 <?php
 
 return [
-    "nav1" => "Search",
-    "nav2" => "Donate",
-    "nav3" => "Privacy",
-    "nav4" => "Board",
-    "nav5" => "Contact",
-    "nav6" => "Team",
-    "nav7" => "About us",
-    "nav8" => "Legal information",
-    "nav9" => "Help",
-    "nav10" => "Widget",
-    "nav11" => "Associator",
-    "nav13" => "URL-Shortener",
-    "nav14" => "TOR-Hidden-Service",
-    "nav15" => "Tools",
-    "nav16" => "Support Us",
-    "nav17" => "Purchase at affiliate shops",
-    "nav18" => "Contact",
-    "nav19" => "Language",
-    "nav20" => "Help",
-    "nav21" => "FAQ",
-    "nav22" => "Citation Search",
-    "nav23" => "Admitting formular SUMA-EV",
-    "nav24" => "MetaGer source code",
-    "nav25" => "MetaGer App",
-    'nav26' => 'MetaGer-Fanshop',
+    "nav1"             => "Search",
+    "nav2"             => "Donate",
+    "nav3"             => "Privacy",
+    "nav4"             => "Board",
+    "nav5"             => "Contact",
+    "nav6"             => "Team",
+    "nav7"             => "About us",
+    "nav8"             => "Legal information",
+    "nav9"             => "Help",
+    "nav10"            => "Widget",
+    "nav11"            => "Associator",
+    "nav14"            => "TOR-Hidden-Service",
+    "nav15"            => "Tools",
+    "nav16"            => "Support Us",
+    "nav17"            => "Purchase at affiliate shops",
+    "nav18"            => "Contact",
+    "nav19"            => "Language",
+    "nav20"            => "Help",
+    "nav21"            => "FAQ",
+    "nav22"            => "Citation Search",
+    "nav23"            => "Admitting formular SUMA-EV",
+    "nav24"            => "MetaGer source code",
+    "nav25"            => "MetaGer App",
+    'nav26'            => 'MetaGer-Fanshop',
     "navigationToggle" => "show navigation",
 ];

resources/lang/es/sidebar.php

 <?php
 
 return [
-    "nav1" => "Búsqueda",
-    "nav2" => "Donaciones",
-    "nav3" => "Protección de datos",
-    "nav4" => "Foro",
-    "nav5" => "Contacto",
-    "nav6" => "Equipo",
-    "nav7" => "Sobre nosotros",
-    "nav8" => "Aviso legal",
-    "nav9" => "Ayuda",
-    "nav10" => "Widget",
-    "nav11" => "Asociador",
-    "nav13" => "Cortador de URL",
-    "nav14" => "TOR-Hidden-Service",
-    "nav15" => "Servicios",
-    "nav16" => "Patrocinar",
-    "nav17" => "Comprar en tiendas que patrocinan a MetaGer",
-    "nav18" => "Contacto",
-    "nav19" => "Idioma",
-    "nav20" => "Ayuda",
-    "nav21" => "FAQ",
-    "nav22" => "Búsqueda de citas",
-    "nav23" => "Formulario de afiliación SUMA-EV",
-    "nav24" => "Codigo fuente MetaGer",
-    "nav25" => "MetaGer App",
+    "nav1"             => "Búsqueda",
+    "nav2"             => "Donaciones",
+    "nav3"             => "Protección de datos",
+    "nav4"             => "Foro",
+    "nav5"             => "Contacto",
+    "nav6"             => "Equipo",
+    "nav7"             => "Sobre nosotros",
+    "nav8"             => "Aviso legal",
+    "nav9"             => "Ayuda",
+    "nav10"            => "Widget",
+    "nav11"            => "Asociador",
+    "nav14"            => "TOR-Hidden-Service",
+    "nav15"            => "Servicios",
+    "nav16"            => "Patrocinar",
+    "nav17"            => "Comprar en tiendas que patrocinan a MetaGer",
+    "nav18"            => "Contacto",
+    "nav19"            => "Idioma",
+    "nav20"            => "Ayuda",
+    "nav21"            => "FAQ",
+    "nav22"            => "Búsqueda de citas",
+    "nav23"            => "Formulario de afiliación SUMA-EV",
+    "nav24"            => "Codigo fuente MetaGer",
+    "nav25"            => "MetaGer App",
     "navigationToggle" => "Mostrar navegación",
 ];

resources/views/assoziator/asso.blade.php

@@ -24,7 +24,7 @@
 	</style>
 	<h1 class="page-title">{{ trans('asso.head.1') }}</h1>
 	<div class="card-heavy">
-		<p>{{ trans('asso.1.1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/') }}" target="_blank">{{ trans('asso.1.2') }}</a>.</p>
+		<p>{{ trans('asso.1.1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/datenschutz') }}" target="_blank">{{ trans('asso.1.2') }}</a>.</p>
 		
 		<form method="post">
 			<div class="input-group">

resources/views/datenschutz/datenschutz.blade.php

@@ -5,24 +5,63 @@
 @section('navbarFocus.datenschutz', 'class="active"')
 
 @section('content')
-	<div class="card-heavy">
-		<h1>{!! trans('datenschutz.head') !!}</h1>
-		<p>{!! trans('datenschutz.general.1') !!}</p>
-		<p>{!! trans('datenschutz.general.3') !!}</p>
-	</div>
-	<div class="card-heavy">
-		<h1>{!! trans('datenschutz.policy.1') !!}</h1>
-		<ul class="dotlist">
-			<li>{!! trans('datenschutz.policy.2') !!}</li>
-			<li>{!! trans('datenschutz.policy.5') !!}</li>
-			<li>{!! trans('datenschutz.policy.6') !!}</li>
-			<li>{!! trans('datenschutz.policy.7') !!}</li>
-			<li>{!! trans('datenschutz.policy.9') !!}</li>
-			<li>{!! trans('datenschutz.policy.10') !!}</li>
-			<li>{!! trans('datenschutz.policy.13') !!}</li>
-			<li>{!! trans('datenschutz.policy.17') !!}</li>
-			<li>{!! trans('datenschutz.policy.18') !!}</li>
-			<li>{!! trans('datenschutz.policy.19') !!}</li>
-		</ul>
-	</div>
-@endsection
\ No newline at end of file
+<style>
+main {
+    font-size: 10pt;
+    hyphens:auto;
+    counter-reset: kontext 0 datum 0;
+    text-align: justify;
+}
+
+h1 {
+    font-size: 18pt;
+}
+
+.kontext > h1::before {
+  counter-increment: kontext;
+  content: "K" counter(kontext) " ";
+  font-weight: normal;
+}
+
+.datum > h1::before {
+  counter-increment: datum;
+  content: "D" counter(datum) " ";
+  font-weight: normal;
+}
+
+.kontext h1 {
+   font-size: 16pt;
+   margin-bottom: inherit;
+}
+.kontext h2 {
+   font-size: 14pt;
+   margin-bottom: inherit;
+}
+.datum h1 {
+   font-size: 12pt;
+   margin-bottom: inherit;
+}
+.datum h2 {
+   font-size: 11pt;
+   margin-bottom: inherit;
+   margin-top: 5pt;
+}
+
+.kontext-list {
+    list-style: none;
+}
+.datum-list {
+    list-style: none;
+}
+
+samp {
+    hyphens:none;
+    font-size: 8pt;
+}
+</style>
+    @if (LaravelLocalization::getCurrentLocale() == "de")
+        @include('datenschutz.german')
+	@else
+        @include('datenschutz.english')
+	@endif
+@endsection

resources/views/datenschutz/english.blade.php

+english

resources/views/hilfe.blade.php

@@ -140,12 +140,6 @@
 			<p>{!! trans('hilfe.widget.1') !!}</p>
 		</div>
 	</section>
-	<section>
-		<h3>{!! trans('hilfe.urlshort.title') !!}</h3>
-		<div>
-			<p>{!! trans('hilfe.urlshort.1') !!}</p>
-		</div>
-	</section>
 	<h2>{!! trans('hilfe.datenschutz.title') !!}</h2>
 	<section>
 		<h3>{!! trans('hilfe.datenschutz.faktencheck.heading') !!}</h3>

resources/views/resultpages/metager3resultsatom10.blade.php

-<?xmlversion = "1.0"encoding = "UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom" 
       xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
       xmlns:mg="http://metager.de/opensearch/"