From 700e780b70cca522795e271a0aaf9e2605360980 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 13 May 2016 11:11:18 +0200 Subject: [PATCH] Continued generally: - moved email address (with repeat) to own templates, one for registration, one for login (change email address) - added validator for above data - some other fixes, e.g. wrong controller MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/templates/generic/message_box.tpl | 14 ++++---- .../generic/profile_mode_selection_box.tpl | 2 +- .../guest_email_address_repeat_fields.tpl | 32 +++++++++++++++++++ .../register/guest_form_register_page1.tpl | 24 +------------- .../register/guest_form_register_single.tpl | 24 +------------- ...ser_change_email_address_repeat_fields.tpl | 32 +++++++++++++++++++ web/user/login_change_email_address.xhtml | 26 ++------------- 7 files changed, 75 insertions(+), 79 deletions(-) create mode 100644 web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl create mode 100644 web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl index de486b63..2afa5d1b 100644 --- a/web/WEB-INF/templates/generic/message_box.tpl +++ b/web/WEB-INF/templates/generic/message_box.tpl @@ -1,12 +1,10 @@ - - + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + >
@@ -25,4 +23,4 @@
- + diff --git a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl index 30799916..680c63eb 100644 --- a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl +++ b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl @@ -6,6 +6,6 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl new file mode 100644 index 00000000..a3a69c0c --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl @@ -0,0 +1,32 @@ + + + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl index a1c7223d..b8106fdf 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl @@ -30,29 +30,7 @@ -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
+
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl index d4e1e9d8..043babe7 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl @@ -31,29 +31,7 @@ -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
+
diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl new file mode 100644 index 00000000..3ca9f128 --- /dev/null +++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl @@ -0,0 +1,32 @@ + + + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index dd8affff..4d70ccb0 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -33,35 +33,13 @@
- #{userController.emailAddress} + #{contactController.emailAddress}
-
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
+ -- 2.39.5