diff --git a/extensions/pagetop-user/src/component.rs b/extensions/pagetop-user/src/component.rs
index e4971ae1..bc7b2929 100644
--- a/extensions/pagetop-user/src/component.rs
+++ b/extensions/pagetop-user/src/component.rs
@@ -24,11 +24,11 @@ pub use user_name::UserName;
use pagetop::prelude::*;
-use crate::LOCALES_USER;
use crate::account::UserStatus;
use crate::component::admin::status_key;
use crate::config::{user_language_applies, user_timezone_applies};
use crate::entity::user;
+use crate::{LOCALES_USER, PROFILE_PATH};
// Texto libre de varias líneas como contenido seguro: cada salto de línea se convierte en `
`,
// sin depender del CSS del tema. Se usa para mostrar el "Sobre mí" del usuario.
@@ -87,6 +87,27 @@ pub(crate) fn error_banner(error: Option) -> Html {
})
}
+// Enlace para salir de un formulario sin guardar.
+pub(crate) fn cancel_link(route: impl Into) -> Button {
+ Button::anchor(Lc::t("btn-cancel", &LOCALES_USER), route).with_style(button::Style::Link)
+}
+
+// Botonera de un formulario: el botón de envío y, en la misma fila, el enlace para salir sin
+// guardar.
+pub(crate) fn form_actions(submit: Lc, cancel: impl Into) -> Flex {
+ Flex::new()
+ .with_wrap(flex::Behavior::Wrap)
+ .with_align(align::Items::Center)
+ .with_gap(align::Gap::Both(UnitValue::RelRem(0.5)))
+ .with_child(Button::submit(submit).with_style(button::Style::Solid(Intent::Primary)))
+ .with_child(cancel_link(cancel))
+}
+
+// Botonera de los formularios del perfil propio, que al cancelar vuelven al perfil.
+pub(crate) fn profile_form_actions(submit: Lc, cx: &Context) -> Flex {
+ form_actions(submit, cx.route(PROFILE_PATH))
+}
+
// Bloque de sólo lectura con los datos de perfil de un usuario, para «Mi cuenta» y para la ficha de
// administración.
pub(crate) async fn user_details(user: &user::Model, cx: &mut Context) -> Block {
diff --git a/extensions/pagetop-user/src/component/admin/admin_password_form.rs b/extensions/pagetop-user/src/component/admin/admin_password_form.rs
index 5775d8b0..07f9d5ed 100644
--- a/extensions/pagetop-user/src/component/admin/admin_password_form.rs
+++ b/extensions/pagetop-user/src/component/admin/admin_password_form.rs
@@ -5,7 +5,7 @@ use pagetop::prelude::*;
use crate::LOCALES_USER;
use crate::user_path;
-use crate::component::{PasswordConfirm, error_banner};
+use crate::component::{PasswordConfirm, error_banner, form_actions};
#[derive(AutoDefault, Clone, Debug, Getters)]
pub(crate) struct AdminPasswordForm {
@@ -34,10 +34,11 @@ impl Component for AdminPasswordForm {
PasswordConfirm::new()
.with_password_label(Lc::t("field-new-password", &LOCALES_USER)),
)
- .with_child(
- Button::submit(Lc::t("btn-save", &LOCALES_USER))
- .with_style(button::Style::Solid(Intent::Primary)),
- );
+ .with_child(form_actions(
+ Lc::t("btn-save", &LOCALES_USER),
+ self.waypoint()
+ .append_to(cx.route(user_path(self.user_id(), "edit"))),
+ ));
Ok(form.render(cx).await)
}
diff --git a/extensions/pagetop-user/src/component/admin/role_form.rs b/extensions/pagetop-user/src/component/admin/role_form.rs
index b195e496..1b63ecc0 100644
--- a/extensions/pagetop-user/src/component/admin/role_form.rs
+++ b/extensions/pagetop-user/src/component/admin/role_form.rs
@@ -6,7 +6,7 @@ use crate::ADMIN_ROLES_PATH;
use crate::LOCALES_USER;
use crate::role_path;
-use crate::component::error_banner;
+use crate::component::{error_banner, form_actions};
use crate::service::role_admin::{ROLE_LABEL_MAX_CHARS, ROLE_MACHINE_NAME_MAX_CHARS};
#[derive(AutoDefault, Clone, Copy, Debug, PartialEq)]
@@ -86,10 +86,10 @@ impl Component for RoleForm {
.with_inputmode(Some(form::input::Mode::Numeric)),
);
- form = form.with_child(
- Button::submit(Lc::t("btn-save", &LOCALES_USER))
- .with_style(button::Style::Solid(Intent::Primary)),
- );
+ form = form.with_child(form_actions(
+ Lc::t("btn-save", &LOCALES_USER),
+ self.waypoint().or(cx.route(ADMIN_ROLES_PATH.as_str())),
+ ));
Ok(form.render(cx).await)
}
diff --git a/extensions/pagetop-user/src/component/admin/role_permissions_form.rs b/extensions/pagetop-user/src/component/admin/role_permissions_form.rs
index 8efc0d34..070fdccb 100644
--- a/extensions/pagetop-user/src/component/admin/role_permissions_form.rs
+++ b/extensions/pagetop-user/src/component/admin/role_permissions_form.rs
@@ -4,7 +4,9 @@
use pagetop::prelude::*;
+use crate::ADMIN_ROLES_PATH;
use crate::LOCALES_USER;
+use crate::component::form_actions;
use crate::role_path;
use crate::component::admin::PermissionGroups;
@@ -52,10 +54,10 @@ impl Component for RolePermissionsForm {
form = form.with_child(fieldset);
}
- form = form.with_child(
- Button::submit(Lc::t("btn-save", &LOCALES_USER))
- .with_style(button::Style::Solid(Intent::Primary)),
- );
+ form = form.with_child(form_actions(
+ Lc::t("btn-save", &LOCALES_USER),
+ self.waypoint().or(cx.route(ADMIN_ROLES_PATH.as_str())),
+ ));
Ok(form.render(cx).await)
}
diff --git a/extensions/pagetop-user/src/component/admin/role_table.rs b/extensions/pagetop-user/src/component/admin/role_table.rs
index d03edcb1..f9f867ed 100644
--- a/extensions/pagetop-user/src/component/admin/role_table.rs
+++ b/extensions/pagetop-user/src/component/admin/role_table.rs
@@ -121,7 +121,10 @@ impl Component for RoleTable {
Ok(html! {
div (self.props().unpack(cx)) {
- (Button::anchor(Lc::t("btn-create-role", &LOCALES_USER), new_href).render(cx).await)
+ (Button::anchor(Lc::t("btn-create-role", &LOCALES_USER), new_href)
+ .with_style(button::Style::Solid(Intent::Primary))
+ .render(cx)
+ .await)
@if let Some(message) = self.message() {
div class="user-form-error" role="alert" { (message.clone().using(cx)) }
}
diff --git a/extensions/pagetop-user/src/component/admin/user_form.rs b/extensions/pagetop-user/src/component/admin/user_form.rs
index bd7ee147..48414b56 100644
--- a/extensions/pagetop-user/src/component/admin/user_form.rs
+++ b/extensions/pagetop-user/src/component/admin/user_form.rs
@@ -7,7 +7,7 @@ use crate::config::{SETTINGS, user_language_applies, user_timezone_applies};
use crate::user_path;
use crate::{ADMIN_USERS_PATH, PROFILE_EDIT_PATH};
-use crate::component::{PasswordConfirm, error_banner};
+use crate::component::{PasswordConfirm, error_banner, form_actions, profile_form_actions};
use crate::identity::{EMAIL_MAX_CHARS, USERNAME_MIN_CHARS, username_help, username_max_chars};
use crate::service::user_admin::{ABOUT_MAX_CHARS, DISPLAY_NAME_MAX_CHARS};
@@ -159,14 +159,18 @@ impl Component for UserForm {
);
}
- // En modo `Edit`, "Guardar" se renderiza fuera del formulario, junto al resto de acciones
- // de la pantalla (ver `USER_ADMIN_FORM_ID`); en los demás modos no hay ninguna botonera con
- // la que agruparlo, así que se queda aquí, dentro del propio `