loading text on form submit

2 files changed, 20 insertions, 6 deletions

diff --git a/ui/src/components/login.rs b/ui/src/components/login.rs
index 7d19a38..0098c8d 100644
--- a/ui/src/components/login.rs
+++ b/ui/src/components/login.rs
@@ -29,7 +29,11 @@ markup::define! {
             label[for="display_name"] { @tr(ri.lang, "account.display_name") }
             input[type="text", id="display_name", name="display_name"]; br;
 
-            input[type="submit", value=tr(ri.lang, "account.login.submit")];
+            input[
+                type="submit",
+                value=tr(ri.lang, "account.login.set_password.submit"),
+                "data-loading-text"=tr(ri.lang, "account.login.submit.loading")
+            ];
         }
     }
     AccountLogin<'a>(ri: &'a RenderInfo<'a>) {
@@ -41,13 +45,21 @@ markup::define! {
             label[for="password"] { @tr(ri.lang, "account.password") }
             input[type="password", id="password", name="password"]; br;
 
-            input[type="submit", value=tr(ri.lang, if ri.user.is_some() { "account.login.submit.switch" } else { "account.login.submit" })];
+            input[
+                type="submit",
+                value=tr(ri.lang, if ri.user.is_some() { "account.login.submit.switch" } else { "account.login.submit" }),
+                "data-loading-text"=tr(ri.lang, if ri.user.is_some() { "account.login.submit.switch.loading" } else { "account.login.submit.loading" })
+            ];
         }
     }
     AccountLogout<'a>(ri: &'a RenderInfo<'a>) {
         form.account[method="POST", action=""] {
             h1 { @tr(ri.lang, "account.logout") }
-            input[type="submit", value=tr(ri.lang, "account.logout.submit")];
+            input[
+                type="submit",
+                value=tr(ri.lang, "account.logout.submit"),
+                "data-loading-text"=tr(ri.lang, "account.logout.submit.loading")
+            ];
         }
     }
 }
diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index 40d595b..a3f0c8e 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -31,10 +31,12 @@ markup::define! {
             @let hue = ri.user.and_then(|u| u.get(USER_THEME_ACCENT)).unwrap_or(277);
             body[class=format!("theme-{theme}"), style=format!("--accent-hue: {hue}")] {
                 @Navbar { ri }
-                @if let Some((kind, text)) = ri.message {
-                    @Message { ri, kind, text }
+                #main {
+                    @if let Some((kind, text)) = ri.message {
+                        @Message { ri, kind, text }
+                    }
+                    @page.render()
                 }
-                #main { @page.render() }
                 footer {
                     p { @ri.config.brand " - " @ri.config.slogan " | powered by " a[href="https://codeberg.org/metamuffin/jellything"]{"Jellything"} }
                 }