Opps ...

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 64b6162753d33111cd7ecbf5978761361069570a..62baaf8e870b0d4ca64e02a32706b17c3be1d5f5 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -21,18 +21,18 @@
         <Node id="admin/category/admin_category_list.xhtml" x="400" y="1200" zoom="true"/>
         <Node id="item_added.xhtml" x="1400" y="450" zoom="true"/>
         <Node id="admin/category/admin_category_delete.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/contact/admin_country_delete.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="150" zoom="true"/>
         <Node id="admin/user/admin_user_edit.xhtml" x="900" y="150" zoom="true"/>
         <Node id="admin/admin_logout.xhtml" x="900" y="600" zoom="true"/>
         <Node id="terms.xhtml" x="1400" y="600" zoom="true"/>
         <Node id="admin/user/admin_user_unlock.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_country_edit.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="admin/user/admin_user_list.xhtml" x="400" y="1050" zoom="true"/>
         <Node id="customer/lost_passwd.xhtml" x="1150" y="600" zoom="true"/>
         <Node id="index.xhtml" x="150" y="600" zoom="true"/>
         <Node id="admin/category/admin_category_edit.xhtml" x="400" y="450" zoom="true"/>
         <Node id="logout.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
         <Node id="customer/checkout_done.xhtml" x="150" y="150" zoom="true"/>
         <Node id="*" x="400" y="600" zoom="true"/>
         <Node id="imprint.xhtml" x="650" y="750" zoom="true"/>

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 0ae81cc4496293964a78fcf0e600746ee8db3600..d750fc19d3e824798d971cd2eeff483ad3532d6b 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -85,7 +85,7 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_countries</from-outcome>
-                       <to-view-id>/admin/contact/admin_country_list.xhtml</to-view-id>
+                       <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_mobile_provider</from-outcome>
@@ -158,14 +158,14 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/contact/admin_country_list.xhtml</from-view-id>
+               <from-view-id>/admin/country/admin_country_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>admin_edit_country</from-outcome>
-                       <to-view-id>/admin/contact/admin_country_edit.xhtml</to-view-id>
+                       <to-view-id>/admin/country/admin_country_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_country</from-outcome>
-                       <to-view-id>/admin/contact/admin_country_delete.xhtml</to-view-id>
+                       <to-view-id>/admin/country/admin_country_delete.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>