diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/src/components/login.rs | 25 | ||||
| -rw-r--r-- | ui/src/components/mod.rs | 4 | ||||
| -rw-r--r-- | ui/src/components/node_page.rs | 6 |
3 files changed, 20 insertions, 15 deletions
diff --git a/ui/src/components/login.rs b/ui/src/components/login.rs index c54a541..d291165 100644 --- a/ui/src/components/login.rs +++ b/ui/src/components/login.rs @@ -4,32 +4,37 @@ Copyright (C) 2026 metamuffin <metamuffin.org> */ +use jellycommon::{SETPW_PASSWORD, SETPW_USERNAME, jellyobject::Object}; use jellyui_locale::tr; use crate::RenderInfo; markup::define! { - AccountSetPassword<'a>(ri: &'a RenderInfo<'a>, session: &'a str) { + AccountSetPassword<'a>(ri: &'a RenderInfo<'a>, data: Object<'a>) { form.account[method="POST", action=""] { - h1 { @tr(ri.lang, "account.set_password") } - input[type="text", name="session", hidden, value=session]; br; + h1 { @tr(ri.lang, "account.login.set_password") } + p { @tr(ri.lang, "account.login.set_password.par") } - label[for="inp-password"] { @tr(ri.lang, "account.password") } - input[type="password", id="inp-password", name="password"]; br; + input[type="hidden", name="username", value=data.get(SETPW_USERNAME)]; + input[type="hidden", name="password", value=data.get(SETPW_PASSWORD)]; - input[type="submit", value=tr(ri.lang, "account.register.submit")]; + label[for="password"] { @tr(ri.lang, "account.new_password") } + input[type="password", id="password", name="new_password"]; br; + 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")]; } } AccountLogin<'a>(ri: &'a RenderInfo<'a>) { form.account[method="POST", action=""] { h1 { @tr(ri.lang, "account.login") } - label[for="inp-username"] { @tr(ri.lang, "account.username") } - input[type="text", id="inp-username", name="username"]; br; - label[for="inp-password"] { @tr(ri.lang, "account.password") } - input[type="password", id="inp-password", name="password"]; br; + label[for="username"] { @tr(ri.lang, "account.username") } + input[type="text", id="username", name="username"]; br; + 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" })]; } diff --git a/ui/src/components/mod.rs b/ui/src/components/mod.rs index 5460090..d87efab 100644 --- a/ui/src/components/mod.rs +++ b/ui/src/components/mod.rs @@ -49,8 +49,8 @@ define! { @if let Some(()) = view.get(VIEW_ACCOUNT_LOGOUT) { @AccountLogout{ ri } } - @if let Some(session) = view.get(VIEW_ACCOUNT_SET_PASSWORD) { - @AccountSetPassword { ri, session } + @if let Some(data) = view.get(VIEW_ACCOUNT_SET_PASSWORD) { + @AccountSetPassword { ri, data } } @if let Some(()) = view.get(VIEW_ADMIN_DASHBOARD) { @AdminDashboard { ri } diff --git a/ui/src/components/node_page.rs b/ui/src/components/node_page.rs index 53534cf..f40aa73 100644 --- a/ui/src/components/node_page.rs +++ b/ui/src/components/node_page.rs @@ -81,7 +81,7 @@ markup::define! { // } @if node.has(NO_TRACK.0) { details { - summary { @tr(ri.lang, "media.tracks") } + summary { @tr(ri.lang, "tag.trak") } ol { @for track in node.iter(NO_TRACK) { li { "track" @track.get(TR_NAME) } }} @@ -89,7 +89,7 @@ markup::define! { } @if let Some(idents) = node.get(NO_IDENTIFIERS) { details { - summary { @tr(ri.lang, "node.external_ids") } + summary { @tr(ri.lang, "tag.iden") } table { @for (key, value) in idents.entries::<&str>() { tr { td { @tr(ri.lang, &format!("tag.iden.{key}")) } @@ -104,7 +104,7 @@ markup::define! { } @if node.has(NO_TAG.0) { details { - summary { @tr(ri.lang, "node.tags") } + summary { @tr(ri.lang, "tag.tag1") } ol { @for tag in node.iter(NO_TAG) { li { @tag } }} |