From 6bbc7b7a521b249ec53af758bb3fe23c3af58bc6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Thu, 20 Apr 2017 11:14:04 +0200 Subject: [PATCH] Please cherry-pick: - XML header added - admin_logout is now the outcome MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- web/WEB-INF/faces-config.xml | 4 ++++ web/WEB-INF/templates/admin/admin_menu.tpl | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 60b010fb..7fdfa16b 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -52,6 +52,10 @@ <from-outcome>logout</from-outcome> <to-view-id>/logout.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>admin_logout</from-outcome> + <to-view-id>/admin/admin_logout.xhtml</to-view-id> + </navigation-case> <navigation-case> <from-outcome>admin_index</from-outcome> <to-view-id>/admin/index.xhtml</to-view-id> diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index da659c55..edf1aa7e 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" ?> <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" @@ -53,7 +54,7 @@ </div> <ul> - <li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li> + <li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li> <li><h:link title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" /></li> </ul> </div> -- 2.39.5