X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fcategory.xhtml;h=b8730f0e7a0f3dd8cdfc6e8dcfb21d0e43e52428;hb=e1427cc03eefa9b781d5d3f2b3484d8f841fd962;hp=5785d733ea7a003e11059205c1a0a0b64e2b137e;hpb=0877c8a8a3da6b5e870cdff5f44a6c41ee66d241;p=pizzaservice-war.git

diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml
index 5785d733..b8730f0e 100644
--- a/web/admin/category.xhtml
+++ b/web/admin/category.xhtml
@@ -9,32 +9,28 @@
 	<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="menu">
-			<ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
-		</ui:define>
-
 		<ui:define name="content_header">
-			#{msg.SUB_TITLE_ADMIN_CATEGORIES}
+			#{msg.CONTENT_TITLE_ADMIN_CATEGORIES}
 		</ui:define>
 
 		<ui:define name="content">
 			<div class="para">
-				<h:form acceptcharset="utf-8" id="form">
-					<h:dataTable headerClass="table_header_column" rowClasses="table_row" styleClass="table" id="categories" value="#{controller.allCategories}" var="cat">
+				<h:form id="form">
+					<h:dataTable id="categories" var="cat" value="#{controller.allCategories}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_CATEGORY}">
 						<h:column>
 							<f:facet name="header">#{msg.SELECT_ENTRY}</f:facet>
-							#{cat.id}:
+							#{cat.categoryId}:
 							<h:selectBooleanCheckbox class="input" value="true" />
 						</h:column>
 
 						<h:column>
 							<f:facet name="header">#{msg.ADMIN_ENTER_CATEGORY_TITLE}</f:facet>
-							#{cat.title}
+								#{cat.categoryTitle}
 						</h:column>
 
 						<h:column>
 							<f:facet name="header">#{msg.ADMIN_PARENT_CATEGORY}</f:facet>
-							#{cat.parentId}
+								#{cat.parentCategory.categoryId}
 						</h:column>
 					</h:dataTable>
 
@@ -47,52 +43,48 @@
 			</div>
 
 			<div class="para">
-				<h:form acceptcharset="utf-8" id="add_category">
-				<div class="table">
-					<div class="table_header">
-						#{msg.ADMIN_ADD_CATEGORY_TITLE}
-					</div>
+				<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>
+						<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_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="#{admin_category.categoryTitle}" size="10" maxlength="255" required="true" />
+								</div>
 
-							<div class="table_right">
-								<h:inputText class="input" id="title" value="#{admin_category.title}" size="10" maxlength="255" required="true" />
+								<div class="clear"></div>
 							</div>
 
-							<div class="clear"></div>
-						</div>
+							<div class="table_row">
+								<div class="table_left">
+									#{msg.ADMIN_PARENT_CATEGORY}
+								</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="table_right">
-								<ui:include src="/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl" />
+								<div class="clear"></div>
 							</div>
+						</fieldset>
 
-							<div class="clear"></div>
+						<div class="table_footer">
+							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
 						</div>
-					</fieldset>
-
-					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
 					</div>
-				</div>
 				</h:form>
 			</div>
 		</ui:define>
-
-		<ui:define name="footer">
-			<ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
-		</ui:define>
 	</ui:composition>
 </html>