From: Roland Haeder <roland@mxchange.org>
Date: Sun, 17 Apr 2016 14:34:31 +0000 (+0200)
Subject: Moved category/product pages/templates to corresponding sub folders (re-organizing)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b895ad17802bb45b11595b69b979c7c51161b2b2;p=pizzaservice-war.git

Moved category/product pages/templates to corresponding sub folders (re-organizing)
---

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index e5bbcee0..71547ccf 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -26,16 +26,16 @@
         <Node id="logout.xhtml" x="650" y="750" zoom="true"/>
         <Node id="customer/checkout_done.xhtml" x="400" y="150" zoom="true"/>
         <Node id="admin/admin_user_unlock.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_category_list.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="750" zoom="true"/>
         <Node id="*" x="1650" y="150" zoom="true"/>
         <Node id="customer/login.xhtml" x="900" y="600" zoom="true"/>
         <Node id="imprint.xhtml" x="400" y="1050" zoom="true"/>
         <Node id="admin/admin_user_show.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/admin_product_edit.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/admin_category_edit.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/admin_product_list.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="400" y="450" zoom="true"/>
         <Node id="customer/empty_basket.xhtml" x="1150" y="450" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index a8f3430a..c495ccde 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -57,11 +57,11 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_product</from-outcome>
-			<to-view-id>/admin/admin_product_list.xhtml</to-view-id>
+			<to-view-id>/admin/product/admin_product_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_category</from-outcome>
-			<to-view-id>/admin/admin_category_list.xhtml</to-view-id>
+			<to-view-id>/admin/category/admin_category_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_index</from-outcome>
@@ -132,25 +132,25 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_product_list.xhtml</from-view-id>
+		<from-view-id>/admin/product/admin_product_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_product</from-outcome>
-			<to-view-id>/admin/admin_product_edit.xhtml</to-view-id>
+			<to-view-id>/admin/product/admin_product_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_product</from-outcome>
-			<to-view-id>/admin/admin_product_delete.xhtml</to-view-id>
+			<to-view-id>/admin/product/admin_product_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_category_list.xhtml</from-view-id>
+		<from-view-id>/admin/category/admin_category_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_category</from-outcome>
-			<to-view-id>/admin/admin_category_edit.xhtml</to-view-id>
+			<to-view-id>/admin/category/admin_category_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_category</from-outcome>
-			<to-view-id>/admin/admin_category_delete.xhtml</to-view-id>
+			<to-view-id>/admin/category/admin_category_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
diff --git a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl
deleted file mode 100644
index 67fc7b5e..00000000
--- a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<h:selectOneMenu class="select" id="product_category" value="#{adminProductController.productCategory}" required="true" requiredMessage="#{msg.ADMIN_CATEGORY_MUST_BE_SELECTED}" converter="CategoryConverter">
-		<f:selectItems value="#{categoryController.allCategories}" var="cat" itemValue="#{cat}" itemLabel="#{cat.categoryTitle}" />
-	</h:selectOneMenu>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
deleted file mode 100644
index c5a4d5e1..00000000
--- a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<h:selectOneMenu class="select" id="parentCategory" value="#{adminCategoryController.parentCategory}">
-		<f:selectItem itemValue="" itemLabel="#{msg.ADMIN_CATEGORY_HAS_NO_PARENT}" />
-		<f:selectItems value="#{categoryController.allCategoriesParent}" var="parent_category" itemValue="#{parent_category.categoryId}" itemLabel="#{parent_category.categoryTitle}" />
-	</h:selectOneMenu>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/category/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/category/admin_category_selection_box.tpl
new file mode 100644
index 00000000..67fc7b5e
--- /dev/null
+++ b/web/WEB-INF/templates/admin/category/admin_category_selection_box.tpl
@@ -0,0 +1,10 @@
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<h:selectOneMenu class="select" id="product_category" value="#{adminProductController.productCategory}" required="true" requiredMessage="#{msg.ADMIN_CATEGORY_MUST_BE_SELECTED}" converter="CategoryConverter">
+		<f:selectItems value="#{categoryController.allCategories}" var="cat" itemValue="#{cat}" itemLabel="#{cat.categoryTitle}" />
+	</h:selectOneMenu>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl
new file mode 100644
index 00000000..c5a4d5e1
--- /dev/null
+++ b/web/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl
@@ -0,0 +1,11 @@
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<h:selectOneMenu class="select" id="parentCategory" value="#{adminCategoryController.parentCategory}">
+		<f:selectItem itemValue="" itemLabel="#{msg.ADMIN_CATEGORY_HAS_NO_PARENT}" />
+		<f:selectItems value="#{categoryController.allCategoriesParent}" var="parent_category" itemValue="#{parent_category.categoryId}" itemLabel="#{parent_category.categoryTitle}" />
+	</h:selectOneMenu>
+</ui:composition>
diff --git a/web/admin/admin_category_delete.xhtml b/web/admin/admin_category_delete.xhtml
deleted file mode 100644
index f6239318..00000000
--- a/web/admin/admin_category_delete.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CATEGORY}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_CATEGORY}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_category_edit.xhtml b/web/admin/admin_category_edit.xhtml
deleted file mode 100644
index 4bbf69a0..00000000
--- a/web/admin/admin_category_edit.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CATEGORY}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_CATEGORY}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_category_list.xhtml b/web/admin/admin_category_list.xhtml
deleted file mode 100644
index 9044182a..00000000
--- a/web/admin/admin_category_list.xhtml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_CATEGORIES}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_CATEGORIES}
-		</ui:define>
-
-		<ui:define name="content">
-			<div class="para">
-				<h:dataTable id="categories" var="cat" value="#{categoryController.allCategories}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_CATEGORY}">
-					<h:column>
-						<f:facet name="header">#{msg.ADMIN_CATEGORY_ID}</f:facet>
-						<h:link outcome="admin_edit_category" title="#{msg.ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE}" value="#{cat.categoryId}">
-							<f:param name="categoryId" value="#{cat.categoryId}" />
-						</h:link>
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.ADMIN_ENTER_CATEGORY_TITLE}</f:facet>
-							#{cat.categoryTitle}
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.ADMIN_PARENT_CATEGORY}</f:facet>
-							#{cat.parentCategory.categoryId}
-					</h:column>
-				</h:dataTable>
-			</div>
-
-			<div class="para">
-				<h:form id="add_category">
-					<div class="table">
-						<div class="table_header">
-							#{msg.ADMIN_ADD_CATEGORY_TITLE}
-						</div>
-
-						<fieldset id="product_data">
-							<legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
-
-							<div class="table_row">
-								<div class="table_left">
-									#{msg.ADMIN_ENTER_CATEGORY_TITLE}
-									<div class="tiny">#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}</div>
-								</div>
-
-								<div class="table_right">
-									<h:inputText class="input" id="guest_title" value="#{adminCategoryController.categoryTitle}" size="10" maxlength="255" required="true" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-
-							<div class="table_row">
-								<div class="table_left">
-									#{msg.ADMIN_PARENT_CATEGORY}
-								</div>
-
-								<div class="table_right">
-									<ui:include src="/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-						</fieldset>
-
-						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" action="#{adminCategoryController.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
-						</div>
-					</div>
-				</h:form>
-			</div>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_product_delete.xhtml b/web/admin/admin_product_delete.xhtml
deleted file mode 100644
index f2eaed2d..00000000
--- a/web/admin/admin_product_delete.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_PRODUCT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_PRODUCT}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_product_edit.xhtml b/web/admin/admin_product_edit.xhtml
deleted file mode 100644
index 6ef494f8..00000000
--- a/web/admin/admin_product_edit.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_PRODUCT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_PRODUCT}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_product_list.xhtml b/web/admin/admin_product_list.xhtml
deleted file mode 100644
index 3ee0944d..00000000
--- a/web/admin/admin_product_list.xhtml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_PRODUCTS}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_PRODUCTS}
-		</ui:define>
-
-		<ui:define name="content">
-			<div class="para">
-				<h:dataTable id="product_table" var="product" value="#{adminProductController.allProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_ADMIN_PRODUCTS}">
-					<h:column>
-						<f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_NUMBER}</f:facet>
-						<h:link outcome="admin_edit_product" title="#{msg.ADMIN_LINK_EDIT_DELETE_PRODUCT_TITLE}" value="#{product.productId}">
-							<f:param name="productId" value="#{product.productId}" />
-						</h:link>
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_TITLE}</f:facet>
-							#{product.productTitle}
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
-							#{product.productPrice}
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.CATEGORY}</f:facet>
-							#{product.productCategory.categoryTitle}
-					</h:column>
-
-					<h:column>
-						<f:facet name="header">#{msg.IS_AVAILABLE}</f:facet>
-							#{product.productAvailability}
-					</h:column>
-				</h:dataTable>
-			</div>
-
-			<div class="para">
-				<h:form id="add_product">
-					<div class="table">
-						<div class="table_header">
-							#{msg.ADMIN_ADD_PRODUCT_TITLE}
-						</div>
-
-						<fieldset id="product_data">
-							<legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
-
-							<div class="table_row">
-								<div class="table_left">
-									#{msg.ADMIN_ENTER_PRODUCT_TITLE}
-									<div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}</div>
-								</div>
-
-								<div class="table_right">
-									<h:inputText class="input" id="product_title" size="10" maxlength="255" required="true" value="#{adminProductController.productTitle}" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-
-							<div class="table_row">
-								<div class="table_left">
-									#{msg.ADMIN_ENTER_SINGLE_PRODUCT_PRICE}
-									<div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE}</div>
-								</div>
-
-								<div class="table_right">
-									<h:inputText class="input" id="product_price" size="10" maxlength="255" required="true" value="#{adminProductController.productPrice}" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-
-							<div class="table_row">
-								<div class="table_left">
-									#{msg.CATEGORY}
-								</div>
-
-								<div class="table_right">
-									<ui:include src="/WEB-INF/templates/admin/admin_category_selection_box.tpl" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-
-							<div class="table_row">
-								<div class="table_left">
-									#{msg.IS_AVAILABLE}
-								</div>
-
-								<div class="table_right">
-									<h:selectOneListbox required="true" id="available" value="#{adminProductController.productAvailability}" size="1" class="select">
-										<f:selectItem itemValue="true" itemLabel="#{msg.YES}" />
-										<f:selectItem itemValue="false" itemLabel="#{msg.NO}" />
-									</h:selectOneListbox>
-								</div>
-
-								<div class="clear"></div>
-							</div>
-						</fieldset>
-
-						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="add" action="#{adminProductController.addProduct()}" value="#{msg.ADMIN_BUTTON_ADD_PRODUCT}" />
-						</div>
-					</div>
-				</h:form>
-			</div>
-
-			<div class="para">
-				#{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE}
-				<ul>
-					<li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}</li>
-					<li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}</li>
-					<li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}</li>
-				</ul>
-			</div>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/category/admin_category_delete.xhtml b/web/admin/category/admin_category_delete.xhtml
new file mode 100644
index 00000000..f6239318
--- /dev/null
+++ b/web/admin/category/admin_category_delete.xhtml
@@ -0,0 +1,20 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CATEGORY}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_CATEGORY}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/category/admin_category_edit.xhtml b/web/admin/category/admin_category_edit.xhtml
new file mode 100644
index 00000000..4bbf69a0
--- /dev/null
+++ b/web/admin/category/admin_category_edit.xhtml
@@ -0,0 +1,20 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CATEGORY}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_CATEGORY}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/category/admin_category_list.xhtml b/web/admin/category/admin_category_list.xhtml
new file mode 100644
index 00000000..926bab6f
--- /dev/null
+++ b/web/admin/category/admin_category_list.xhtml
@@ -0,0 +1,83 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_CATEGORIES}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_CATEGORIES}
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para">
+				<h:dataTable id="categories" var="cat" value="#{categoryController.allCategories}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_CATEGORY}">
+					<h:column>
+						<f:facet name="header">#{msg.ADMIN_CATEGORY_ID}</f:facet>
+						<h:link outcome="admin_edit_category" title="#{msg.ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE}" value="#{cat.categoryId}">
+							<f:param name="categoryId" value="#{cat.categoryId}" />
+						</h:link>
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.ADMIN_ENTER_CATEGORY_TITLE}</f:facet>
+							#{cat.categoryTitle}
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.ADMIN_PARENT_CATEGORY}</f:facet>
+							#{cat.parentCategory.categoryId}
+					</h:column>
+				</h:dataTable>
+			</div>
+
+			<div class="para">
+				<h:form id="add_category">
+					<div class="table">
+						<div class="table_header">
+							#{msg.ADMIN_ADD_CATEGORY_TITLE}
+						</div>
+
+						<fieldset id="product_data">
+							<legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
+
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.ADMIN_ENTER_CATEGORY_TITLE}
+									<div class="tiny">#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}</div>
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="guest_title" value="#{adminCategoryController.categoryTitle}" size="10" maxlength="255" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.ADMIN_PARENT_CATEGORY}
+								</div>
+
+								<div class="table_right">
+									<ui:include src="/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+						</fieldset>
+
+						<div class="table_footer">
+							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton class="submit" type="submit" action="#{adminCategoryController.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
+						</div>
+					</div>
+				</h:form>
+			</div>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/product/admin_product_delete.xhtml b/web/admin/product/admin_product_delete.xhtml
new file mode 100644
index 00000000..f2eaed2d
--- /dev/null
+++ b/web/admin/product/admin_product_delete.xhtml
@@ -0,0 +1,20 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_PRODUCT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_PRODUCT}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/product/admin_product_edit.xhtml b/web/admin/product/admin_product_edit.xhtml
new file mode 100644
index 00000000..6ef494f8
--- /dev/null
+++ b/web/admin/product/admin_product_edit.xhtml
@@ -0,0 +1,20 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_PRODUCT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_PRODUCT}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/product/admin_product_list.xhtml b/web/admin/product/admin_product_list.xhtml
new file mode 100644
index 00000000..8e92a519
--- /dev/null
+++ b/web/admin/product/admin_product_list.xhtml
@@ -0,0 +1,130 @@
+<?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"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_PRODUCTS}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_PRODUCTS}
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para">
+				<h:dataTable id="product_table" var="product" value="#{adminProductController.allProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_ADMIN_PRODUCTS}">
+					<h:column>
+						<f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_NUMBER}</f:facet>
+						<h:link outcome="admin_edit_product" title="#{msg.ADMIN_LINK_EDIT_DELETE_PRODUCT_TITLE}" value="#{product.productId}">
+							<f:param name="productId" value="#{product.productId}" />
+						</h:link>
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_TITLE}</f:facet>
+							#{product.productTitle}
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
+							#{product.productPrice}
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.CATEGORY}</f:facet>
+							#{product.productCategory.categoryTitle}
+					</h:column>
+
+					<h:column>
+						<f:facet name="header">#{msg.IS_AVAILABLE}</f:facet>
+							#{product.productAvailability}
+					</h:column>
+				</h:dataTable>
+			</div>
+
+			<div class="para">
+				<h:form id="add_product">
+					<div class="table">
+						<div class="table_header">
+							#{msg.ADMIN_ADD_PRODUCT_TITLE}
+						</div>
+
+						<fieldset id="product_data">
+							<legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
+
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.ADMIN_ENTER_PRODUCT_TITLE}
+									<div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}</div>
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="product_title" size="10" maxlength="255" required="true" value="#{adminProductController.productTitle}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.ADMIN_ENTER_SINGLE_PRODUCT_PRICE}
+									<div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE}</div>
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="product_price" size="10" maxlength="255" required="true" value="#{adminProductController.productPrice}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.CATEGORY}
+								</div>
+
+								<div class="table_right">
+									<ui:include src="/WEB-INF/templates/admin/category/admin_category_selection_box.tpl" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.IS_AVAILABLE}
+								</div>
+
+								<div class="table_right">
+									<h:selectOneListbox required="true" id="available" value="#{adminProductController.productAvailability}" size="1" class="select">
+										<f:selectItem itemValue="true" itemLabel="#{msg.YES}" />
+										<f:selectItem itemValue="false" itemLabel="#{msg.NO}" />
+									</h:selectOneListbox>
+								</div>
+
+								<div class="clear"></div>
+							</div>
+						</fieldset>
+
+						<div class="table_footer">
+							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton class="submit" type="submit" id="add" action="#{adminProductController.addProduct()}" value="#{msg.ADMIN_BUTTON_ADD_PRODUCT}" />
+						</div>
+					</div>
+				</h:form>
+			</div>
+
+			<div class="para">
+				#{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE}
+				<ul>
+					<li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}</li>
+					<li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}</li>
+					<li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}</li>
+				</ul>
+			</div>
+		</ui:define>
+	</ui:composition>
+</html>