From 1332cbf8365bedf32e19343341ddad0396f72b5e Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Sun, 28 Jul 2024 14:37:36 -0500
Subject: [PATCH] Do the navbar properly

---
 src/pgwui_menu/templates/menu.mak | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pgwui_menu/templates/menu.mak b/src/pgwui_menu/templates/menu.mak
index 3265135..f1bdc47 100644
--- a/src/pgwui_menu/templates/menu.mak
+++ b/src/pgwui_menu/templates/menu.mak
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <%doc>
-  Copyright (C) 2020 The Meme Factory, Inc.  http://www.karlpinc.com/
+  Copyright (C) 2020, 2024 The Meme Factory, Inc.  http://www.karlpinc.com/
  
      This file is part of PGWUI_Menu.
     
@@ -38,9 +38,11 @@
     from pgwui_common.path import asset_abspath
 
     base_mak = asset_abspath('pgwui_common:templates/base.mak')
+    lib_mak = asset_abspath('pgwui_common:templates/lib.mak')
 %>
 
 <%inherit file="${base_mak}" />
+<%namespace name="lib" file="${lib_mak}" />
 <%block name="title">${pgwui_menu['menu_label']}</%block>
 <%block name="stylesheet_links">
   ${parent.stylesheet_links()}
@@ -50,10 +52,11 @@
 </%block>
 
 <%def name="navbar_content()">
-  ${parent.navbar_content()}
-  % if 'pgwui_logout' in pgwui['urls']:
-    | <a href="${pgwui['urls']['pgwui_logout']}">Logout</a>
-  % endif
+  <%parent:navbar_content>
+    <%lib:have_navbar_logout>
+      ${caller.body()}
+    </%lib:have_navbar_logout>
+  </%parent:navbar_content>
 </%def>
 
 <ul>
-- 
2.34.1