From 1fe37023de6f6590a2cea83d5bdb6bf1ee9c90c7 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 9 Mar 2025 04:20:56 +0100
Subject: [PATCH] feat(settings): allow overriding static files

---
 jdav_web/jdav_web/settings/components/base.py              | 5 +++--
 .../members/templates/members/crisis_intervention_list.tex | 7 +++++--
 jdav_web/members/templates/members/seminar_report.tex      | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jdav_web/jdav_web/settings/components/base.py b/jdav_web/jdav_web/settings/components/base.py
index 8bcefb3..e546624 100644
--- a/jdav_web/jdav_web/settings/components/base.py
+++ b/jdav_web/jdav_web/settings/components/base.py
@@ -125,13 +125,14 @@ AUTH_PASSWORD_VALIDATORS = [
 
 STATIC_URL = '/static/'
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static")
+    os.path.join(CONFIG_DIR_PATH, "static"),
+    os.path.join(BASE_DIR, "static"),
 ]
 # static root where all the static files are collected to
 # use python3 manage.py collectstatic to collect static files in the STATIC_ROOT
 # this is needed for deployment
 STATIC_ROOT = get_var('django', 'static_root', default='/var/www/jdav_web/static')
-
+DEFAULT_STATIC_PATH = get_var('django', 'default_static_path', default='/app/jdav_web/static')
 
 # Locale files (translations)
 
diff --git a/jdav_web/members/templates/members/crisis_intervention_list.tex b/jdav_web/members/templates/members/crisis_intervention_list.tex
index d405ce7..dd15edf 100644
--- a/jdav_web/members/templates/members/crisis_intervention_list.tex
+++ b/jdav_web/members/templates/members/crisis_intervention_list.tex
@@ -1,4 +1,4 @@
-{% load tex_extras %}
+{% load static common tex_extras %}
 
 \documentclass[a4paper]{article}
 
@@ -49,7 +49,10 @@
 }
 \begin{document}
 % HEADER RIGHT
-\picpos{4.5cm}{12cm}{0cm}{/app/jdav_web/static/general/img/dav_logo_sektion.png}
+{% settings_value 'DEFAULT_STATIC_PATH' as static_root %}
+\picpos{4.5cm}{11.5cm}{0cm}{%
+{{ static_root }}/general/img/dav_logo_sektion.png%
+}
 \begin{textblock*}{5cm}(12cm, 2.3cm)
     \begin{flushright}
         \small
diff --git a/jdav_web/members/templates/members/seminar_report.tex b/jdav_web/members/templates/members/seminar_report.tex
index c9acc16..8a6420e 100644
--- a/jdav_web/members/templates/members/seminar_report.tex
+++ b/jdav_web/members/templates/members/seminar_report.tex
@@ -1,4 +1,4 @@
-{% load tex_extras %}
+{% load static common tex_extras %}
 
 \documentclass[a4paper]{article}
 
@@ -55,7 +55,10 @@
 }
 \begin{document}
 % HEADER RIGHT
-\picpos{4.5cm}{11.5cm}{0cm}{/app/jdav_web/static/general/img/dav_logo_sektion.png}
+{% settings_value 'DEFAULT_STATIC_PATH' as static_root %}
+\picpos{4.5cm}{11.5cm}{0cm}{%
+{{ static_root }}/general/img/dav_logo_sektion.png%
+}
 \begin{textblock*}{5cm}(11.5cm, 2.3cm)
     \begin{flushright}
         \small