diff --git a/misc/yaml_to_json.py b/misc/yaml_to_json.py index 1a7961a031923ed9280232dfec98d3a03e8c0e2a..a7d5bd62a7a1ccc50766b797ef6710466e9bee11 100755 --- a/misc/yaml_to_json.py +++ b/misc/yaml_to_json.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 import sys -import yaml import json +import yaml + with open(sys.argv[1], 'r') as infile: print(json.dumps(yaml.load(infile))) diff --git a/src/core/css/tour.css b/src/core/css/tour.css index 6fc9069fe2b8f885fc640015f10ee0eaf6c64582..3bb471369b698981f49858b8127652e957a11f8d 100644 --- a/src/core/css/tour.css +++ b/src/core/css/tour.css @@ -129,6 +129,7 @@ li.list-group-item > .btn { .popover { width: 100em; + color: initial; } /* Otherwise the pages would inherit their properties from the elements the diff --git a/src/core/js/tour.js b/src/core/js/tour.js index d798eb558266179483c7be7ebf37f5f083e78a1c..57b426818abf2da0d58b46db3ce5bd893721bcc4 100644 --- a/src/core/js/tour.js +++ b/src/core/js/tour.js @@ -481,8 +481,14 @@ var tour = new function() { $(button).css("right", - Math.abs($(button).outerWidth()) / 2); break; case "bottom": + wrapper.css("top", "100%"); + wrapper.css("left", "50%"); + wrapper.css("position", "absolute"); 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; case "bottom-left": sel.append(wrapper); @@ -493,8 +499,10 @@ var tour = new function() { wrapper.css("top", "50%"); wrapper.css("position", "absolute"); sel.prepend(wrapper); - $(button).css("top", - Math.abs($(button).outerHeight()) / 2); - $(button).css("left", - Math.abs($(button).outerWidth()) / 2); + $(button).css("margin-right", "5px"); + $(button).css("top", 0); + $(button).css("right", 0); + $(button).css("transform", "translate(0, -50%)"); break; default: // top-left @@ -691,9 +699,12 @@ var tour = new function() { /** * Initialize the tour. */ - this.init = async function _in() { + this.init = async function _in(refresh=false) { try { tour.debug("initializing tour module"); + if (refresh) { + localStorage.removeItem("tour_state"); + } await tour.load_tour(); tour.post_init(); } catch (error) { diff --git a/src/core/xsl/navbar.xsl b/src/core/xsl/navbar.xsl index 3f4b268cb8c210012567196d1a6b2e25b2259940..907f27e512250cf5fde0ff2fe93fe85f800428a6 100644 --- a/src/core/xsl/navbar.xsl +++ b/src/core/xsl/navbar.xsl @@ -55,7 +55,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand"> + <a class="navbar-brand" href="/"> <xsl:element name="img"> <xsl:if test="'${BUILD_NAVBAR_BRAND_NAME}' != ''"> <xsl:attribute name="class">caosdb-logo</xsl:attribute>