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 543545e3835894fae1b44f3ab30089d7cb31c0a8..089188c11de941c8537c0bf102155c922bca3542 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 ce53c0588669eeab315358342981ab577a36f5d5..b865ba022208e5e19d6b8e2870e857a4c5941030 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -64,7 +64,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>