Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / guest / user / register / guest_form_register_single.tpl

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 1b084bd5e49f918bfceaa50852ef061a3ebd973c..8771db2366ebb50897df620e88b3c4c6be7bb57b 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -5,8 +5,8 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:form id="form_register_single">
-               <div class="table_medium">
+       <h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+               <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
                        </div>
@@ -30,10 +30,10 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
 
-                                               <div class="error_container">
-                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:panelGroup styleClass="error_container" layout="block">
+                                                               <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       </h:panelGroup>
                                                </div>
                                        </ui:fragment>
 
@@ -54,6 +54,10 @@
                                                        <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">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
@@ -66,6 +70,10 @@
                                                        <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>
@@ -79,6 +87,6 @@
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                <h:commandButton styleClass="submit" type="submit" id="finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
                        </div>
-               </div>
+               </h:panelGroup>
        </h:form>
 </ui:composition>