From 445d854af19249abbcc4d7567646fc59f9fa9c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi@yaal.coop>
Date: Fri, 22 Dec 2023 18:00:07 +0100
Subject: [PATCH] feat: THEME can be a relative path

---
 CHANGES.rst                           | 4 ++++
 canaille/app/themes.py                | 2 +-
 canaille/config.sample.toml           | 2 +-
 demo/conf-docker/canaille-ldap.toml   | 2 +-
 demo/conf-docker/canaille-memory.toml | 2 +-
 demo/conf-docker/canaille-sql.toml    | 2 +-
 demo/conf/canaille-ldap.toml          | 2 +-
 demo/conf/canaille-memory.toml        | 2 +-
 demo/conf/canaille-sql.toml           | 2 +-
 doc/configuration.rst                 | 2 +-
 10 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 44b12bbd..2b98f021 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,10 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
 [0.0.39] - 2023-12-15
 =====================
 
+Added
+*****
+- ``THEME`` can be a relative path
+
 Fixed
 *****
 
diff --git a/canaille/app/themes.py b/canaille/app/themes.py
index c613e1ba..4f9c5ede 100644
--- a/canaille/app/themes.py
+++ b/canaille/app/themes.py
@@ -13,7 +13,7 @@ if flask_themer:
 
     def setup_themer(app):
         additional_themes_dir = (
-            os.path.dirname(app.config["THEME"])
+            os.path.abspath(os.path.dirname(app.config["THEME"]))
             if app.config.get("THEME") and os.path.exists(app.config["THEME"])
             else None
         )
diff --git a/canaille/config.sample.toml b/canaille/config.sample.toml
index 0c02b5eb..bd0f85b9 100644
--- a/canaille/config.sample.toml
+++ b/canaille/config.sample.toml
@@ -17,7 +17,7 @@ SECRET_KEY = "change me before you go in production"
 # Your favicon. If unset the LOGO will be used.
 # FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/demo/conf-docker/canaille-ldap.toml b/demo/conf-docker/canaille-ldap.toml
index 848d6c71..87e2228b 100644
--- a/demo/conf-docker/canaille-ldap.toml
+++ b/demo/conf-docker/canaille-ldap.toml
@@ -17,7 +17,7 @@ LOGO = "/static/img/canaille-head.webp"
 # Your favicon. If unset the LOGO will be used.
 FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/demo/conf-docker/canaille-memory.toml b/demo/conf-docker/canaille-memory.toml
index 6a19fa0b..e2c472c7 100644
--- a/demo/conf-docker/canaille-memory.toml
+++ b/demo/conf-docker/canaille-memory.toml
@@ -17,7 +17,7 @@ LOGO = "/static/img/canaille-head.webp"
 # Your favicon. If unset the LOGO will be used.
 FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/demo/conf-docker/canaille-sql.toml b/demo/conf-docker/canaille-sql.toml
index 8ce5875a..8129e01a 100644
--- a/demo/conf-docker/canaille-sql.toml
+++ b/demo/conf-docker/canaille-sql.toml
@@ -17,7 +17,7 @@ LOGO = "/static/img/canaille-head.webp"
 # Your favicon. If unset the LOGO will be used.
 FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/demo/conf/canaille-ldap.toml b/demo/conf/canaille-ldap.toml
index 8b90e029..fa6c6a80 100644
--- a/demo/conf/canaille-ldap.toml
+++ b/demo/conf/canaille-ldap.toml
@@ -17,7 +17,7 @@ LOGO = "/static/img/canaille-head.webp"
 # Your favicon. If unset the LOGO will be used.
 FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/demo/conf/canaille-memory.toml b/demo/conf/canaille-memory.toml
index 1ab33cd9..88633ad1 100644
--- a/demo/conf/canaille-memory.toml
+++ b/demo/conf/canaille-memory.toml
@@ -17,7 +17,7 @@ LOGO = "/static/img/canaille-head.webp"
 # Your favicon. If unset the LOGO will be used.
 FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/demo/conf/canaille-sql.toml b/demo/conf/canaille-sql.toml
index f87a7383..4307761b 100644
--- a/demo/conf/canaille-sql.toml
+++ b/demo/conf/canaille-sql.toml
@@ -17,7 +17,7 @@ LOGO = "/static/img/canaille-head.webp"
 # Your favicon. If unset the LOGO will be used.
 FAVICON = "/static/img/canaille-c.webp"
 
-# The name of a theme in the 'theme' directory, or an absolute path
+# The name of a theme in the 'theme' directory, or a path path
 # to a theme. Defaults to 'default'. Theming is done with
 # https://github.com/tktech/flask-themer
 # THEME = "default"
diff --git a/doc/configuration.rst b/doc/configuration.rst
index ecb3ef3c..2462555c 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -38,7 +38,7 @@ Canaille is based on Flask, so any `flask configuration <https://flask.palletspr
 
 :THEME:
     *Optional.* The name or the path to a canaille theme.
-    If the value is just a name, the theme should be in a directory with that namein the *themes* directory.
+    If the value is just a name, the theme should be in a directory with that name in the *themes* directory.
 
 :LANGUAGE:
     *Optional.* The locale code of the language to use. If not set, the language of the browser will be used.