Please cherry-pick:

- XML header added
- admin_logout is now the outcome

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

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 4f733ca9988feccba75c3c2a0ce4f762e145c470..b4d0b42f74fd47e2d64a6639de26d614d0e1d959 100644 (file)
--- 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 da659c550f3317ce1bda4d9076aeeb1d10445842..edf1aa7e2213404261a688a551815c4ee3a49ad3 100644 (file)
--- 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>