From 8fc2f11b8b61897ef8d9e151f9d59a492587fe8d Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 22 Nov 2020 12:17:27 -0600 Subject: [PATCH] Use inheritence for navbar --- src/pgwui_common/templates/auth_base.mak | 12 +++++------- src/pgwui_common/templates/base.mak | 9 ++++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/pgwui_common/templates/auth_base.mak b/src/pgwui_common/templates/auth_base.mak index d5e28ef..0837aba 100644 --- a/src/pgwui_common/templates/auth_base.mak +++ b/src/pgwui_common/templates/auth_base.mak @@ -50,13 +50,11 @@ <%inherit file="${base_mak}" /> -<%def name="navbar()"> - +<%def name="navbar_content()"> + ${parent.navbar_content()} + % if 'pgwui_logout' in pgwui['routes']: + | Logout + % endif <%block name="summary_info"> diff --git a/src/pgwui_common/templates/base.mak b/src/pgwui_common/templates/base.mak index b442b64..a66324c 100644 --- a/src/pgwui_common/templates/base.mak +++ b/src/pgwui_common/templates/base.mak @@ -30,9 +30,16 @@ +<%def name="navbar_content()"> + HOME + % if 'pgwui_menu' in pgwui['routes']: + | Menu + % endif + + <%def name="navbar()"> -- 2.34.1