From 7e88f0e94000192f439e4f680e465ab7fdc61149 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 29 Aug 2016 17:01:32 +0200 Subject: [PATCH] Please cherry-pick: - rewrote template to have a targetController parameter (must be set) --- .../user/user_enter_current_password.tpl | 51 +++++++++++-------- web/user/login_change_password.xhtml | 4 +- web/user/login_change_personal_data.xhtml | 4 +- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl index cbe9d2d4..0a6ab254 100644 --- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl +++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl @@ -5,29 +5,38 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
-
- - - + + + + + + -
-
- -
+ +
+
+ + + -
- - - -
+
+
+ +
-
+
+ + + +
- - - -
-
-
+
+ + + + +
+
+
+ diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index dc647b75..ea8d8f73 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -70,7 +70,9 @@ - + + +