more ui refactor

1 files changed, 12 insertions, 16 deletions

diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index 0962f6e..8b96f9f 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -6,7 +6,7 @@
 
 use crate::{
     CONF, FlashM,
-    locale::{escape, tr, trs},
+    locale::{escape, tr},
 };
 use jellycommon::{
     jellyobject::{Object, Tag},
@@ -26,10 +26,6 @@ pub struct RenderInfo<'a> {
     pub status_message: Option<&'a str>,
 }
 
-pub struct SessionInfo {
-    pub user: User,
-}
-
 markup::define! {
     Scaffold<'a, Main: Render>(ri: &'a RenderInfo<'a>, title: String, main: Main, class: &'a str) {
         @markup::doctype()
@@ -54,23 +50,23 @@ markup::define! {
         nav {
             h1 { a[href=if ri.user.is_some() {u_home()} else {"/".to_string()}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
             @if ri.user.is_some() {
-                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 { @trs(lang, "nav.importing") } }
+                a.library[href=u_node_slug("library")] { @tr(ri.lang, "nav.root") } " "
+                a.library[href=u_items()] { @tr(ri.lang, "nav.all") } " "
+                a.library[href=u_search()] { @tr(ri.lang, "nav.search") } " "
+                a.library[href=u_stats()] { @tr(ri.lang, "nav.stats") } " "
+                @if let Some(m) = ri.status_message { span.warn { @tr(ri.lang, m) } }
             }
             div.account {
                 @if let Some(user) = &ri.user {
-                    span { @raw(tr(*lang, "nav.username").replace("{name}", &format!("<b class=\"username\">{}</b>", escape(&session.user.display_name)))) } " "
+                    span { @raw(tr(ri.lang, "nav.username").replace("{name}", &format!("<b class=\"username\">{}</b>", escape(&ri.user.display_name)))) } " "
                     @if session.user.admin {
-                        a.admin.hybrid_button[href=u_admin_dashboard()] { p {@trs(lang, "nav.admin")} } " "
+                        a.admin.hybrid_button[href=u_admin_dashboard()] { p {@tr(ri.lang, "nav.admin")} } " "
                     }
-                    a.settings.hybrid_button[href=u_account_settings()] { p {@trs(lang, "nav.settings")} } " "
-                    a.logout.hybrid_button[href=u_account_logout()] { p {@trs(lang, "nav.logout")} }
+                    a.settings.hybrid_button[href=u_account_settings()] { p {@tr(ri.lang, "nav.settings")} } " "
+                    a.logout.hybrid_button[href=u_account_logout()] { p {@tr(ri.lang, "nav.logout")} }
                 } else {
-                    a.register.hybrid_button[href=u_account_register()] { p {@trs(lang, "nav.register")} } " "
-                    a.login.hybrid_button[href=u_account_login()] { p {@trs(lang, "nav.login")} }
+                    a.register.hybrid_button[href=u_account_register()] { p {@tr(ri.lang, "nav.register")} } " "
+                    a.login.hybrid_button[href=u_account_login()] { p {@tr(ri.lang, "nav.login")} }
                 }
             }
         }