Web UI - fixing URLs

mupif · Jul 2, 2024 · fb6c720 · fb6c720
1 parent 203b2cf
commit fb6c720
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/webapi/index.py b/webapi/index.py
@@ -179,7 +179,7 @@ def getUserHasAdminRights():
 
 def my_render_template(*args,**kw):
     'Wraps render_template and ads a few common keywords'
-    return render_template(*args, title='MuPIFDB web interface', server=request.host_url, RESTserver=RESTserver, projectLogoUrl=PROJECT_LOGO_URL, **kw)
+    return render_template(*args, title='MuPIFDB web interface', server=BASE_URL, RESTserver=RESTserver, projectLogoUrl=PROJECT_LOGO_URL, **kw)
 
 
 def login_header_html():

diff --git a/webapi/templates/stat.html b/webapi/templates/stat.html
@@ -1,4 +1,5 @@
 {% extends "layout.html" %}
+{% block projectLogoUrl %} {{ projectLogoUrl }} {% endblock %}
 {% block head %}
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.bundle.min.js " integrity="sha256-XF29CBwU1MWLaGEnsELogU6Y6rcc5nCkhhx89nFMIDQ=" crossorigin=" anonymous "></script>

diff --git a/webapi/templates/workflows.html b/webapi/templates/workflows.html
@@ -1,6 +1,7 @@
 {% extends "layout.html" %}
 {% block title %} {{ title }} {% endblock %}
 {% block login %} {{ login }} {% endblock %}
+{% block projectLogoUrl %} {{ projectLogoUrl }} {% endblock %}
 {% block content %}
 <h3>List of workflows</h3>
 <table class="tableType1">
@@ -11,7 +12,7 @@ <h3>List of workflows</h3>
        <TD class="c2">{{item.UseCase}}</TD>
        <TD class="c3">{{item.Description}}</TD>
 
-       <TD class="c4"><a href="{{ [server,'workflows/', item.wid] | join }}">link</a></TD>
+       <TD class="c4"><a href="{{ [server,'/workflows/', item.wid] | join }}">link</a></TD>
     </TR>
     {% endfor %}
     </table>