Update to better support theming with any or all values. Update to su…

…pport full and relative logo urls.
nebari-dev · May 14, 2024 · f660ab6 · f660ab6
1 parent c381523
commit f660ab6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/self-registration/app/main.py b/self-registration/app/main.py
@@ -124,7 +124,11 @@ def assign_user_to_group(user, group_name):
 
 
 def get_theme():
-    return config.get("theme", DEFAULT_THEME)
+    theme = config.get("theme", {})
+    if theme:
+        return {**DEFAULT_THEME, **theme}
+    else:
+        return DEFAULT_THEME
 
 
 def get_template_context(request: Request, error_message: str = None):

diff --git a/self-registration/app/templates/base.html b/self-registration/app/templates/base.html
@@ -3,17 +3,25 @@
   <head>
     <title>Self Registration</title>
     <script src="https://cdn.tailwindcss.com"></script>
+    {% if favicon.startswith('/') %}
     <link rel="icon" type="image/x-icon" href="{{ url_prefix }}{{ favicon }}" />
+    {% else %}
+    <link rel="icon" type="image/x-icon" href="{{ favicon }}" />
+    {% endif %}
     <style type="text/css">
       {% include 'styles.css' %}
     </style>
     {% block head %}{% endblock %}
   </head>
   <body>
     <header class="flex content-center">
-      <a href="{{ url_prefix }}"
-        ><img src="{{ url_prefix }}{{ logo }}" alt="logo"
-      /></a>
+      <a href="{{ url_prefix }}">
+        {% if logo.startswith('/') %}
+        <img src="{{ url_prefix }}{{ logo }}" alt="logo" />
+        {% else %}
+        <img src="{{ logo }}" alt="logo" />
+        {% endif %}
+      </a>
     </header>
     <div class="container flex justify-center">
       {% block content %}{% endblock %}