From: Roland Haeder Date: Sun, 17 Apr 2016 14:48:08 +0000 (+0200) Subject: Moved generic templates/page files to sub folders for re-organization. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=53c581f2e328d14516c9600d82b723bfb0f91d1f;p=jfinancials-war.git Moved generic templates/page files to sub folders for re-organization. Signed-off-by: Roland Häder --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 52787ffd..4b11ea61 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,6 +2,7 @@ +<<<<<<< HEAD @@ -54,6 +55,50 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 3d514fb... Moved generic templates/page files to sub folders for re-organization. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 11b8c85e..efc46f02 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -91,6 +91,10 @@ login_own_addressbooks /login/login_own_addressbooks.xhtml + + admin_logout + /admin/admin_logout.xhtml + basket /basket.xhtml @@ -101,19 +105,19 @@ admin_list_user - /admin/admin_user_list.xhtml + /admin/user/admin_user_list.xhtml admin_list_countries - /admin/admin_country_list.xhtml + /admin/contact/admin_country_list.xhtml admin_list_mobile_provider - /admin/admin_mobile_provider_list.xhtml + /admin/mobile_provider/admin_mobile_provider_list.xhtml admin_list_contact_cellphone - /admin/admin_contact_cellphone_list.xhtml + /admin/cellphone/admin_contact_cellphone_list.xhtml @@ -218,121 +222,121 @@ - /admin/admin_country_list.xhtml + /admin/contact/admin_country_list.xhtml admin_edit_country - /admin/admin_country_edit.xhtml + /admin/contact/admin_country_edit.xhtml admin_delete_country - /admin/admin_country_delete.xhtml + /admin/contact/admin_country_delete.xhtml - /admin/admin_mobile_provider_list.xhtml + /admin/mobile_provider/admin_mobile_provider_list.xhtml admin_edit_mobile_provider - /admin/admin_mobile_provider_edit.xhtml + /admin/mobile_provider/admin_mobile_provider_edit.xhtml admin_delete_mobile_provider - /admin/admin_mobile_provider_delete.xhtml + /admin/mobile_provider/admin_mobile_provider_delete.xhtml admin_show_mobile_provider - /admin/admin_mobile_provider_show.xhtml + /admin/mobile_provider/admin_mobile_provider_show.xhtml - /admin/admin_user_list.xhtml + /admin/user/admin_user_list.xhtml admin_show_user - /admin/admin_user_show.xhtml + /admin/user/admin_user_show.xhtml admin_edit_user - /admin/admin_user_edit.xhtml + /admin/user/admin_user_edit.xhtml admin_delete_user - /admin/admin_user_delete.xhtml + /admin/user/admin_user_delete.xhtml admin_unlock_user - /admin/admin_user_unlock.xhtml + /admin/user/admin_user_unlock.xhtml - /admin/admin_user_show.xhtml + /admin/user/admin_user_show.xhtml admin_show_contact_cellphone - /admin/admin_contact_cellphone_show.xhtml + /admin/cellphone/admin_contact_cellphone_show.xhtml admin_edit_contact_cellphone - /admin/admin_contact_cellphone_edit.xhtml + /admin/cellphone/admin_contact_cellphone_edit.xhtml admin_unlink_contact_cellphone - /admin/admin_contact_cellphone_unlink.xhtml + /admin/cellphone/admin_contact_cellphone_unlink.xhtml admin_delete_contact_cellphone - /admin/admin_contact_cellphone_delete.xhtml + /admin/cellphone/admin_contact_cellphone_delete.xhtml admin_edit_user - /admin/admin_user_edit.xhtml + /admin/user/admin_user_edit.xhtml admin_delete_user - /admin/admin_user_delete.xhtml + /admin/user/admin_user_delete.xhtml admin_unlock_user - /admin/admin_user_unlock.xhtml + /admin/user/admin_user_unlock.xhtml admin_show_mobile_provider - /admin/admin_mobile_provider_show.xhtml + /admin/mobile_provider/admin_mobile_provider_show.xhtml - /admin/admin_contact_cellphone_list.xhtml + /admin/cellphone/admin_contact_cellphone_list.xhtml admin_show_contact_cellphone - /admin/admin_contact_cellphone_show.xhtml + /admin/cellphone/admin_contact_cellphone_show.xhtml admin_edit_contact_cellphone - /admin/admin_contact_cellphone_edit.xhtml + /admin/cellphone/admin_contact_cellphone_edit.xhtml admin_delete_contact_cellphone - /admin/admin_contact_cellphone_delete.xhtml + /admin/cellphone/admin_contact_cellphone_delete.xhtml - /admin/admin_contact_cellphone_show.xhtml + /admin/cellphone/admin_contact_cellphone_show.xhtml admin_show_mobile_provider - /admin/admin_mobile_provider_show.xhtml + /admin/mobile_provider/admin_mobile_provider_show.xhtml admin_edit_contact_cellphone - /admin/admin_contact_cellphone_edit.xhtml + /admin/cellphone/admin_contact_cellphone_edit.xhtml admin_delete_contact_cellphone - /admin/admin_contact_cellphone_delete.xhtml + /admin/cellphone/admin_contact_cellphone_delete.xhtml admin_unlink_contact_cellphone - /admin/admin_contact_cellphone_unlink.xhtml + /admin/cellphone/admin_contact_cellphone_unlink.xhtml admin_show_contact - /admin/admin_contact_show.xhtml + /admin/contact/admin_contact_show.xhtml