Use inheritence for navbar

diff --git a/src/pgwui_common/templates/auth_base.mak b/src/pgwui_common/templates/auth_base.mak
index d5e28ef199d68e9b7a06cc16bcf8d48148891950..0837aba0dfcdaf3ab4a0be4895d24fee0fdcf6c7 100644 (file)
--- 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()">
-  <p class="navbar">
-    <a href="${pgwui['routes']['pgwui_home']}">HOME</a>
-    % if 'pgwui_logout' in pgwui['routes']:
-      | <a href="${pgwui['routes']['pgwui_logout']}">Logout</a>
-    % endif
-  </p>
+<%def name="navbar_content()">
+  ${parent.navbar_content()}
+  % if 'pgwui_logout' in pgwui['routes']:
+    | <a href="${pgwui['routes']['pgwui_logout']}">Logout</a>
+  % endif
 </%def>
 
 <%block name="summary_info">

diff --git a/src/pgwui_common/templates/base.mak b/src/pgwui_common/templates/base.mak
index b442b648fe2efa2c2173a8a99ca652b13e1bdfff..a66324ca277f73cbbf234f28694bab43f9149dbc 100644 (file)
--- a/src/pgwui_common/templates/base.mak
+++ b/src/pgwui_common/templates/base.mak
@@ -30,9 +30,16 @@
 
 </%doc>
 
+<%def name="navbar_content()">
+  <a href="${pgwui['routes']['pgwui_home']}">HOME</a>
+  % if 'pgwui_menu' in pgwui['routes']:
+    | <a href="${pgwui['routes']['pgwui_menu']}">Menu</a>
+  % endif
+</%def>
+
 <%def name="navbar()">
   <p class="navbar">
-    <a href="${pgwui['routes']['pgwui_home']}">HOME</a>
+    ${self.navbar_content()}
   </p>
 </%def>