Merge with development

resources/assets/js/scriptResultPage.js

@@ -10,23 +10,30 @@ $(document).ready(function () {
     $($('#foki > li#savedFokiTabSelector').get(0)).find('>a').tab('show');
   }
 
-  var sprueche = getURLParameter('sprueche') === 'on'; // load the sprueche url parameter
   if (localStorage.hasOwnProperty('param_sprueche')) {
-    sprueche = localStorage.getItem('param_sprueche') === 'on'; // check for sprueche local storage parameter
+    var sprueche = localStorage.getItem('param_sprueche') === 'on'; // check for sprueche local storage parameter
+  } else {
+    var sprueche = getURLParameter('sprueche') === 'on'; // load the sprueche url parameter
   }
-  var search = getURLParameter('eingabe');
-  var locale = readLocaleFromUrl('de');
+  var search = getMetaTag('q');
+  var locale = getMetaTag('l');
   loadQuicktips(search, locale, sprueche); // load the quicktips
 });
 
+/*
 function readLocaleFromUrl (defaultLocale) {
   return location.pathname.substr(1, location.pathname.indexOf('/meta', 0) - 1) || 'de';
 }
+*/
 
 function getURLParameter (name) {
   return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [null, ''])[1].replace(/\+/g, '%20')) || null;
 }
 
+function getMetaTag(name) {
+  return $('meta[name="' + name + '"')[0].content;
+}
+
 function activateJSOnlyContent () {
   $('#searchplugin').removeClass('hide');
   $('.js-only').removeClass('js-only');

resources/assets/less/metager/result-page.less

@@ -660,6 +660,13 @@ a {
         margin: 10px 0px;
         padding-left: 10px;
         border-left: 3px solid #fb0;
+        details:not([open=""]) {
+            .quicktip-summary p {
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
         .quicktip-summary {
             h1 {
                 font-size: 16px;

resources/views/layouts/resultPage.blade.php

@@ -5,8 +5,9 @@
 		<link href="/favicon.ico" rel="icon" type="image/x-icon" />
 		<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
 		<meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
-		<meta content="{{ getmypid() }}" name="p" />
-		<meta content="{{ $eingabe }}" name="q" />
+		<meta name="p" content="{{ getmypid() }}" />
+		<meta name="q" content="{{ $eingabe }}" />
+		<meta name="l" content="{{ LaravelLocalization::getCurrentLocale() }}" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
 		<meta http-equiv="language" content="{!! trans('staticPages.meta.language') !!}" />