From: Roland Haeder Date: Sat, 9 Apr 2016 10:47:54 +0000 (+0200) Subject: Renamed after naming convention: admin_foo.xhtml in admin area, but foo.xhtml is... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=89cba6df1a81c2d939e1a0ed914929e17e078a27;p=pizzaservice-war.git Renamed after naming convention: admin_foo.xhtml in admin area, but foo.xhtml is for guest ;-) --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index ddcb9e09..90a76d02 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -11,12 +11,12 @@ - + - + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index bb3d4bbf..3f463b9a 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -57,11 +57,11 @@ admin_product - /admin/product.xhtml + /admin/admin_product.xhtml admin_category - /admin/category.xhtml + /admin/admin_category.xhtml admin_index diff --git a/web/admin/admin_category.xhtml b/web/admin/admin_category.xhtml new file mode 100644 index 00000000..b8730f0e --- /dev/null +++ b/web/admin/admin_category.xhtml @@ -0,0 +1,90 @@ + + + + + + #{msg.PAGE_TITLE_ADMIN_CATEGORIES} + + + #{msg.CONTENT_TITLE_ADMIN_CATEGORIES} + + + +
+ + + + #{msg.SELECT_ENTRY} + #{cat.categoryId}: + + + + + #{msg.ADMIN_ENTER_CATEGORY_TITLE} + #{cat.categoryTitle} + + + + #{msg.ADMIN_PARENT_CATEGORY} + #{cat.parentCategory.categoryId} + + + +
+ + + +
+ +
+ +
+ +
+
+ #{msg.ADMIN_ADD_CATEGORY_TITLE} +
+ +
+ #{msg.PLEASE_FILL_ALL_FIELDS} + +
+
+ #{msg.ADMIN_ENTER_CATEGORY_TITLE} +
#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}
+
+ +
+ +
+ +
+
+ +
+
+ #{msg.ADMIN_PARENT_CATEGORY} +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+ +
+ + + diff --git a/web/admin/admin_product.xhtml b/web/admin/admin_product.xhtml new file mode 100644 index 00000000..ea8fc2a1 --- /dev/null +++ b/web/admin/admin_product.xhtml @@ -0,0 +1,136 @@ + + + + + + #{msg.PAGE_TITLE_ADMIN_PRODUCTS} + + + #{msg.CONTENT_TITLE_ADMIN_PRODUCTS} + + + +
+ + + + Produktnummer: + #{product.productId}: + + + + #{msg.ADMIN_ENTER_PRODUCT_TITLE} + #{product.productTitle} + + + + #{msg.SINGLE_ITEM_PRICE} + #{product.productPrice} + + + + #{msg.CATEGORY} + #{product.productCategory.categoryTitle} + + + + #{msg.IS_AVAILABLE} + #{product.productAvailability} + + + +
+ + + +
+ +
+ +
+ +
+
+ #{msg.ADMIN_ADD_PRODUCT_TITLE} +
+ +
+ #{msg.PLEASE_FILL_ALL_FIELDS} + +
+
+ #{msg.ADMIN_ENTER_PRODUCT_TITLE} +
#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}
+
+ +
+ +
+ +
+
+ +
+
+ #{msg.SINGLE_ITEM_PRICE} +
(z.B. 50.0)
+
+ +
+ +
+ +
+
+ +
+
+ #{msg.CATEGORY} +
+ +
+ +
+ +
+
+ +
+
+ #{msg.IS_AVAILABLE} +
+ +
+ + + + +
+ +
+
+
+ +
+ + +
+
+ +
+ +
+ #{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE} +
    +
  • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}
    • +
  • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}
    • +
  • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}
    • +
+
+ + + diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml deleted file mode 100644 index b8730f0e..00000000 --- a/web/admin/category.xhtml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_ADMIN_CATEGORIES} - - - #{msg.CONTENT_TITLE_ADMIN_CATEGORIES} - - - -
- - - - #{msg.SELECT_ENTRY} - #{cat.categoryId}: - - - - - #{msg.ADMIN_ENTER_CATEGORY_TITLE} - #{cat.categoryTitle} - - - - #{msg.ADMIN_PARENT_CATEGORY} - #{cat.parentCategory.categoryId} - - - -
- - - -
- -
- -
- -
-
- #{msg.ADMIN_ADD_CATEGORY_TITLE} -
- -
- #{msg.PLEASE_FILL_ALL_FIELDS} - -
-
- #{msg.ADMIN_ENTER_CATEGORY_TITLE} -
#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}
-
- -
- -
- -
-
- -
-
- #{msg.ADMIN_PARENT_CATEGORY} -
- -
- -
- -
-
-
- -
- - -
-
- -
- - - diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml deleted file mode 100644 index ea8fc2a1..00000000 --- a/web/admin/product.xhtml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_ADMIN_PRODUCTS} - - - #{msg.CONTENT_TITLE_ADMIN_PRODUCTS} - - - -
- - - - Produktnummer: - #{product.productId}: - - - - #{msg.ADMIN_ENTER_PRODUCT_TITLE} - #{product.productTitle} - - - - #{msg.SINGLE_ITEM_PRICE} - #{product.productPrice} - - - - #{msg.CATEGORY} - #{product.productCategory.categoryTitle} - - - - #{msg.IS_AVAILABLE} - #{product.productAvailability} - - - -
- - - -
- -
- -
- -
-
- #{msg.ADMIN_ADD_PRODUCT_TITLE} -
- -
- #{msg.PLEASE_FILL_ALL_FIELDS} - -
-
- #{msg.ADMIN_ENTER_PRODUCT_TITLE} -
#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}
-
- -
- -
- -
-
- -
-
- #{msg.SINGLE_ITEM_PRICE} -
(z.B. 50.0)
-
- -
- -
- -
-
- -
-
- #{msg.CATEGORY} -
- -
- -
- -
-
- -
-
- #{msg.IS_AVAILABLE} -
- -
- - - - -
- -
-
-
- -
- - -
-
- -
- -
- #{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE} -
    -
  • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}
    • -
  • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}
    • -
  • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}
    • -
-
- - -