removed link as this is done in list page + readded base template

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 2290545442ac27b9b4deb51c0f05ddefb518f889..61be65f4929815292b6a05ce9985f6809c853c46 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,63 +2,62 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/index.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/index.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="index.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="*" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="privacy.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/index.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="index.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="*" x="1150" y="750" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="1150" y="600" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="900" y="900" zoom="true"/>
         <Node id="user/login.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="exception.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="user/register.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/index.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="terms.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="imprint.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="exception.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="terms.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="650" y="900" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 0d74bfab19b5986d2ad1ab57e9a398a7060aa959..a4ad461b9dc86c1cd11b688995026ca7f85ed5a2 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -63,6 +63,22 @@
                        <from-outcome>admin_logout</from-outcome>
                        <to-view-id>/admin/admin_logout.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_countries</from-outcome>
+                       <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>login_edit_user_data</from-outcome>
                        <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
@@ -82,22 +98,6 @@
                        <from-outcome>admin_add_user</from-outcome>
                        <to-view-id>/admin/admin_user_add.xhtml</to-view-id>
                </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_list_user</from-outcome>
-                       <to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_list_countries</from-outcome>
-                       <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_list_mobile_provider</from-outcome>
-                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_list_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
-               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/guest/user/login.xhtml</from-view-id>