From: Roland Häder <roland@mxchange.org>
Date: Fri, 13 May 2016 09:11:18 +0000 (+0200)
Subject: Continued generally:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=375095820d4fa6082c70ea1d21e19a942848300b;p=pizzaservice-war.git

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

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
new file mode 100644
index 00000000..1bfa9469
--- /dev/null
+++ b/web/WEB-INF/templates/generic/message_box.tpl
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<div class="message_box">
+		<div class="message_header">
+			#{msg.MESSAGE_BOX_TITLE}
+		</div>
+
+		<ui:fragment id="output_message" rendered="#{not empty message}">
+			<div class="okay para">
+				#{message}
+			</div>
+		</ui:fragment>
+
+		<ui:fragment id="output_message" rendered="#{empty message}">
+			<div class="errors para">
+				#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}
+			</div>
+		</ui:fragment>
+	</div>
+</ui:composition>
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">
 
 	<h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
-		<f:selectItems value="#{profileModeController.allProfileModes}" var="m" itemValue="#{m}" itemLabel="#{msg[m.messageKey]}" />
+		<f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
 	</h:selectOneMenu>
 </ui:composition>
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 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<div class="table_row">
+		<div class="table_left">
+			<h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
+		</div>
+
+		<div class="table_right">
+			<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" validator="EmailAddressValidator" />
+		</div>
+
+		<div class="clear"></div>
+	</div>
+
+	<div class="table_row">
+		<div class="table_left">
+			<h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
+		</div>
+
+		<div class="table_right">
+			<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" validator="EmailAddressValidator" />
+		</div>
+
+		<div class="clear"></div>
+	</div>
+</ui:composition>
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 @@
 						</div>
 					</ui:fragment>
 
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
+					<ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
 
 					<ui:fragment rendered="#{userController.isUserNameRequired()}">
 						<div class="para"></div>
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 @@
 						</div>
 					</ui:fragment>
 
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
+					<ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
 
 					<ui:fragment rendered="#{userController.isUserNameRequired()}">
 						<div class="para"></div>
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 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<div class="table_row">
+		<div class="table_left">
+			<h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
+		</div>
+
+		<div class="table_right">
+			<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" validator="EmailAddressValidator" />
+		</div>
+
+		<div class="clear"></div>
+	</div>
+
+	<div class="table_row">
+		<div class="table_left">
+			<h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
+		</div>
+
+		<div class="table_right">
+			<h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" validator="EmailAddressValidator" />
+		</div>
+
+		<div class="clear"></div>
+	</div>
+</ui:composition>
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 @@
 									</div>
 
 									<div class="table_right">
-										#{userController.emailAddress}
+										#{contactController.emailAddress}
 									</div>
 
 									<div class="clear"></div>
 								</div>
 
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
+								<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
 							</fieldset>
 						</div>