Continued a bit: (please cherry-pick)

[pizzaservice-war.git] / web / guest / user / register.xhtml

diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
index c71ad8812ed73d7c697611ac11b7d56cb8a8bdb5..2ee42d82190bb63490b99e53e2604387553852fe 100644 (file)
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -15,23 +15,29 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
-                               <div class="para">
-                                       #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
-                                       <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                                       #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <div class="para">
+                                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+                                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+                                       </div>
+                               </ui:fragment>
+
+                               <div class="registration_form">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+                                               <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
+                                       </ui:fragment>
+
+                                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
+                                               <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
+                                       </ui:fragment>
                                </div>
                        </ui:fragment>
 
-                       <div class="registration_form">
-                               <ui:fragment rendered="#{registerController.isMultiplePageEnabled()}">
-                                       <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
-                               </ui:fragment>
-
-                               <ui:fragment rendered="#{not registerController.isMultiplePageEnabled()}">
-                                       <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
-                               </ui:fragment>
-                       </div>
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
+                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>