Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
f65936d3
Commit
f65936d3
authored
7 years ago
by
Karl Hasselbring
Browse files
Options
Downloads
Patches
Plain Diff
Fixed layout of donation quicktip
Fixed passing of locale parameter
parent
7f9ad588
No related branches found
No related tags found
1 merge request
!1365
Resolve "Filter Options for MetaGer"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/assets/js/scriptResultPage.js
+7
-2
7 additions, 2 deletions
resources/assets/js/scriptResultPage.js
resources/assets/less/metager/result-page.less
+2
-1
2 additions, 1 deletion
resources/assets/less/metager/result-page.less
with
9 additions
and
3 deletions
resources/assets/js/scriptResultPage.js
+
7
−
2
View file @
f65936d3
...
@@ -14,9 +14,14 @@ $(document).ready(function () {
...
@@ -14,9 +14,14 @@ $(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
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
)
{
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
;
}
}
...
@@ -552,7 +557,7 @@ function loadQuicktips (search, locale, sprueche) {
...
@@ -552,7 +557,7 @@ function loadQuicktips (search, locale, sprueche) {
getQuicktips
(
search
,
locale
,
blacklist
,
createQuicktips
);
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
* Requests quicktips from the quicktip server and passes them to the loadedHandler
...
...
This diff is collapsed.
Click to expand it.
resources/assets/less/metager/result-page.less
+
2
−
1
View file @
f65936d3
...
@@ -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: 15
px;
margin
: 0
px;
}
}
p {
p {
margin: 5px;
margin: 5px;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment