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 (file)
index 494484c..0000000
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ /dev/null
@@ -1,100 +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">
-                                               <ul>
-                                                       <li>#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}</li>
-                                                       <li>#{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}</li>
-                                               </ul>
-                                       </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 (file)
index 0000000..494484c
--- /dev/null
+++ b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
@@ -0,0 +1,100 @@
+<?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">
+                                               <ul>
+                                                       <li>#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}</li>
+                                                       <li>#{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}</li>
+                                               </ul>
+                                       </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 0fece067541556805ef8103f5134f5ba6a72ecd1..ab0f910484e5148e4601aefb37a4dc9b663d52d9 100644 (file)
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -3,25 +3,27 @@
 <html
        lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
        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"
-       >
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_REGISTER}</ui:define>
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_CUSTOMER_REGISTER}
+                       #{msg.CONTENT_TITLE_USER_REGISTER}
                </ui:define>
 
                <ui:define name="content">
                        <div class="para">
-                               Sie sind bereits Kunde? Dann <h:link outcome="customer_login" value="hier" /> einloggen.
+                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
                        </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>