Continued porting templates:

[jjobs-war.git] / web / guest / user / user_register.xhtml

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index f15aed72dc5bbc22f4d1cfcc9e901d17b86fee23..17c6ad479d36ca6cda9e01e326af687162fc3ef9 100644 (file)
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -16,8 +16,8 @@
                        <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
                </ui:define>
 
-               <ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
+               <ui:define name="content">
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                        <div class="para">
                                                <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
@@ -45,13 +45,13 @@
                                        <ui:param name="styleClass" value="errors" />
                                </ui:include>
                        </ui:fragment>
-               </ui:define>
 
-               <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
                                        <ui:param name="styleClass" value="errors" />
                                </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>