Continued a bit:

- added missing helper call
- renamed method
- added missing navigation rules

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

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

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
index c12b562e73a9c8430fa38a144cceb2182e646d58..f5bde77c8e8216f69c9c8cc900a4dd224eea9bdf 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
@@ -237,7 +237,7 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
        }
 
        @Override
-       public String changeUserData () {
+       public String editUserData () {
                // Get user instance
                User user = this.adminHelper.getUser();
 

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
index b26579cd05de04295509fc706d03210e69c5367b..599be4e3c004888362c5cbba40305e47de85cd3c 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
@@ -76,7 +76,7 @@ public interface AddressbookAdminUserWebRequestController extends Serializable {
         * <p>
         * @return Redirect outcome
         */
-       String changeUserData ();
+       String editUserData ();
 
        /**
         * Getter for user name

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index f42c103493da61bca97eeafc3cc4699354849752..cd30a0069b43a9c6c74a5e23a63df007261c0823 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -283,6 +283,26 @@
                        <from-outcome>admin_delete_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>

diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index ca66023edd591fa26552539ea0d8a11c17d33742..e1ff4cbe05676c5926a7cffca0cf8971c62ca7ee 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -9,15 +9,19 @@
                        <li class="footer_link">
                                <h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
                        </li>
+
                        <li class="footer_link">
                                <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
                        </li>
+
                        <li class="footer_link">
                                <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
                        </li>
+
                        <li class="footer_link">
                                <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
                        </li>
+
                        <li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
                </ul>
        </div>