Please cherry-pick:

[jjobs-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..eaa13ad352df7b77f8e7ac73bae810631e3a5b33 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
@@ -3,95 +3,91 @@
        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">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui">
 
-
-       <h:form id="register_form">
-               <div class="table">
-                       <div class="table_header">
-                               #{msg.GUEST_REGISTRATION_TITLE}
+       <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
+                               <h:outputText value="#{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>
-
-                                               <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="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>
-
-                                       <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" />
+                               <fieldset class="fieldset">
+                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
+                                       </legend>
+
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
+                                                               <p:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+                                                       </div>
+
+                                                       <div class="table-right-medium">
+                                                               <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+                                                       </div>
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="error-container" layout="block">
+                                                       <p:message for="userName" />
+                                               </h:panelGroup>
+                                       </ui:fragment>
+
+                                       <ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
+
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                                               <div class="para"></div>
+
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
+                                                               <p:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+                                                       </div>
+
+                                                       <div class="table-right-medium">
+                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
+                                                       </div>
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="error-container" layout="block">
+                                                       <p:message for="userPassword" />
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
+                                                               <p:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+                                                       </div>
+
+                                                       <div class="table-right-medium">
+                                                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
+                                                       </div>
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="error-container" layout="block">
+                                                       <p:message for="userPasswordRepeat" />
+                                               </h:panelGroup>
+
+                                               <div class="para notice">
+                                                       <ul>
+                                                               <li><h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" /></li>
+                                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('allow_user_registration_empty_password')}">
+                                                                       <li><h:outputText value="#{msg.GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED}" /></li>
+                                                               </ui:fragment>
+                                                               <ui:fragment rendered="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}">
+                                                                       <li><h:outputText value="#{msg.GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED}" /></li>
+                                                               </ui:fragment>
+                                                       </ul>
                                                </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>
+                                       </ui:fragment>
                                </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 class="table-footer">
+                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <p:commandButton styleClass="submit" type="submit" id="button_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
                        </div>
-               </div>
+               </h:panelGroup>
        </h:form>
 </ui:composition>