From fac3337237aec18bc3e341aa96446892df4eb7b9 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 14 Apr 2023 15:03:41 +0200
Subject: [PATCH] Make symbol scu (sco_utils) available to all templates.

---
 app/scodoc/sco_utils.py | 4 +++-
 app/templates/base.j2   | 4 ++--
 scodoc.py               | 7 +++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py
index 14f6aa6340..ffd87dc139 100644
--- a/app/scodoc/sco_utils.py
+++ b/app/scodoc/sco_utils.py
@@ -63,7 +63,9 @@ from app.scodoc import sco_xml
 import sco_version
 
 # le répertoire static, lié à chaque release pour éviter les problèmes de caches
-STATIC_DIR = "/ScoDoc/static/links/" + sco_version.SCOVERSION
+STATIC_DIR = (
+    os.environ.get("SCRIPT_NAME", "") + "/ScoDoc/static/links/" + sco_version.SCOVERSION
+)
 
 # ----- CALCUL ET PRESENTATION DES NOTES
 NOTES_PRECISION = 1e-4  # evite eventuelles erreurs d'arrondis
diff --git a/app/templates/base.j2 b/app/templates/base.j2
index c55f870380..99fe4eee93 100644
--- a/app/templates/base.j2
+++ b/app/templates/base.j2
@@ -3,8 +3,8 @@
 
 {% block styles %}
 {{super()}}
-<link rel="stylesheet" href="{{ url_for('scodoc.index') }}/ScoDoc/static/css/scodoc.css">
-<link rel="stylesheet" href="{{ url_for('scodoc.index') }}/ScoDoc/static/css/entreprises.css">
+<link rel="stylesheet" href="{{ scu.STATIC_DIR }}/ScoDoc/static/css/scodoc.css">
+<link rel="stylesheet" href="{{ scu.STATIC_DIR }}/ScoDoc/static/css/entreprises.css">
 {% endblock %}
 
 {% block title %}
diff --git a/scodoc.py b/scodoc.py
index 1640f9071a..2fd0f9a2e3 100755
--- a/scodoc.py
+++ b/scodoc.py
@@ -46,6 +46,7 @@ from app.scodoc import sco_dump_db
 from app.scodoc.sco_logos import make_logo_local
 from app.scodoc.sco_permissions import Permission
 from app.views import notes, scolar
+import app.scodoc.sco_utils as scu
 import tools
 from tools.fakedatabase import create_test_api_database
 
@@ -55,6 +56,12 @@ app = create_app(RunningConfig)
 cli.register(app)
 
 
+@app.context_processor
+def inject_sco_utils():
+    "Make scu available in all Jinja templates"
+    return dict(scu=scu)
+
+
 @app.shell_context_processor
 def make_shell_context():
     import numpy as np