X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=nbproject%2Ffaces-config.NavData;h=4efcbdfbcae8b247765c6ea5d85fb458e64beeb8;hb=125d6d98e12220406c9300b83aead506f937346e;hp=4b11ea61331be787978e3e7669fbe1f0b25ea932;hpb=53c581f2e328d14516c9600d82b723bfb0f91d1f;p=addressbook-war.git

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 4b11ea61..4efcbdfb 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,103 +2,72 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-<<<<<<< HEAD
-        <Node id="admin/admin_user_delete.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="privacy.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/admin_country_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_show.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_edit.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/admin_user_show.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_user_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="index.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/admin_contact_show.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="*" x="900" y="300" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/admin_country_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_delete.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_edit.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="user/register.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/admin_country_edit.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_delete.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/admin_user_list.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="terms.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_list.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="privacy.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="user/index.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/login_other_addressbooks.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="user/login_start_sharing_addressbook.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="*" x="150" y="300" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/user/admin_user_export.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="guest/user/resend_done.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="user/login_list_sharing_addressbooks.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="exception.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="1900" y="450" zoom="true"/>
         <Node id="logout.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_list.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/admin_user_unlock.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_show.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_unlink.xhtml" x="1400" y="150" zoom="true"/>
-=======
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="customer/register.xhtml" x="1150" y="150" zoom="true"/>
-        <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/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/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="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"/>
-        <Node id="customer/login.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="2150" y="150" zoom="true"/>
->>>>>>> 3d514fb... Moved generic templates/page files to sub folders for re-organization.
+        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="imprint.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/login_shared_addressbooks.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="2400" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>