Please cherry-pick:

[pizzaservice-war.git] / web / index.xhtml
diff --git a/web/index.xhtml b/web/index.xhtml

index f0f2f839ff610f530d429bb97ff8a1c81abfa12b..6c75749a2f4ec1c12f811f0890a4eddccb2abfdb 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -1,42 +1,38 @@
-<!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">
  
         <!--
         TODO: Not used:
         xmlns:basket="http://mxchange.org/jshop/tags/basket"
         //-->
  
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
+       </ui:define>
  
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
+       </ui:define>
  
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <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>
-                               </div>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
+                       <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>
+                       </h:panelGroup>
  
-                               <div class="para">
-                                       <h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />
-                               </div>
-                       </ui:fragment>
+                       <div class="para">
+                               <h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />
+                       </div>
+               </ui:fragment>
  
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
+                       <ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>