From d8f1848f54a6bca8b200cae165f3ed5b1789703e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 31 May 2016 15:55:18 +0200 Subject: [PATCH] Continued a bit: - removed admin_logout - added missing h:outputText MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 118 +++++++++--------- web/WEB-INF/faces-config.xml | 8 -- web/WEB-INF/templates/admin/admin_menu.tpl | 14 +-- web/WEB-INF/templates/guest/guest_menu.tpl | 4 +- .../templates/login/user/user_menu.tpl | 8 +- .../templates/user/user_not_logged_in.tpl | 2 +- web/WEB-INF/templates/user/userid_error.tpl | 2 +- 7 files changed, 74 insertions(+), 82 deletions(-) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index e492c25d..afc94824 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,67 +2,67 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 58c0af52..4739537d 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -173,14 +173,6 @@ user_add_addressbook /user/login_add_addressbook.xhtml - - user_show_addressbook - /guest/user/show_addressbook.xhtml - - - show_addressbook_entries - /guest/user/show_addressbook_entries.xhtml - /user/login_edit_user_data.xhtml diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index c9de554d..561a516b 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -7,7 +7,7 @@
- #{msg.ADMIN_MENU_MAIN_TITLE} +
    @@ -15,7 +15,7 @@
- #{msg.ADMIN_MENU_USER_TITLE} +
    @@ -23,7 +23,7 @@
- #{msg.ADMIN_MENU_CONTACT_TITLE} +
    @@ -32,7 +32,7 @@
- #{msg.ADMIN_MENU_COUNTRY_TITLE} +
    @@ -40,7 +40,7 @@
- #{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE} +
    @@ -48,11 +48,11 @@
- #{msg.ADMIN_MENU_LOGOUT_TITLE} +
    -
    • +
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index be83b4a1..716799b6 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -8,7 +8,7 @@
- #{msg.MENU_HOME_TITLE} +
    @@ -22,7 +22,7 @@
- #{msg.MENU_USER_TITLE} +
    diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl index 9b153dda..f8961247 100644 --- a/web/WEB-INF/templates/login/user/user_menu.tpl +++ b/web/WEB-INF/templates/login/user/user_menu.tpl @@ -8,7 +8,7 @@
    - #{msg.MENU_HOME_TITLE} +
      @@ -22,7 +22,7 @@
    - #{msg.MENU_EDIT_PROFILE_TITLE} +
      @@ -32,7 +32,7 @@
    - #{msg.MENU_APPLICATIONS_TITLE} +
      @@ -42,7 +42,7 @@
    - #{msg.MENU_LOGOUT_TITLE} +
      diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl index d4a9658c..2bce29de 100644 --- a/web/WEB-INF/templates/user/user_not_logged_in.tpl +++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl @@ -7,7 +7,7 @@
      - #{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN} +
      diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl index b013deae..4b3fec3c 100644 --- a/web/WEB-INF/templates/user/userid_error.tpl +++ b/web/WEB-INF/templates/user/userid_error.tpl @@ -7,7 +7,7 @@
      - #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID} +
      -- 2.39.5