]> git.mxchange.org Git - jjobs-war.git/blobdiff - web/guest/user/user_register.xhtml
Please cherry-pick:
[jjobs-war.git] / web / guest / user / user_register.xhtml
index f15aed72dc5bbc22f4d1cfcc9e901d17b86fee23..128e806c52c7cdff5c057fb633242fcadee55382 100644 (file)
@@ -1,57 +1,51 @@
-<!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}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                               xmlns:h="http://xmlns.jcp.org/jsf/html"
+                               xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <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:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-                                       <div class="para">
-                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-                                               <h:outputText value="&nbsp;" />
-                                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                                               <h:outputText value="&nbsp;" />
-                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
-                                       </div>
-                               </ui:fragment>
+       <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_login_require_user_name')}">
+                               <h:panelGroup styleClass="para" layout="block">
+                                       <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} " />
+                                       <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <h:outputText value=" #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
+                               </h:panelGroup>
+                       </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>
+                       <h:panelGroup layout="block" styleClass="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>
+                               <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>
+                       </h:panelGroup>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-               <ui:define name="content" 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:define>
-       </ui:composition>
-</html>
+               <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>