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 7ccf32d9dd677b30fca62304276436b8874ea594..48fa8bcb98a20c8823480f8729611c61e616606d 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
@@ -5,10 +5,10 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:form id="form_register_page1">
+       <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               #{msg.GUEST_REGISTRATION_PAGE1_TITLE}
+                               <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
                        </div>
 
                        <div class="para">
@@ -29,6 +29,10 @@
 
                                                        <div class="clear"></div>
                                                </div>
+
+                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </h:panelGroup>
                                        </ui:fragment>
 
                                        <ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
@@ -42,24 +46,32 @@
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
                                                        </div>
 
                                                        <div class="clear"></div>
                                                </div>
 
+                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </h:panelGroup>
+
                                                <div class="table_row">
                                                        <div class="table_left_medium">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
                                                        </div>
 
                                                        <div class="clear"></div>
                                                </div>
 
+                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </h:panelGroup>
+
                                                <div class="para notice">
                                                        <h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
                                                </div>