From 50e0d287188a0e7b2e37d1be85cd2e4aea07a105 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= 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 --- web/WEB-INF/faces-config.xml | 4 ++++ web/WEB-INF/templates/admin/admin_menu.tpl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 543545e3..089188c1 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -52,6 +52,10 @@ logout /logout.xhtml + + admin_logout + /admin/admin_logout.xhtml + admin_index /admin/index.xhtml diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index ce53c058..b865ba02 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -64,7 +64,7 @@
    -
  • +
-- 2.39.5