Please cherry-pick:

[jjobs-war.git] / web / guest / user / register_page2.xhtml
diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml

index 04b7ccd20e351042fb2043a56360a1285ef651ad..4737d08770b89212fdde4f4f678ea1354041ebeb 100644 (file)
--- a/web/guest/user/register_page2.xhtml
+++ b/web/guest/user/register_page2.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -9,15 +8,17 @@
         >
  
         <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
                 </ui:define>
  
                 <ui:define name="content">
-                       <ui:fragment rendered="#{registerController.isMultiplePageEnabled()}">
-                               <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+                               <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}" />
@@ -30,7 +31,7 @@
                                 </div>
                         </ui:fragment>
  
-                       <ui:fragment rendered="#{not registerController.isMultiplePageEnabled()}">
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
                                 <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
                         </ui:fragment>
                 </ui:define>