Branding

jdavid · jdavid · commit 8ec8827c7865 · 2025-05-01T10:48:29.000+02:00
diff --git a/caterva2/services/sub.py b/caterva2/services/sub.py
@@ -501,19 +501,16 @@ def url(path: str) -> str:
 
 
 def brand_logo():
-    path = "media/brand/logo.webp"
-    if (BASE_DIR / path).exists():
-        return url(path)
+    path = "media/logo.webp"
+    if not (settings.statedir / path).exists():
+        path = "static/logo-caterva2-horizontal-small.webp"
 
-    return url("static/logo-caterva2-horizontal-small.webp")
+    return url(path)
 
 
 templates = Jinja2Templates(directory=BASE_DIR / "templates")
 templates.env.filters["filesizeformat"] = custom_filesizeformat
 templates.env.globals["url"] = url
-templates.env.globals["brand"] = {
-    "logo": brand_logo(),
-}
 
 
 # Add CSS/JS to templates namespace
@@ -2503,7 +2500,6 @@ async def jupyter_heartbeat():
 #
 
 app.mount("/static", StaticFiles(directory=BASE_DIR / "static"), name="static")
-app.mount("/media", StaticFiles(directory=BASE_DIR / "media"), name="media")
 
 
 #
@@ -2567,6 +2563,14 @@ def main():
     plugins[tomography.contenttype] = tomography
     tomography.init(abspath_and_dataprep, settings.urlbase)
 
+    # Mount media
+    media = settings.statedir / "media"
+    media.mkdir(exist_ok=True, parents=True)
+    app.mount("/media", StaticFiles(directory=media), name="media")
+    templates.env.globals["brand"] = {
+        "logo": brand_logo(),
+    }
+
     # Run
     root_path = str(furl.furl(settings.urlbase).path)
     srv_utils.uvicorn_run(app, args, root_path=root_path)
diff --git a/caterva2/services/templates/base_anon.html b/caterva2/services/templates/base_anon.html
@@ -11,7 +11,7 @@
 <body class="vh-100 d-flex align-items-center">
     <main class="card m-auto" style="width: 450px" id="page-login">
         <div class="card-body">
-            <img src="{{ brand.logo }}" alt="Caterva2 logo" id="logo" class="mb-4">
+            <img src="{{ brand.logo }}" alt="Logo" id="logo" class="mb-4">
             {% block main %}
             {% endblock %}
         </div>
diff --git a/caterva2/services/templates/logout.html b/caterva2/services/templates/logout.html
@@ -3,6 +3,6 @@
 {% block title %}User logout{% endblock %}
 
 {% block main %}
-    <p>Thanks for using Caterva2</p>
+    <p>Have a good day!</p>
     <a href="{{ url('login') }}">Return to sign in</a>
 {% endblock %}
diff --git a/caterva2/services/templates/root_list.html b/caterva2/services/templates/root_list.html
@@ -1,5 +1,5 @@
 <a href="{{ url('') }}" class="mx-2">
-    <img src="{{ brand.logo }}" alt="Caterva2 logo" id="logo">
+    <img src="{{ brand.logo }}" alt="Logo" id="logo">
 </a>
 
 <form hx-get="{{ url('htmx/path-list/') }}"
