Added new PayPal Button

resources/js/scriptResultPage.js

 $(document).ready(function () {
-  activateJSOnlyContent();
-  var focus = $('#foki > li.active > a').attr('aria-controls');
-  var custom = $('#foki > li.active').hasClass('custom-focus-tab-selector');
+
   getDocumentReadyForUse(focus, custom);
   botProtection();
-  if (document.location.href.indexOf('focus=container') !== -1) {
-    $($('#foki > li#savedFokiTabSelector').get(0)).find('>a').tab('show');
-  }
-
-  if (localStorage.hasOwnProperty('param_sprueche')) {
-    var sprueche = localStorage.getItem('param_sprueche') === 'on'; // check for sprueche local storage parameter
-  } else {
-    var sprueche = getURLParameter('sprueche', 'on') === 'on'; // load the sprueche url parameter
-  }
 
   var search = getMetaTag('q') || '';
   var locale = getMetaTag('l') || 'de';
@@ -37,36 +26,8 @@ function getMetaTag(name) {
   }
 }
 
-function activateJSOnlyContent() {
-  $('#searchplugin').removeClass('hide');
-  $('.js-only').removeClass('js-only');
-}
 
-function tabs() {
-  $('#foki > li.tab-selector > a').each(function () {
-    if ($(this).attr('target') != '_blank') {
-      $(this).attr('href', '#' + $(this).attr('aria-controls'));
-      $(this).attr('role', 'tab');
-      $(this).attr('data-toggle', 'tab');
-    }
-  });
-  $('#foki > li.tab-selector > a').off();
-  $('#foki > li.tab-selector > a').on('show.bs.tab', function (e) {
-    var fokus = $(this).attr('aria-controls');
-    var link = $('#' + fokus + 'TabSelector a').attr('data-href');
-    if ($('#' + fokus + 'TabSelector').attr('data-loaded') != '1') {
-      $.get(link, function (data) {
-        $('#' + fokus + 'TabSelector').attr('data-loaded', '1');
-        $('#' + fokus).html(data);
-        $('input[name=focus]').val($('#foki li.active a').attr('aria-controls'));
-        getDocumentReadyForUse(fokus);
-      });
-    } else {
-      getDocumentReadyForUse(fokus);
-    }
-  });
-  $('#search-delete-btn').removeClass('hidden');
-}
+
 
 function getDocumentReadyForUse(fokus, custom) {
   if (typeof custom == 'undefined') custom = false;
@@ -114,13 +75,13 @@ function botProtection() {
       newtab = true;
     }
     $.ajax({
-        url: '/img/cat.jpg',
-        type: 'post',
-        data: {
-          mm: $('meta[name=mm]').attr('content')
-        },
-        timeout: 2000
-      })
+      url: '/img/cat.jpg',
+      type: 'post',
+      data: {
+        mm: $('meta[name=mm]').attr('content')
+      },
+      timeout: 2000
+    })
       .always(function () {
         if (!newtab)
           document.location.href = link;

resources/lang/en/about.php

 <?php
 
 return [
-    "head.1"	=>	"About us",
-    "head.3"	=>	"MetaGer - Characteristic qualities",
-    "3.0"	    =>	"Implementation of free access to knowledge and digital democracy with:",
-    "3.1"	=>	"access to knowledge without control and dictation by states or trusts.",
-    "3.2"	=>	"no storage of private data, highest demand of privacy.",
-    "3.3"	=>	"and anonymous access also to the search results, therefore.",
-    "3.4"	=>	"realized through: anonymous proxy and the Hidden-Tor-Branch, ",
-    "3.5"	=>	"as an Open-Source-Software which allows examining and checks.",
-    "3.6"	=>	"these features are realized not only for search and find of informations but also for route-planning and geographical search (<a href=\"https://maps.metager.de\" target=\"_blank\">maps.metager.de</a>), WITHOUT tracking any locations.",
-    "3.7"	=>	"embedded in a transparent organization (Nonprofit organization  <a href=\"https://suma-ev.de/en/index.html\" target=\"_blank\">SUMA-EV</a>), everyone can be part of it. Become a member: <a href=\"https://metager3.de/en/beitritt\" target=\"_blank\">of the SUMA-EV</a> ",
-    "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. <a href=\"/en/datenschutz/\">More about privacy...</a>",
-    "list.2"	=>	"We do not work profit-oriented, we are a <a href=\"/en/spende/\">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.",
-    "list.3"	=>	"<a href=\"https://en.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> is primarily a <a href=\"https://en.wikipedia.org/wiki/Metasearch_engine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.",
-    "list.4"	=>	"For our results, we do not prefer results <a href=\"https://en.wikipedia.org/wiki/Filter_bubble\" target=\"_blank\" rel=\"noopener\">that are clicked more often</a>: This also gives you variety, instead of mainstream.",
-    "list.5"	=>	"MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.",
-    "list.6"	=>	"We only use green electricity for our servers.",
-    "list.7"	=>	"But we are not perfect as well: If you encounter something weird: Please <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact us</a>! We take your hints seriously: <em>You</em> are most important for us."
-    "head.4"	=>	"How to support the SUMA-EV and MetaGer:",
-];
+    "head.1" => "About us",
+    "head.3" => "MetaGer - Characteristic qualities",
+    "3.0" => "Implementation of free access to knowledge and digital democracy with:",
+    "3.1" => "access to knowledge without control and dictation by states or trusts.",
+    "3.2" => "no storage of private data, highest demand of privacy.",
+    "3.3" => "and anonymous access also to the search results, therefore.",
+    "3.4" => "realized through: anonymous proxy and the Hidden-Tor-Branch, ",
+    "3.5" => "as an Open-Source-Software which allows examining and checks.",
+    "3.6" => "these features are realized not only for search and find of informations but also for route-planning and geographical search (<a href=\"https://maps.metager.de\" target=\"_blank\">maps.metager.de</a>), WITHOUT tracking any locations.",
+    "3.7" => "embedded in a transparent organization (Nonprofit organization  <a href=\"https://suma-ev.de/en/index.html\" target=\"_blank\">SUMA-EV</a>), everyone can be part of it. Become a member: <a href=\"https://metager3.de/en/beitritt\" target=\"_blank\">of the SUMA-EV</a> ",
+    "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. <a href=\"/en/datenschutz/\">More about privacy...</a>",
+    "list.2" => "We do not work profit-oriented, we are a <a href=\"/en/spende/\">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.",
+    "list.3" => "<a href=\"https://en.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> is primarily a <a href=\"https://en.wikipedia.org/wiki/Metasearch_engine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.",
+    "list.4" => "For our results, we do not prefer results <a href=\"https://en.wikipedia.org/wiki/Filter_bubble\" target=\"_blank\" rel=\"noopener\">that are clicked more often</a>: This also gives you variety, instead of mainstream.",
+    "list.5" => "MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.",
+    "list.6" => "We only use green electricity for our servers.",
+    "list.7" => "But we are not perfect as well: If you encounter something weird: Please <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact us</a>! We take your hints seriously: <em>You</em> are most important for us.",
+    "head.4" => "How to support the SUMA-EV and MetaGer:",
+];
\ No newline at end of file

resources/views/layouts/resultPage.blade.php

@@ -16,7 +16,6 @@
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" />
-		<link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
 		<meta name="referrer" content="origin">
 		<meta name="age-meta-label" content="age=18"/>
 		@include('parts.utility')
@@ -44,7 +43,6 @@
 		@endif
 		<script src="{{ mix('js/lib.js') }}"></script>
 		<script src="{{ mix('js/scriptResultPage.js') }}" defer></script>
-		<script src="{{ mix('js/focus-creator.js') }}" defer></script>
 		<script src="{{ mix('js/searchbar.js') }}" defer></script>
 	</body>
 </html>

resources/views/layouts/staticPages.blade.php

@@ -13,7 +13,6 @@
 		<link href="/favicon.ico" rel="icon" type="image/x-icon" />
 		<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
 		<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{  LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
-		<link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />

resources/views/spende/spende.blade.php

@@ -57,22 +57,21 @@
 					<h3>{!! trans('spende.paypal.title') !!}</h3>
 					<p>{!! trans('spende.paypal.subtitle') !!}</p>
 					<div class="center-wrapper">
-						<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-							<input name="cmd" value="_xclick" type="hidden">
-							<input name="business" value="wsb@suma-ev.de" type="hidden">
-							<input name="item_name" value="SuMa-eV Spende" type="hidden">
-							<input name="buyer_credit_promo_code" value="" type="hidden">
-							<input name="buyer_credit_product_category" value="" type="hidden">
-							<input name="buyer_credit_shipping_method" value="" type="hidden">
-							<input name="buyer_credit_user_address_change" value="" type="hidden">
-							<input name="no_shipping" value="0" type="hidden">
-							<input name="no_note" value="1" type="hidden">
-							<input name="currency_code" value="EUR" type="hidden">
-							<input name="tax" value="0" type="hidden">
-							<input name="lc" value="DE" type="hidden">
-							<input name="bn" value="PP-DonationsBF" type="hidden">
-							<input src="/img/paypalspenden.gif" name="submit" width="120" alt="{!! trans('spende.paypal.2') !!}" type="image">
+						@if (LaravelLocalization::getCurrentLocale() == "de")
+						<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+							<input type="hidden" name="cmd" value="_s-xclick" />
+							<input type="hidden" name="hosted_button_id" value="5JPHYQT88JSRQ" />
+							<input type="image" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donateCC_LG.gif']) }}" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
+							<img alt="" border="0" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypal.com/de_DE/i/scr/pixel.gif']) }}" width="1" height="1" />
 						</form>
+						@else
+						<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+							<input type="hidden" name="cmd" value="_s-xclick" />
+							<input type="hidden" name="hosted_button_id" value="LXWAVD6P3ZSWG" />
+							<input type="image" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif']) }}" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
+							<img alt="" border="0" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypal.com/en_DE/i/scr/pixel.gif']) }}" width="1" height="1" />
+						</form>
+						@endif
 					</div>
 				</div>
 				<div class="section">