From b895ad17802bb45b11595b69b979c7c51161b2b2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 17 Apr 2016 16:34:31 +0200
Subject: [PATCH] Moved category/product pages/templates to corresponding sub
 folders (re-organizing)

---
 nbproject/faces-config.NavData                   | 12 ++++++------
 web/WEB-INF/faces-config.xml                     | 16 ++++++++--------
 .../admin_category_selection_box.tpl             |  0
 .../admin_parent_category_selection_box.tpl      |  0
 .../{ => category}/admin_category_delete.xhtml   |  0
 .../{ => category}/admin_category_edit.xhtml     |  0
 .../{ => category}/admin_category_list.xhtml     |  2 +-
 .../{ => product}/admin_product_delete.xhtml     |  0
 web/admin/{ => product}/admin_product_edit.xhtml |  0
 web/admin/{ => product}/admin_product_list.xhtml |  2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)
 rename web/WEB-INF/templates/admin/{ => category}/admin_category_selection_box.tpl (100%)
 rename web/WEB-INF/templates/admin/{ => category}/admin_parent_category_selection_box.tpl (100%)
 rename web/admin/{ => category}/admin_category_delete.xhtml (100%)
 rename web/admin/{ => category}/admin_category_edit.xhtml (100%)
 rename web/admin/{ => category}/admin_category_list.xhtml (96%)
 rename web/admin/{ => product}/admin_product_delete.xhtml (100%)
 rename web/admin/{ => product}/admin_product_edit.xhtml (100%)
 rename web/admin/{ => product}/admin_product_list.xhtml (97%)

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/category/admin_category_selection_box.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_category_selection_box.tpl
rename to web/WEB-INF/templates/admin/category/admin_category_selection_box.tpl
diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
rename to web/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl
diff --git a/web/admin/admin_category_delete.xhtml b/web/admin/category/admin_category_delete.xhtml
similarity index 100%
rename from web/admin/admin_category_delete.xhtml
rename to web/admin/category/admin_category_delete.xhtml
diff --git a/web/admin/admin_category_edit.xhtml b/web/admin/category/admin_category_edit.xhtml
similarity index 100%
rename from web/admin/admin_category_edit.xhtml
rename to web/admin/category/admin_category_edit.xhtml
diff --git a/web/admin/admin_category_list.xhtml b/web/admin/category/admin_category_list.xhtml
similarity index 96%
rename from web/admin/admin_category_list.xhtml
rename to web/admin/category/admin_category_list.xhtml
index 9044182a..926bab6f 100644
--- a/web/admin/admin_category_list.xhtml
+++ b/web/admin/category/admin_category_list.xhtml
@@ -64,7 +64,7 @@
 								</div>
 
 								<div class="table_right">
-									<ui:include src="/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl" />
+									<ui:include src="/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl" />
 								</div>
 
 								<div class="clear"></div>
diff --git a/web/admin/admin_product_delete.xhtml b/web/admin/product/admin_product_delete.xhtml
similarity index 100%
rename from web/admin/admin_product_delete.xhtml
rename to web/admin/product/admin_product_delete.xhtml
diff --git a/web/admin/admin_product_edit.xhtml b/web/admin/product/admin_product_edit.xhtml
similarity index 100%
rename from web/admin/admin_product_edit.xhtml
rename to web/admin/product/admin_product_edit.xhtml
diff --git a/web/admin/admin_product_list.xhtml b/web/admin/product/admin_product_list.xhtml
similarity index 97%
rename from web/admin/admin_product_list.xhtml
rename to web/admin/product/admin_product_list.xhtml
index 3ee0944d..8e92a519 100644
--- a/web/admin/admin_product_list.xhtml
+++ b/web/admin/product/admin_product_list.xhtml
@@ -87,7 +87,7 @@
 								</div>
 
 								<div class="table_right">
-									<ui:include src="/WEB-INF/templates/admin/admin_category_selection_box.tpl" />
+									<ui:include src="/WEB-INF/templates/admin/category/admin_category_selection_box.tpl" />
 								</div>
 
 								<div class="clear"></div>
-- 
2.39.5