From f65936d3e5fc40e81fdb24ac5af8eee9729310b2 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 26 Sep 2017 13:19:02 +0200
Subject: [PATCH] Fixed layout of donation quicktip Fixed passing of locale
parameter
---
resources/assets/js/scriptResultPage.js | 9 +++++++--
resources/assets/less/metager/result-page.less | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/resources/assets/js/scriptResultPage.js b/resources/assets/js/scriptResultPage.js
index 0209e4d65..e06c03098 100644
--- a/resources/assets/js/scriptResultPage.js
+++ b/resources/assets/js/scriptResultPage.js
@@ -14,9 +14,14 @@ $(document).ready(function () {
if (localStorage.hasOwnProperty('param_sprueche')) {
sprueche = localStorage.getItem('param_sprueche') === 'on'; // check for sprueche local storage parameter
}
- loadQuicktips('test', 'de', sprueche); // load the quicktips
+ var locale = readLocaleFromUrl('de');
+ loadQuicktips('test', 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;
}
@@ -552,7 +557,7 @@ function loadQuicktips (search, locale, sprueche) {
getQuicktips(search, locale, blacklist, createQuicktips);
}
-const QUICKTIP_SERVER = 'http://localhost:63825';
+const QUICKTIP_SERVER = 'http://quicktips.metager3.de:63825';
/**
* Requests quicktips from the quicktip server and passes them to the loadedHandler
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index ee7e5bb64..7fbd4eef4 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -687,8 +687,9 @@ a {
.quicktip-summary {
display: flex;
justify-content: space-between;
+ align-items: center;
h1 {
- margin-right: 15px;
+ margin: 0px;
}
p {
margin: 5px;
--
GitLab