password1 and password2 is not clear enough, better <role>Password and <role>Password...

[pizzaservice-war.git] / web / WEB-INF / templates / guest / guest_registration_form.tpl

diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 3bed98b6fbdbf4bca5ae1e2a01d76be92bdda15b..494484c77c00eff720eb4b09510abcb750625c23 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -3,28 +3,40 @@
        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://java.sun.com/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 
-       <h:form acceptcharset="utf-8" id="register_form">
+       <h:form id="register_form">
                <div class="table">
                        <div class="table_header">
                                #{msg.GUEST_REGISTRATION_TITLE}
                        </div>
 
-                       <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
+                       <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 class="input" id="emailAddress1" size="20" maxlength="255" value="#{customerController.emailAddress}" required="true" />
+                                                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -36,7 +48,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{customerController.emailAddress}" required="true" />
+                                                       <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -46,11 +58,11 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
+                                                       <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputSecret class="input" id="password1" size="10" maxlength="255" required="true" />
+                                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -58,18 +70,21 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
+                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputSecret class="input" id="password2" size="10" maxlength="255" required="true" />
+                                                       <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_CUSTOMER_NUMBER_NOTICE}
+                                               <ul>
+                                                       <li>#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}</li>
+                                                       <li>#{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}</li>
+                                               </ul>
                                        </div>
                                </fieldset>
                        </div>
@@ -77,8 +92,8 @@
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
                        <div class="table_footer">
-                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
+                               <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>