Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-webui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-webui
Commits
e8b9d0ca
Verified
Commit
e8b9d0ca
authored
5 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into f-revision-module
parents
9463114b
b527c1d6
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
misc/yaml_to_json.py
+2
-1
2 additions, 1 deletion
misc/yaml_to_json.py
src/core/css/tour.css
+1
-0
1 addition, 0 deletions
src/core/css/tour.css
src/core/js/tour.js
+15
-4
15 additions, 4 deletions
src/core/js/tour.js
src/core/xsl/navbar.xsl
+1
-1
1 addition, 1 deletion
src/core/xsl/navbar.xsl
with
19 additions
and
6 deletions
misc/yaml_to_json.py
+
2
−
1
View file @
e8b9d0ca
#!/usr/bin/env python3
#!/usr/bin/env python3
import
sys
import
sys
import
yaml
import
json
import
json
import
yaml
with
open
(
sys
.
argv
[
1
],
'
r
'
)
as
infile
:
with
open
(
sys
.
argv
[
1
],
'
r
'
)
as
infile
:
print
(
json
.
dumps
(
yaml
.
load
(
infile
)))
print
(
json
.
dumps
(
yaml
.
load
(
infile
)))
This diff is collapsed.
Click to expand it.
src/core/css/tour.css
+
1
−
0
View file @
e8b9d0ca
...
@@ -129,6 +129,7 @@ li.list-group-item > .btn {
...
@@ -129,6 +129,7 @@ li.list-group-item > .btn {
.popover
{
.popover
{
width
:
100em
;
width
:
100em
;
color
:
initial
;
}
}
/* Otherwise the pages would inherit their properties from the elements the
/* Otherwise the pages would inherit their properties from the elements the
...
...
This diff is collapsed.
Click to expand it.
src/core/js/tour.js
+
15
−
4
View file @
e8b9d0ca
...
@@ -481,8 +481,14 @@ var tour = new function() {
...
@@ -481,8 +481,14 @@ var tour = new function() {
$
(
button
).
css
(
"
right
"
,
-
Math
.
abs
(
$
(
button
).
outerWidth
())
/
2
);
$
(
button
).
css
(
"
right
"
,
-
Math
.
abs
(
$
(
button
).
outerWidth
())
/
2
);
break
;
break
;
case
"
bottom
"
:
case
"
bottom
"
:
wrapper
.
css
(
"
top
"
,
"
100%
"
);
wrapper
.
css
(
"
left
"
,
"
50%
"
);
wrapper
.
css
(
"
position
"
,
"
absolute
"
);
sel
.
append
(
wrapper
);
sel
.
append
(
wrapper
);
$
(
button
).
css
(
"
bottom
"
,
-
Math
.
abs
(
$
(
button
).
outerHeight
())
/
2
);
$
(
button
).
css
(
"
margin-top
"
,
"
5px
"
);
$
(
button
).
css
(
"
top
"
,
0
);
$
(
button
).
css
(
"
left
"
,
0
);
$
(
button
).
css
(
"
transform
"
,
"
translate(-50%, 0)
"
);
break
;
break
;
case
"
bottom-left
"
:
case
"
bottom-left
"
:
sel
.
append
(
wrapper
);
sel
.
append
(
wrapper
);
...
@@ -493,8 +499,10 @@ var tour = new function() {
...
@@ -493,8 +499,10 @@ var tour = new function() {
wrapper
.
css
(
"
top
"
,
"
50%
"
);
wrapper
.
css
(
"
top
"
,
"
50%
"
);
wrapper
.
css
(
"
position
"
,
"
absolute
"
);
wrapper
.
css
(
"
position
"
,
"
absolute
"
);
sel
.
prepend
(
wrapper
);
sel
.
prepend
(
wrapper
);
$
(
button
).
css
(
"
top
"
,
-
Math
.
abs
(
$
(
button
).
outerHeight
())
/
2
);
$
(
button
).
css
(
"
margin-right
"
,
"
5px
"
);
$
(
button
).
css
(
"
left
"
,
-
Math
.
abs
(
$
(
button
).
outerWidth
())
/
2
);
$
(
button
).
css
(
"
top
"
,
0
);
$
(
button
).
css
(
"
right
"
,
0
);
$
(
button
).
css
(
"
transform
"
,
"
translate(0, -50%)
"
);
break
;
break
;
default
:
default
:
// top-left
// top-left
...
@@ -691,9 +699,12 @@ var tour = new function() {
...
@@ -691,9 +699,12 @@ var tour = new function() {
/**
/**
* Initialize the tour.
* Initialize the tour.
*/
*/
this
.
init
=
async
function
_in
()
{
this
.
init
=
async
function
_in
(
refresh
=
false
)
{
try
{
try
{
tour
.
debug
(
"
initializing tour module
"
);
tour
.
debug
(
"
initializing tour module
"
);
if
(
refresh
)
{
localStorage
.
removeItem
(
"
tour_state
"
);
}
await
tour
.
load_tour
();
await
tour
.
load_tour
();
tour
.
post_init
();
tour
.
post_init
();
}
catch
(
error
)
{
}
catch
(
error
)
{
...
...
This diff is collapsed.
Click to expand it.
src/core/xsl/navbar.xsl
+
1
−
1
View file @
e8b9d0ca
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
</button>
</button>
<a
class=
"navbar-brand"
>
<a
class=
"navbar-brand"
href=
"/"
>
<xsl:element
name=
"img"
>
<xsl:element
name=
"img"
>
<xsl:if
test=
"'${BUILD_NAVBAR_BRAND_NAME}' != ''"
>
<xsl:if
test=
"'${BUILD_NAVBAR_BRAND_NAME}' != ''"
>
<xsl:attribute
name=
"class"
>
caosdb-logo
</xsl:attribute>
<xsl:attribute
name=
"class"
>
caosdb-logo
</xsl:attribute>
...
...
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