removed navdata as it will be regenerated and ignored it as it always caused merge...

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

index c57311210a7b642fec10a6532df3fad08c7ff65b..99ce54b7e5a1a1295b7af9baedbef2d84c5f742d 100644 (file)
--- a/web/customer/checkout2.xhtml
+++ b/web/customer/checkout2.xhtml
@@ -1,20 +1,18 @@
  <?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 xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+<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"
+       >
  
         <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                 <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CHECKOUT2}</ui:define>
  
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
                 <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_CHECKOUT2}
+                       #{msg.CONTENT_TITLE_INDEX_CHECKOUT2}
                 </ui:define>
  
                 <ui:define name="content">
@@ -30,13 +28,13 @@
                                 </div>
  
                                 <div class="registration_form">
-                                       <h:form acceptcharset="utf-8" id="checkout_form">
+                                       <h:form id="checkout_form">
                                                 <div class="table">
                                                         <div class="table_header">
                                                                 #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
                                                         </div>
  
-                                                       <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
+                                                       <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
  
                                                         <div class="para">
                                                                 Derzeit ist nur eine Bezahlung gegen Rechnung möglich.
@@ -53,9 +51,5 @@
                                 </div>
                         </div>
                 </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
         </ui:composition>
  </html>