added navigation cases (really lazy) for admin pages

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index fc3ecfb9cff69b3ca8da45d3bc6b8ed319ff35f2..e6032f0e9b57ddca01bb00053aaf88e652782053 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -1,63 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only">
-        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="logout.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="*" x="1150" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/admin_user_delete.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="privacy.xhtml" x="1400" y="450" zoom="true"/>
         <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="user/register.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/admin_user_list.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/admin_user_edit.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="index.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/admin_user_unlock.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="*" x="650" y="300" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="450" zoom="true"/>
     </Scope>
     <Scope Scope="Project">
-        <Node id="login/login_shared_addressbooks.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/register.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="terms.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="index.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="*" x="650" y="150" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/index.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/login.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/admin_user_delete.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/index.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/admin_user_list.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/admin_user_edit.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="logout.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/admin_user_unlock.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="*" x="150" y="900" zoom="true"/>
+        <Node id="imprint.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1150" y="450" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations">
-        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="logout.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="*" x="1150" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/admin_user_delete.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/admin_user_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/admin_user_edit.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="index.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="logout.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/admin_user_unlock.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="*" x="400" y="600" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="imprint.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="650" y="750" zoom="true"/>
     </Scope>
 </Scene>

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index d9d1dfb2dcfe2efad23ac8bb5e73e7c0f75576b3..27799100f3de460cc1200c81e5bb0e585a18f7fe 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -115,6 +115,22 @@
                        <from-outcome>user_profile</from-outcome>
                        <to-view-id>/user/user_profile.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_user</from-outcome>
+                       <to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_user</from-outcome>
+                       <to-view-id>/admin/admin_user_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_user</from-outcome>
+                       <to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlock_user</from-outcome>
+                       <to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/user/login.xhtml</from-view-id>