Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
4f9b1860
Commit
4f9b1860
authored
Sep 26, 2017
by
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
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
resources/assets/js/scriptResultPage.js
View file @
4f9b1860
...
...
@@ -14,9 +14,15 @@ $(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
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
)
{
return
decodeURIComponent
((
new
RegExp
(
'
[?|&]
'
+
name
+
'
=
'
+
'
([^&;]+?)(&|#|;|$)
'
).
exec
(
location
.
search
)
||
[
null
,
''
])[
1
].
replace
(
/
\+
/g
,
'
%20
'
))
||
null
;
}
...
...
resources/assets/less/metager/result-page.less
View file @
4f9b1860
...
...
@@ -687,8 +687,9 @@ a {
.quicktip-summary {
display: flex;
justify-content: space-between;
align-items: center;
h1 {
margin
-right: 15
px;
margin
: 0
px;
}
p {
margin: 5px;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment