1 files changed, 23 insertions, 9 deletions
diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index bcff54c..461a9f1 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -4,18 +4,32 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 
-use crate::locale::{Language, escape, tr, trs};
-use jellycommon::routes::{
-    u_account_login, u_account_logout, u_account_register, u_account_settings, u_admin_dashboard,
-    u_home, u_items, u_node_slug, u_search, u_stats,
+use crate::{
+    CONF,
+    locale::{Language, escape, tr, trs},
+};
+use jellycommon::{
+    routes::{
+        u_account_login, u_account_logout, u_account_register, u_account_settings,
+        u_admin_dashboard, u_home, u_items, u_node_slug, u_search, u_stats,
+    },
+    user::User,
 };
 use markup::{Render, raw};
 use std::sync::LazyLock;
 
 static LOGO_ENABLED: LazyLock<bool> = LazyLock::new(|| CONF.asset_path.join("logo.svg").exists());
 
+pub struct RenderInfo {
+    pub session: Option<SessionInfo>,
+    pub importing: bool,
+}
+pub struct SessionInfo {
+    pub user: User,
+}
+
 markup::define! {
-    Scaffold<'a, Main: Render>(title: String, main: Main, class: &'a str, session: Option<Session>, lang: Language) {
+    Scaffold<'a, Main: Render>(title: String, main: Main, class: &'a str, renderinfo: RenderInfo, lang: Language) {
         @markup::doctype()
         html {
             head {
@@ -26,16 +40,16 @@ markup::define! {
             }
             body[class=class] {
                 nav {
-                    h1 { a[href=if session.is_some() {u_home()} else {"/".to_string()}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
-                    @if let Some(_) = session {
+                    h1 { a[href=if renderinfo.session.is_some() {u_home()} else {"/".to_string()}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
+                    @if let Some(_) = &renderinfo.session {
                         a.library[href=u_node_slug("library")] { @trs(lang, "nav.root") } " "
                         a.library[href=u_items()] { @trs(lang, "nav.all") } " "
                         a.library[href=u_search()] { @trs(lang, "nav.search") } " "
                         a.library[href=u_stats()] { @trs(lang, "nav.stats") } " "
+                        @if renderinfo.importing { span.warn { "Library database is updating..." } }
                     }
-                    @if is_importing() { span.warn { "Library database is updating..." } }
                     div.account {
-                        @if let Some(session) = session {
+                        @if let Some(session) = &renderinfo.session {
                             span { @raw(tr(*lang, "nav.username").replace("{name}", &format!("<b class=\"username\">{}</b>", escape(&session.user.display_name)))) } " "
                             @if session.user.admin {
                                 a.admin.hybrid_button[href=u_admin_dashboard()] { p {@trs(lang, "nav.admin")} } " "