diff --git a/authentik/core/templates/base/skeleton.html b/authentik/core/templates/base/skeleton.html index d302984ad..da5ef7786 100644 --- a/authentik/core/templates/base/skeleton.html +++ b/authentik/core/templates/base/skeleton.html @@ -9,14 +9,14 @@ {% block title %}{% trans title|default:config.authentik.branding.title %}{% endblock %} - - - - - - - - + + + + + + + + {% block head %} {% endblock %} diff --git a/authentik/lib/config.py b/authentik/lib/config.py index 5565b34d9..5e9f912a6 100644 --- a/authentik/lib/config.py +++ b/authentik/lib/config.py @@ -5,13 +5,15 @@ from contextlib import contextmanager from glob import glob from json import dumps from time import time -from typing import Any, Dict +from typing import Any from urllib.parse import urlparse import yaml from django.conf import ImproperlyConfigured from django.http import HttpRequest +from authentik import __version__ + SEARCH_PATHS = ["authentik/lib/default.yml", "/etc/authentik/config.yml", ""] + glob( "/etc/authentik/config.d/*.yml", recursive=True ) @@ -19,10 +21,9 @@ ENV_PREFIX = "AUTHENTIK" ENVIRONMENT = os.getenv(f"{ENV_PREFIX}_ENV", "local") -def context_processor(request: HttpRequest) -> Dict[str, Any]: +def context_processor(request: HttpRequest) -> dict[str, Any]: """Context Processor that injects config object into every template""" - kwargs = {"config": CONFIG.raw} - return kwargs + return {"config": CONFIG.raw, "ak_version": __version__} class ConfigLoader: diff --git a/web/src/elements/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts index 8739162c5..0a61b2931 100644 --- a/web/src/elements/notifications/NotificationDrawer.ts +++ b/web/src/elements/notifications/NotificationDrawer.ts @@ -34,7 +34,8 @@ export class NotificationDrawer extends LitElement { } renderItem(item: Notification): TemplateResult { - const delta = Date.now() - parseInt(item.created, 10); + const delta = Date.now() - (parseInt(item.created, 10) * 1000); + // TODO: more flexible display, minutes and seconds const age = `${Math.round(delta / 1000 / 3600)} Hours ago`; let level = ""; switch (item.severity) { @@ -60,7 +61,7 @@ export class NotificationDrawer extends LitElement {
- ${item.body.substring(0, 75)} + ${item.body}
${age}