X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Findex.xhtml;h=993dec3b1f4af9f1216d2aae51ef2fe7cd0d50c1;hb=942022eccafe54dae0d7038f865ac32fe06676b4;hp=895fa1137460d47c4841c72045ddec5c3be46ec9;hpb=e0c42678ef855eaf67d9758190c3968f30d9ddf2;p=pizzaservice-war.git

diff --git a/web/index.xhtml b/web/index.xhtml
index 895fa113..993dec3b 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -1,11 +1,12 @@
 <?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:c="http://xmlns.jcp.org/jsp/jstl/core"
-	  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"
+	>
 
 	<!--
 	TODO: Not used:
@@ -13,14 +14,10 @@
 	//-->
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_INDEX_WELCOME}</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="guest_title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.SUB_TITLE_INDEX_WELCOME}
+			#{msg.CONTENT_TITLE_INDEX_WELCOME}
 		</ui:define>
 
 		<ui:define name="content">
@@ -30,7 +27,7 @@
 				</div>
 			</div>
 
-			<h:dataTable value="#{controller.availableProducts}" var="product" class="table">
+			<h:dataTable id="table_show_available_products" var="product" value="#{productController.availableProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_INDEX_PRODUCTS}">
 				<h:column>
 					<div id="main_item_container">
 						<div class="item_title">
@@ -41,8 +38,8 @@
 							<div class="table_left">
 								<div class="item_actions">
 									<ui:fragment rendered="#{!basketController.isProductAdded(product)}">
-										<h:form acceptcharset="utf-8" id="add_item">
-											<h:commandButton class="submit" id="add" value="#{msg.ADMIN_ADD_ITEM_TO_BASKET}" action="#{basketController.addItem(product)}" title="#{msg.BUTTON_TITLE_ADD_ITEM_TO_BASKET}" />
+										<h:form id="add_item">
+											<h:commandButton class="submit" id="add" value="#{msg.USER_ADD_ITEM_TO_BASKET}" action="#{basketController.addItem(product)}" title="#{msg.BUTTON_TITLE_ADD_ITEM_TO_BASKET}" />
 
 											<h:inputText class="input" id="amount" size="3" maxlength="20" value="#{basketController.orderedAmount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
 												<!--
@@ -55,7 +52,7 @@
 
 									<ui:fragment rendered="#{basketController.isProductAdded(product)}">
 										<div class="item_amount">
-											Anzahl:
+											#{msg.ITEM_ORDER_AMOUNT}
 											#{basketController.getItemAmount(product)}
 										</div>
 
@@ -70,16 +67,16 @@
 
 							<div class="table_right">
 								<div class="item_price">
-									#{msg.SINGLE_ITEM_PRICE}
-									<h:outputText class="price" value="#{product.price}">
+									#{msg.SINGLE_PRODUCT_PRICE}
+									<h:outputText styleClass="price" value="#{product.productPrice}">
 										<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 									</h:outputText>
 								</div>
 
 								<div class="item_total_price">
 									#{msg.TOTAL_ITEM_PRICE}
-									<h:outputText class="price" value="#{msg.ITEM_NOT_ORDERED}" rendered="#{!basketController.isProductAdded(product)}" />
-									<h:outputText class="price" value="#{basketController.calculateCurrentItemPrice()}" rendered="#{basketController.isProductAdded(product)}">
+									<h:outputText styleClass="price" value="#{msg.ITEM_NOT_ORDERED}" rendered="#{!basketController.isProductAdded(product)}" />
+									<h:outputText styleClass="price" value="#{basketController.calculateCurrentItemPrice()}" rendered="#{basketController.isProductAdded(product)}">
 										<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 									</h:outputText>
 								</div>
@@ -93,14 +90,10 @@
 
 			<div id="totals_container">
 				#{msg.TOTAL_ORDER_PRICE}
-				<h:outputText class="price" id="total_sum" value="#{basketController.calculateTotalPrice()}">
+				<h:outputText styleClass="price" id="total_sum" value="#{basketController.calculateTotalPrice()}">
 					<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 				</h:outputText>
 			</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>
