From 25cc5a0264200bee71aed4cf31ebfeb3d3a5947d Mon Sep 17 00:00:00 2001
From: nmihajlovski <nikolce.mihajlovski@gmail.com>
Date: Mon, 27 Feb 2017 17:37:35 +0100
Subject: [PATCH] Fixed the "logout" button.

---
 rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java | 1 +
 .../src/main/java/org/rapidoid/gui/HtmlPageUtils.java     | 8 ++++++++
 .../default/templates/page-segments/page-menu.html        | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java
index 15cffd1c71..00f1cfd361 100644
--- a/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java
+++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java
@@ -205,6 +205,7 @@ private Map<String, Object> has() {
 		has.put("path", HtmlPageUtils.HAS_PATH);
 		has.put("zone", HtmlPageUtils.HAS_ZONE);
 		has.put("page", HtmlPageUtils.HAS_PAGE);
+		has.put("special_page", HtmlPageUtils.HAS_SPECIAL_PAGE);
 
 		return has;
 	}
diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPageUtils.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPageUtils.java
index e9f550da3d..cfa1ff1140 100644
--- a/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPageUtils.java
+++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPageUtils.java
@@ -7,6 +7,7 @@
 import org.rapidoid.gui.reqinfo.ReqInfo;
 import org.rapidoid.http.HttpVerb;
 import org.rapidoid.render.Getter;
+import org.rapidoid.util.Msc;
 
 /*
  * #%L
@@ -39,6 +40,13 @@ public Object get(String page) {
 		}
 	};
 
+	static final Getter HAS_SPECIAL_PAGE = new Getter() {
+		@Override
+		public Object get(String page) {
+			return ReqInfo.get().hasRoute(HttpVerb.GET, Msc.specialUri(page));
+		}
+	};
+
 	static final Getter HAS_ROLE = new Getter() {
 		@Override
 		public Object get(String role) {
diff --git a/rapidoid-html/src/main/resources/default/templates/page-segments/page-menu.html b/rapidoid-html/src/main/resources/default/templates/page-segments/page-menu.html
index acbb9f9b4c..168468a6bc 100644
--- a/rapidoid-html/src/main/resources/default/templates/page-segments/page-menu.html
+++ b/rapidoid-html/src/main/resources/default/templates/page-segments/page-menu.html
@@ -45,11 +45,11 @@
             <i class="fa fa-user"></i> ${username}
         </a>
         </li>
-        {{?has.page.$_logout}}
+        {{?has.special_page.logout}}
         <li>
             <a href="${req.contextPath}${logoutUri}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-sign-out"></i></a>
         </li>
-        {{/has.page.$_logout}}
+        {{/has.special_page.logout}}
     </ul>
     {{/username}}