From: Roland Häder <roland@mxchange.org>
Date: Thu, 12 May 2016 08:08:50 +0000 (+0200)
Subject: moved template to proper place (cherry-pick this)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=192b8988730251f35ca02107b04c2d5c8b48c21d;p=jfinancials-war.git

moved template to proper place (cherry-pick this)

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

diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
deleted file mode 100644
index 10114a5d..00000000
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-
-	<h:form id="register_form">
-		<div class="table">
-			<div class="table_header">
-				#{msg.GUEST_REGISTRATION_TITLE}
-			</div>
-
-			<ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
-
-			<div class="para">
-				<fieldset id="login_data">
-					<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
-						</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="emailAddress2" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL2}" />
-						</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>
-
-					<div class="para"></div>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="table_row">
-						<div class="table_left">
-							<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="para notice">
-						#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
-					</div>
-				</fieldset>
-			</div>
-
-			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
-
-			<div class="table_footer">
-				<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
-			</div>
-		</div>
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
new file mode 100644
index 00000000..10114a5d
--- /dev/null
+++ b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+
+	<h:form id="register_form">
+		<div class="table">
+			<div class="table_header">
+				#{msg.GUEST_REGISTRATION_TITLE}
+			</div>
+
+			<ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
+
+			<div class="para">
+				<fieldset id="login_data">
+					<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
+						</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="emailAddress2" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL2}" />
+						</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>
+
+					<div class="para"></div>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
+					<div class="para notice">
+						#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
+					</div>
+				</fieldset>
+			</div>
+
+			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+
+			<div class="table_footer">
+				<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
+			</div>
+		</div>
+	</h:form>
+</ui:composition>
diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
index b03c31e9..ab0f9104 100644
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -23,7 +23,7 @@
 			</div>
 
 			<div class="registration_form">
-				<ui:include src="/WEB-INF/templates/guest/guest_registration_form.tpl" />
+				<ui:include src="/WEB-INF/templates/guest/user/guest_registration_form.tpl" />
 			</div>
 		</ui:define>
 	</ui:composition>