From: Karl O. Pinc Date: Sun, 28 Jul 2024 19:37:36 +0000 (-0500) Subject: Do the navbar properly X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=1332cbf8365bedf32e19343341ddad0396f72b5e;p=pgwui_menu Do the navbar properly --- 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 @@ <%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 name="stylesheet_links"> ${parent.stylesheet_links()} @@ -50,10 +52,11 @@ <%def name="navbar_content()"> - ${parent.navbar_content()} - % if 'pgwui_logout' in pgwui['urls']: - | Logout - % endif + <%parent:navbar_content> + <%lib:have_navbar_logout> + ${caller.body()} + +