Merge remote-tracking branch 'origin/master' into 8-widget-generator

app/Http/Controllers/SitesearchController.php

@@ -14,6 +14,7 @@ class SitesearchController extends Controller
         return view('widget.sitesearch')
             ->with('title', trans('titles.sitesearch'))
             ->with('css', 'sitesearch.css')
-            ->with('site', $request->input('site', ''));
+            ->with('site', $request->input('site', ''))
+            ->with('navbarFocus', 'dienste');
     }
 }
\ No newline at end of file

app/Http/Controllers/StartpageController.php

@@ -43,7 +43,9 @@ class StartpageController extends Controller
             ->with('time', $request->input('param_time', '1000'))
             ->with('sprueche', $request->input('param_sprueche', 'off'))
             ->with('tab', $request->input('param_sprueche', 'off'))
-            ->with('focusPages', $focusPages);
+            ->with('focusPages', $focusPages)
+            ->with('navbarFocus', 'suche');
+
     }
 
     public function loadPage($subpage)
@@ -138,7 +140,8 @@ class StartpageController extends Controller
             ->with('foki', $foki)
             ->with('title', 'Einstellungen')
             ->with('css', 'settings.css')
-            ->with('js', ['settings.js']);
+            ->with('js', ['settings.js'])
+            ->with('navbarFocus', 'suche');
         die(var_dump($foki));
 
         return $xml->saveXML();

app/Http/routes.php

@@ -13,8 +13,8 @@
 
 	Route::group(
 		[
-            'prefix' => LaravelLocalization::setLocale(), 
-            'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]
+			'prefix' => LaravelLocalization::setLocale()/*, 
+			'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]*/
 		], 
 		function()
 		{
@@ -26,25 +26,29 @@
 		{
 			return view('impressum')
 				->with('title', trans('titles.impressum'))
-                ->with('css', 'impressum.css');
+				->with('css', 'impressum.css')
+				->with('navbarFocus', 'kontakt');
 		});
 
 		Route::get('about', function()
 		{
 			return view('about')
 				->with('title', trans('titles.about'))
-                ->with('css', 'about.css');
+				->with('css', 'about.css')
+				->with('navbarFocus', 'kontakt');
 		});
 		Route::get('team', function()
 		{
 			return view('team.team')
 				->with('title', trans('titles.team'))
-                ->with('css', 'team.css');
+				->with('css', 'team.css')
+				->with('navbarFocus', 'kontakt');
 		});
 		Route::get('team/pubkey-wsb', function()
 		{
 			return view('team.pubkey-wsb')
-                ->with('title', trans('titles.team'));
+				->with('title', trans('titles.team'))
+				->with('navbarFocus', 'kontakt');
 		});
 
 		Route::get('kontakt', function()
@@ -52,7 +56,8 @@
 			return view('kontakt.kontakt')
 				->with('title', trans('titles.kontakt'))
 				->with('css', 'kontakt.css')
-                ->with('js', ['openpgp.min.js','kontakt.js']);
+				->with('js', ['openpgp.min.js','kontakt.js'])
+				->with('navbarFocus', 'kontakt');
 		});
 
 		Route::post('kontakt', 'MailController@contactMail');
@@ -61,29 +66,34 @@
 		{
 			return view('spende')
 				->with('title', trans('titles.spende'))
-                ->with('css', 'donation.css');
+				->with('css', 'donation.css')
+				->with('navbarFocus', 'foerdern');
 		});
+		
 		Route::post('spende', 'MailController@donation');
 
 		Route::get('datenschutz', function()
 		{
 			return view('datenschutz')
 				->with('title', trans('titles.datenschutz'))
-                ->with('css', 'privacy.css');
+				->with('css', 'privacy.css')
+				->with('navbarFocus', 'datenschutz');
 		});
 
 		Route::get('hilfe', function()
 		{
 			return view('hilfe')
 				->with('title', trans('titles.hilfe'))
-                ->with('css', 'help.css');
+				->with('css', 'help.css')
+				->with('navbarFocus', 'dienste');
 		});
 
 		Route::get('widget', function()
 		{
             return view('widget.widget')
 				->with('title', trans('titles.widget'))
-                ->with('css', 'widget.css');
+				->with('css', 'widget.css')
+				->with('navbarFocus', 'dienste');
         });
 
         Route::get('sitesearch', 'SitesearchController@loadPage');
@@ -92,7 +102,8 @@
         {
             return view('widget.websearch')
                 ->with('title', trans('titles.websearch'))
-                ->with('css', 'websearch.css');
+                ->with('css', 'websearch.css')
+                ->with('navbarFocus', 'dienste');
 		});
 		
 		Route::get('settings', 'StartpageController@loadSettings');

