Commit 4f9b1860 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '503-quicktips-neu-per-ajax' into 'development'

Fixes for 503-quicktips-neu-per-ajax

See merge request !1047
parents a6a23480 c274aded
...@@ -14,9 +14,15 @@ $(document).ready(function () { ...@@ -14,9 +14,15 @@ $(document).ready(function () {
if (localStorage.hasOwnProperty('param_sprueche')) { if (localStorage.hasOwnProperty('param_sprueche')) {
sprueche = localStorage.getItem('param_sprueche') === 'on'; // check for sprueche local storage parameter sprueche = localStorage.getItem('param_sprueche') === 'on'; // check for sprueche local storage parameter
} }
loadQuicktips('test', 'de', sprueche); // load the quicktips var search = getUrlParameter('eingabe');
var locale = readLocaleFromUrl('de');
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) { function getURLParameter(name) {
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [null, ''])[1].replace(/\+/g, '%20')) || null; return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [null, ''])[1].replace(/\+/g, '%20')) || null;
} }
......
...@@ -687,8 +687,9 @@ a { ...@@ -687,8 +687,9 @@ a {
.quicktip-summary { .quicktip-summary {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
h1 { h1 {
margin-right: 15px; margin: 0px;
} }
p { p {
margin: 5px; margin: 5px;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment