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 f7f4169d6a066341a69de1bd06c4bd030c66511f..b63f58998d60a17aaef7cb92ad9efe17a212d2d1 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,58 +2,58 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/index.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="customer/register.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="item_added.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="index.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="customer/login.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="*" x="1150" y="900" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="basket.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="exception.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="terms.xhtml" x="150" y="1050" 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="450" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="logout.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="customer/register.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="item_added.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="index.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="*" x="900" y="750" zoom="true"/>
+        <Node id="customer/login.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="1400" y="450" 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="2150" y="300" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="basket.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="exception.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="terms.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="imprint.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="150" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
index 451919d8314e7c6cf8f1cb1b3b3f8ba1ea0cd5db..f1f847e852a845325982af7ef69fdb4a213351d4 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
@@ -256,7 +256,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
        }
 
        @Override
-       public String changeUserData () {
+       public String editUserData () {
                // Get user instance
                User user = this.adminHelper.getUser();
 

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java
index 9026a24d6c2d9b9a92e50b0907db286f93a34485..53741268743da19fa1635e997a9638becd94020a 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java
@@ -39,7 +39,7 @@ public interface PizzaAdminUserWebRequestController 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 19e70b19da39f805c42c88c67ff36c4e708cc9f7..2edfbb2eeee1fbcc9241b3f74c5f18bf08d400bb 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -286,6 +286,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>

diff --git a/web/WEB-INF/templates/login/login_footer.tpl b/web/WEB-INF/templates/login/login_footer.tpl
new file mode 100644 (file)
index 0000000..bafe6e1
--- /dev/null
+++ b/web/WEB-INF/templates/login/login_footer.tpl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+       <div class="footer">
+               <ul class="footer_nav">
+                       <li class="footer_link">
+                               <h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_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>
+
+       <div class="clear"></div>
+</ui:composition>