Merge branch 'dev' into 'main'

Update Main to 0.3.3 See merge request fair-ds/ap-4-2-demonstrator/ap-4.2-data-validation-and-quality-assurance-demonstrator!83

Merge branch 'dev' into 'main'
5292737d · Jonathan Hartman · fd431055 · 732725e1 · 5292737d · 5292737d
Commit 5292737d authored 1 year ago by Jonathan Hartman
--- a/src/fair_ds_ap42/static/templates/index.html.j2
+++ b/src/fair_ds_ap42/static/templates/index.html.j2
@@ -19,7 +19,7 @@
 </head>

 <body style="font-family:arial, sans-serif">
-	{{ build_navbar(navbar_links) }}
+	{{ build_navbar(navbar_links, root=True) }}

 	<div class="container-fluid">
 		<div class="row mt-5">

--- a/src/fair_ds_ap42/static/templates/navbar.html.j2
+++ b/src/fair_ds_ap42/static/templates/navbar.html.j2
-{% macro build_navbar(navbar_links) %}
+{% macro build_navbar(navbar_links, root=False) %}
 <div class="container">
 	<nav class="navbar navbar-expand-lg navbar-light bg-light">
-		<img src="../FAIR_DS_Logo_RGB.png" width="168" height="45" class="d-inline-block align-top" alt="">
+		<img src="{% if not root %}../{% endif %}FAIR_DS_Logo_RGB.png" width="168" height="45" class="d-inline-block align-top" alt="">

 		<div class="collapse navbar-collapse" id="navbarNavDropdown">
 			<ul class="navbar-nav mr-auto">
@@ -83,4 +83,4 @@
 		</div>
 	</nav>
 </div>
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}