From ba58a08befb746d41bdd025c218c5ca9f4a44706 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 2 May 2016 12:39:57 +0200 Subject: [PATCH] Continued a bit: - added missing helper call - renamed method - added missing navigation rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 104 +++++++++--------- .../user/PizzaAdminUserWebRequestBean.java | 2 +- .../PizzaAdminUserWebRequestController.java | 2 +- web/WEB-INF/faces-config.xml | 20 ++++ web/WEB-INF/templates/guest/guest_footer.tpl | 4 + web/WEB-INF/templates/login/login_footer.tpl | 30 +++++ 6 files changed, 108 insertions(+), 54 deletions(-) create mode 100644 web/WEB-INF/templates/login/login_footer.tpl diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index f7f4169d..b63f5899 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,58 +2,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index 451919d8..f1f847e8 100644 --- 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 9026a24d..53741268 100644 --- 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 { *

* @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 19e70b19..2edfbb2e 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -286,6 +286,26 @@ admin_delete_contact /admin/contact/admin_contact_delete.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + + admin_edit_contact_cellphone + /admin/cellphone/admin_contact_cellphone_edit.xhtml + + + admin_delete_contact_cellphone + /admin/cellphone/admin_contact_cellphone_delete.xhtml + + + admin_unlink_contact_cellphone + /admin/cellphone/admin_contact_cellphone_unlink.xhtml + + + admin_show_contact_cellphone + /admin/cellphone/admin_contact_cellphone_show.xhtml + /admin/cellphone/admin_contact_cellphone_list.xhtml diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index ca66023e..e1ff4cbe 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -9,15 +9,19 @@

    • +
    • +
    • +
    • +
  • Copyright (c) 2016 by Roland Häder
    • diff --git a/web/WEB-INF/templates/login/login_footer.tpl b/web/WEB-INF/templates/login/login_footer.tpl new file mode 100644 index 00000000..bafe6e1b --- /dev/null +++ b/web/WEB-INF/templates/login/login_footer.tpl @@ -0,0 +1,30 @@ + + +
    +
      +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    • Copyright (c) 2016 by Roland Häder
      • +
    +
    + +
    +     -- 2.39.5