]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Renamed after naming convention: admin_foo.xhtml in admin area, but foo.xhtml is...
authorRoland Haeder <roland@mxchange.org>
Sat, 9 Apr 2016 10:47:54 +0000 (12:47 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 9 Apr 2016 10:47:54 +0000 (12:47 +0200)
nbproject/faces-config.NavData
web/WEB-INF/faces-config.xml
web/admin/admin_category.xhtml [new file with mode: 0644]
web/admin/admin_product.xhtml [new file with mode: 0644]
web/admin/category.xhtml [deleted file]
web/admin/product.xhtml [deleted file]

index ddcb9e09584d7e1dbdd63fbac5c3a62ee76c0c80..90a76d02d7759c98a408d991d0d2f1e7bdbeb520 100644 (file)
         <Node id="*" x="150" y="300" zoom="true"/>
         <Node id="imprint.xhtml" x="1150" y="300" zoom="true"/>
         <Node id="customer/login.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/category.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/admin_category.xhtml" x="150" y="600" zoom="true"/>
         <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
         <Node id="basket.xhtml" x="900" y="150" zoom="true"/>
         <Node id="customer/register.xhtml" x="650" y="150" zoom="true"/>
         <Node id="item_added.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/product.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/admin_product.xhtml" x="150" y="450" zoom="true"/>
         <Node id="terms.xhtml" x="650" y="300" zoom="true"/>
         <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
         <Node id="customer/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
index bb3d4bbf16e6faab406386b4b78a00b6ad920a7c..3f463b9a45fe31e8be1527709ddb1e7926dbf74d 100644 (file)
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_product</from-outcome>
-                       <to-view-id>/admin/product.xhtml</to-view-id>
+                       <to-view-id>/admin/admin_product.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_category</from-outcome>
-                       <to-view-id>/admin/category.xhtml</to-view-id>
+                       <to-view-id>/admin/admin_category.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_index</from-outcome>
diff --git a/web/admin/admin_category.xhtml b/web/admin/admin_category.xhtml
new file mode 100644 (file)
index 0000000..b8730f0
--- /dev/null
@@ -0,0 +1,90 @@
+<?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: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.categoryId}:
+                                                       <h:selectBooleanCheckbox class="input" value="true" />
+                                               </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 class="table_footer">
+                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_category.editCategory(cat)}" value="#{msg.ADMIN_BUTTON_EDIT_ENTRIES}" />
+                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(cat)}" value="#{msg.ADMIN_BUTTON_DELETE_ENTRIES}" />
+                                       </div>
+                               </h:form>
+                       </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="#{admin_category.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="#{admin_category.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
+                                               </div>
+                                       </div>
+                               </h:form>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/admin/admin_product.xhtml b/web/admin/admin_product.xhtml
new file mode 100644 (file)
index 0000000..ea8fc2a
--- /dev/null
@@ -0,0 +1,136 @@
+<?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:form id="form">
+                                       <h:dataTable id="product_table" var="product" value="#{adminProductController.allProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_ADMIN_PRODUCTS}">
+                                               <h:column>
+                                                       <f:facet name="header">Produktnummer:</f:facet>
+                                                       #{product.productId}:<h:selectBooleanCheckbox class="input" value="true" />
+                                               </h:column>
+
+                                               <h:column>
+                                                       <f:facet name="header">#{msg.ADMIN_ENTER_PRODUCT_TITLE}</f:facet>
+                                                               #{product.productTitle}
+                                               </h:column>
+
+                                               <h:column>
+                                                       <f:facet name="header">#{msg.SINGLE_ITEM_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  class="table_footer">
+                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton class="submit" type="submit" id="edit" action="#{adminProductController.editProduct(product)}" value="#{msg.ADMIN_BUTTON_EDIT_ENTRIES}" />
+                                               <h:commandButton class="delete" type="submit" id="delete" action="#{adminProductController.deleteProduct(product)}" value="#{msg.ADMIN_BUTTON_DELETE_ENTRIES}" />
+                                       </div>
+                               </h:form>
+                       </div>
+
+                       <div class="para">
+                               <h:form id="add_category">
+                                       <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="guest_title" size="10" maxlength="255" required="true" value="#{admin_product.productTitle}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left">
+                                                                       #{msg.SINGLE_ITEM_PRICE}
+                                                                       <div class="tiny">(z.B. <em>50.0</em>)</div>
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:inputText class="input" id="price" size="10" maxlength="255" required="true" value="#{admin_product.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.xhtml b/web/admin/category.xhtml
deleted file mode 100644 (file)
index b8730f0..0000000
+++ /dev/null
@@ -1,90 +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: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.categoryId}:
-                                                       <h:selectBooleanCheckbox class="input" value="true" />
-                                               </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 class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_category.editCategory(cat)}" value="#{msg.ADMIN_BUTTON_EDIT_ENTRIES}" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(cat)}" value="#{msg.ADMIN_BUTTON_DELETE_ENTRIES}" />
-                                       </div>
-                               </h:form>
-                       </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="#{admin_category.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="#{admin_category.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
-                                               </div>
-                                       </div>
-                               </h:form>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml
deleted file mode 100644 (file)
index ea8fc2a..0000000
+++ /dev/null
@@ -1,136 +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:form id="form">
-                                       <h:dataTable id="product_table" var="product" value="#{adminProductController.allProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_ADMIN_PRODUCTS}">
-                                               <h:column>
-                                                       <f:facet name="header">Produktnummer:</f:facet>
-                                                       #{product.productId}:<h:selectBooleanCheckbox class="input" value="true" />
-                                               </h:column>
-
-                                               <h:column>
-                                                       <f:facet name="header">#{msg.ADMIN_ENTER_PRODUCT_TITLE}</f:facet>
-                                                               #{product.productTitle}
-                                               </h:column>
-
-                                               <h:column>
-                                                       <f:facet name="header">#{msg.SINGLE_ITEM_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  class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="edit" action="#{adminProductController.editProduct(product)}" value="#{msg.ADMIN_BUTTON_EDIT_ENTRIES}" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{adminProductController.deleteProduct(product)}" value="#{msg.ADMIN_BUTTON_DELETE_ENTRIES}" />
-                                       </div>
-                               </h:form>
-                       </div>
-
-                       <div class="para">
-                               <h:form id="add_category">
-                                       <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="guest_title" size="10" maxlength="255" required="true" value="#{admin_product.productTitle}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </div>
-
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       #{msg.SINGLE_ITEM_PRICE}
-                                                                       <div class="tiny">(z.B. <em>50.0</em>)</div>
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:inputText class="input" id="price" size="10" maxlength="255" required="true" value="#{admin_product.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>