Used much more h:outputText instead of directly the message in the template. This...

[addressbook-war.git] / web / WEB-INF / templates / guest / user / register / guest_form_register_page1.tpl

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 55c2ebddbcf300b6eef94bb33d747771062cbd0d..465fc01f785cdbcb0a6f50fce396303af1ffc52d 100644 (file)
--- 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
@@ -6,83 +6,65 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 
-       <h:form id="register_form">
+       <h:form id="register_page1_form">
                <div class="table">
                        <div class="table_header">
-                               #{msg.GUEST_REGISTRATION_TITLE}
+                               #{msg.GUEST_REGISTRATION_PAGE1_TITLE}
                        </div>
 
-                       <ui:include src="/WEB-INF/templates/contact/form_contact_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>
+                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
+                                       </legend>
 
-                                               <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>
+                                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+                                                       </div>
 
-                                       <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="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+                                                       </div>
 
-                                               <div class="table_right">
-                                                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
+                                                       <div class="clear"></div>
                                                </div>
+                                       </ui:fragment>
 
-                                               <div class="clear"></div>
-                                       </div>
+                                       <ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
 
-                                       <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>
+                                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                                               <div class="para"></div>
 
-                                               <div class="clear"></div>
-                                       </div>
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+                                                       </div>
 
-                                       <div class="para"></div>
+                                                       <div class="table_right">
+                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+                                                       </div>
 
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+                                                       <div class="clear"></div>
                                                </div>
 
-                                               <div class="table_right">
-                                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
-                                               </div>
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+                                                       </div>
 
-                                               <div class="clear"></div>
-                                       </div>
+                                                       <div class="table_right">
+                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+                                                       </div>
 
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+                                                       <div class="clear"></div>
                                                </div>
 
-                                               <div class="table_right">
-                                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+                                               <div class="para notice">
+                                                       <h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
                                                </div>
-
-                                               <div class="clear"></div>
-                                       </div>
-
-                                       <div class="para notice">
-                                               #{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
-                                       </div>
+                                       </ui:fragment>
                                </fieldset>
                        </div>
 
@@ -90,7 +72,7 @@
 
                        <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()}" />
+                               <h:commandButton styleClass="submit" type="submit" id="continueRegisterPage1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{registerController.doRegisterMultiPage1()}" />
                        </div>
                </div>
        </h:form>