public/css/503.css

+html, body {
+	height: 100%;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	color: #B0BEC5;
+	display: table;
+	font-weight: 100;
+	font-family: 'Lato';
+}
+
+.container {
+	text-align: center;
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.content {
+	text-align: center;
+	display: inline-block;
+}
+
+.title {
+	font-size: 72px;
+	margin-bottom: 40px;
+}

public/css/quicktips.css

+.quicktip {
+	margin-bottom:15px;
+	padding: 10px;
+	line-height: 1.2 !important;
+	font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+	color: #000;
+	border-left: 3px solid #FB0;
+	font-size: 14px;
+}
+
+.wikiqtextract {
+	font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+}
+
+.wikiqtextract p {
+	margin-bottom:0;
+}
+
+.quicktip a {
+	color: #00F;
+}
+
+.qtheader {
+	font-family: verdana,arial,helvetica,sans-serif;
+}
+
+.mutelink {
+	color:black!important;
+}
+
+#spruch {
+	margin-bottom:20px;
+	padding: 5px;
+	line-height: 1.2 !important;
+	color: #070;
+	border-left: 3px solid #070;
+	font-size: 16px;
+	font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+}
+
+.author {
+	float: right !important;
+}

public/css/welcome.css

+html, body {
+	height: 100%;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	display: table;
+	font-weight: 100;
+	font-family: 'Lato';
+}
+
+.container {
+	text-align: center;
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.content {
+	text-align: center;
+	display: inline-block;
+}
+
+.title {
+	font-size: 96px;
+}

readme.md

@@ -34,4 +34,4 @@ zögere biite nicht ein Ticket zu schreiben oder eine Mail an [office@suma-ev.de
 
 Der MetaGer-eigene Code, sofern nicht anders anders angegeben, steht unter der [AGPL-Lizenz Version 3](https://www.gnu.org/licenses/agpl-3.0).
 
-Eine Liste der Projekte, auf denen MetaGer basiert, und deren Lizenzen sind in der Datei LICENSES.md zu finden. 
\ No newline at end of file
+Eine Liste der Projekte, auf denen MetaGer basiert, und deren Lizenzen sind in der Datei LICENSE zu finden. 

resources/lang/en/about.php

@@ -5,17 +5,17 @@ return [
 	'head.2' => 'What are the advantages of using MetaGer?',
 
 	'list.1' => 'Privacy is quite natural for us: Completely built in and automatically applied to every search.',
-	'list.2' => 'More About it',
+	'list.2' => 'More about privacy',
 	'list.3' => 'We do not work profit-oriented, we are a',
 	'list.4' => 'charitable association:',
 	'list.5' => 'Our goal is not to enrich ourselves with your clicks or even your data.',
-	'list.6' => 'primarily is a',
-	'list.7' => 'META-search-engine:',
+	'list.6' => 'is primarily a',
+	'list.7' => 'meta search engine:',
 	'list.8' => 'We query up to 50 search engines. Thus we can offer real variety in results.',
-	'list.9' => 'For our results, we do not prefer ',
-	'list.10' => 'what is clicked more often:',
+	'list.9' => 'For our results, we do not prefer results',
+	'list.10' => 'that are clicked more often:',
 	'list.11' => 'This also gives you variety, instead of mainstream.',
-	'list.12' => 'MetaGer is being online since 20 years: ',
+	'list.12' => 'MetaGer is online since about 20 years: ',
 	'list.13' => 'Our experience is your advantage - we know what we do.',
 	'list.14' => 'But we are not perfect as well: If you encounter something weird: Please',
 	'list.15' => 'contact us!',

resources/lang/en/datenschutz.php

@@ -3,29 +3,29 @@
 return [
 	'head' => 'Privacy',
 
-	'general.1' => 'For us Privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small list of our approach. A more detailed description why we are the only real secure search engine can be found',
+	'general.1' => 'For us, privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small summary of our approach. A more detailed description why we are the most secure search engine can be found',
 	'general.2' => 'here',
 
 	'policy.1' => 'Our Approach/Policy:',
 	'policy.2' => 'Neither do we save your IP, nor the',
 	'policy.3' => '"fingerprint" of your Browser',
-	'policy.4' => '(Which most likely could identify you aswell).',
+	'policy.4' => '(Which most likely could identify you as well).',
 	'policy.5' => 'We do not set cookies or use tracking-pixel or similar technology, to "track" our users (tracking = following a users digital movement on the internet).',
-	'policy.6' => 'The data transmission from MetaGer is only done encrypted via the https-protocol.',
-	'policy.7' => 'We offer access via the anonymous TOR-network, the',
-	'policy.8' => 'MetaGer-TOR-hidden Service.',
+	'policy.6' => 'The data transmission from MetaGer is only done encrypted via the https protocol.',
+	'policy.7' => 'We offer access via the anonymous TOR network, the',
+	'policy.8' => 'MetaGer hidden service.',
 	'policy.9' => 'Since the access via the TOR-network seems complicated to many users and sometimes is also slow, we offer a different way, to visit the result pages anonymously: By clicking on the link "open anonymously". Doing this your personal information will be protected on this click and even on all following clicks.',
-	'policy.10' => 'We show as few advertisements as possible, clearly marking them, and as for financing we rely on our users. Your',
+	'policy.10' => 'We show as few advertisements as possible, clearly marking them, and financially rely on our users, their',
 	'policy.11' => 'Donations',
-	'policy.12' => 'and subscriptions to',
-	'policy.13' => 'Metager is operated and developed by the charitable german Organisation',
-	'policy.14' => 'in Cooperation with the',
-	'policy.15' => 'Leibniz Universität Hannover',
+	'policy.12' => 'and membership fees for',
+	'policy.13' => 'Metager is operated and developed by the charitable german organisation',
+	'policy.14' => 'in Ccooperation with the',
+	'policy.15' => 'Leibniz University Hanover',
 	'policy.16' => '.',
-	'policy.17' => 'Our Servers are exclusively located in germany. Therefore they are governed by the german privacy law, which is said to be the most rigorous in the world.',
+	'policy.17' => 'Our Servers are exclusively located in germany. Therefore they are governed by the german privacy law, which is among the strictest world wide.',
 	'policy.18' => 'Since the',
 	'policy.19' => 'revealments of Edward Snowden in June 2013',
-	'policy.20' => 'numerous search engines position with the self-description, that searching with them was save, because the user\'s IP adress was not saved. No matter how honourable these descriptions are - fact is that many search engines at least partially host their servers in the USA. This is also true for those search engines, which are still praised as recommendable. Because these search engines are,',
+	'policy.20' => 'numerous search engines claim that they protect theit users privacy, because the user\'s IP adress is not saved. No matter how honourable these descriptions are - fact is that many search engines at least partially host their servers in the USA. Because these search engines are,',
 	'policy.21' => 'as per the Patriot Act and US law',
 	'policy.22' => ', fully unprotected against the access of local authorities. Thus they cannot provide protection of personal data (even if they really try to).',
 

resources/lang/en/fokiNames.php

@@ -5,6 +5,6 @@ return [
 	'news'		=>	"nachrichten",
 	'science'	=>	'wissenschaft',
 	'shopping'	=>	'produktsuche',
-	'picture'	=>	'bilder',
+	'images'	=>	'bilder',
 	'custom'	=>	'angepasst'
 ];

resources/lang/en/hilfe.php

 <?php
 
 return [
-	'head.1' => 'MetaGer - Support',
-	'head.2' => 'The MetaGer-Support tries to offer help for every level of skills: The professional should not be forced to read lengthy explanations, while the beginner should learn to understand what happens here, and how IT happens.',
+	'head.1' => 'MetaGer - Help',
+	'head.2' => 'The MetaGer help tries to offer help for every level of skill: The professional should not be forced to read lengthy explanations, while the beginner should learn to understand what happens here, and how it happens.',
 
-	'help.1' => 'Help Information About the Usage of Metager',
+	'help.1' => 'Usage',
 	'help.2' => 'General Settings',
-	'help.3' => 'All settings can be found at the searchfocus "customize".',
-	'help.4' => 'On the left hand side of the input field you will find a drop of color, which allows you to customize the color.',
+	'help.3' => 'All settings can be found at the search focus "customize".',
+	'help.4' => 'On the left hand side of the input field you will find a drop icon, which allows you to customize the color.',
 	'help.5' => 'A plugin for most browsers can be found easily via the link next to the search field, where browser should be preset.',
 	'help.6' => 'Personal Settings',
 	'help.7' => 'Selection of the Search Focus',
@@ -24,10 +24,10 @@ return [
 	'help.18' => 'If you want to exclude MetaGer-results, which contain words (stopwords), you can do this by first typing in your searchwords as usual, then typing a blank (" ") followed by a minus ("-") and the words you want to exclude from your search.',
 	'help.19' => 'An Example: You are looking for a new car, but you definitely do not want a BMW. Therefore your input would be: car new -BMW',
 	'help.20' => 'Multi Word Search',
-	'help.21' => 'By default, a multi word search looks for documents, in which all words appear. The search for multiple terms shows almost equal results with or without quotation marks. However, if you have a longer citation or something liek that, you should use quatation marks.',
+	'help.21' => 'By default, a multi word search looks for documents, in which all words appear. The search for multiple terms shows almost equal results with or without quotation marks. However, if you have a longer citation or something like that, you should use quatation marks.',
 	'help.22' => 'Example: a search for "in den öden Fensterhöhlen" will provide many results, but it gets interesting (and more exact) when you search for: Schiller "in den öden Fensterhöhlen"',
 	'help.23' => 'Upper and Lower Case',
-	'help.24' => 'is not distinguished for search, it is a purely contentual search.',
+	'help.24' => 'are usually not distinguished.',
 	'help.25' => 'Search Word Associator',
 	'help.26' => 'The headline above conveys a big problem of retrieving information from the internet: When searching in a certain field of expertise, the technical terms and conceptual field are not always known. To deduce this conceptual field with a click of your mouse, we developed the',
 	'help.27' => 'MetaGer-Web-Assoziator',

resources/lang/en/index.php

@@ -7,7 +7,7 @@ return [
 	'foki.produkte'			=>	'Shopping',
 	'foki.anpassen'			=>	'customize',
 
-	'conveyor'				=>	'Purchase at supporting MetaGer Shops',
+	'conveyor'				=>	'Purchase at affiliate shops',
 
 	'plugin'				=>	'add the MetaGer-Plugin',
 

resources/lang/en/kontakt.php

@@ -3,7 +3,7 @@
 return [
 	'headline.1' => 'Contact',
 	'headline.2' => 'Forum',
-	'headline.3' => 'Please ask questions first at our',
+	'headline.3' => 'Please ask your question first at our',
 	'headline.4' => 'This way others can benefit from an answer.',
 	
 	'form.1' => 'Secure Contact Form',

resources/lang/en/settings.php

@@ -7,7 +7,7 @@ return [
 	'head.4' => '',
 
 	'allgemein.1' => 'General',
-	'allgemein.2' => 'disable sayings',
+	'allgemein.2' => 'disable quotes',
 	'allgemein.3' => 'open links in same tab',
 	'allgemein.4' => 'select language',
 	'allgemein.5' => 'all languages',
@@ -31,7 +31,7 @@ return [
 	'suchmaschinen.11' => 'diving',
 	'suchmaschinen.12' => 'regenerative energies',
 	'suchmaschinen.13' => 'astronomy',
-	'suchmaschinen.14' => 'stock & finances',
+	'suchmaschinen.14' => 'stocks & finances',
 	'suchmaschinen.15' => 'with archive',
 	'suchmaschinen.16' => 'germany, with archive',
 ];

resources/lang/en/staticPages.php

@@ -17,7 +17,7 @@ return [
 	'nav14' => 'TOR-Hidden-Service',
 	'nav15' => 'Tools',
 	'nav16' => 'Support',
-	'nav17' => 'Purchase at MetaGer Supporting Shops',
+	'nav17' => 'Purchase at affiliate shops',
 	'nav18' => 'Contact',
 	'nav19' => 'Language',
 

resources/lang/en/team.php

@@ -16,6 +16,6 @@ return [
 	'contact.5' => 'MetaGer-forum.',
 	'contact.6' => 'Due to the amount of requests, we can not always answer promptly - in the',
 	'contact.7' => 'MetaGer-forum',
-	'contact.8' => 'there are probably other users which can help you aswell, and the questions and answers benefit EVERYONE.',
+	'contact.8' => 'there are probably other users which can help you aswell, and the questions and answers benefit everyone.',
 	'contact.9' => 'Only in reasoned exceptions, if you want to rech someone directly, you should mail them. Because team members might be on vacation, sick etc.',
 ];

resources/lang/en/widget.php

@@ -4,8 +4,8 @@ return [
 	'head' => 'MetaGer Widget',
 
 	'body.1' => 'MetaGer for usage on your website.
-Therefore choose, where you want to search:',
-	'body.2' => 'Search on whole Web',
-	'body.3' => 'Search on your Domain',
+Please choose the scope of your widget:',
+	'body.2' => 'Search the Web',
+	'body.3' => 'Search one Domain',
 	'body.4' => 'Please note: You must not use this widget, if you want to make the impression that MetaGer was your service or that your page was the real MetaGer page (which already happened). For this reason it is especially forbidden to use our logo.'
 ];