Abstract table row label construction

diff --git a/src/pgwui_common/templates/auth_base.mak b/src/pgwui_common/templates/auth_base.mak
index 927c4b2b92a4a33ca0679cf42c95537be7ecdda4..6c11cd86494e2a0476938bffd32d4aaf8ac9fc1b 100644 (file)
--- a/src/pgwui_common/templates/auth_base.mak
+++ b/src/pgwui_common/templates/auth_base.mak
@@ -68,7 +68,7 @@
 %>
 
 <%inherit file="${errors_base_mak}" />
-<%namespace name="lib" file="${lib_mak}" />
+<%namespace name="lib" file="${lib_mak}" inheritable="True"/>
 
 <%def name="navbar_content()">
   <%parent:navbar_content>
@@ -97,9 +97,7 @@
 
 <%def name="user_row(tab_index, havecreds, user)">
       <tr>
-        <td class="label">
-          <label for="user_id">Username:</label>
-        </td>
+        <%self.lib:td_label>Username</%self.lib:td_label>
         <td>
           % if havecreds:
             <span id="user_id">${user}</span>
@@ -120,9 +118,7 @@
 <%def name="password_row(tab_index, havecreds)">
       % if not havecreds:
         <tr>
-          <td class="label">
-            <label for="password_id">Password:</label>
-          </td>
+          <%self.lib:td_label>Password</%self.lib:td_label>
           <td>
             <input name="password"
                    tabindex="${tab_index.val}"

diff --git a/src/pgwui_common/templates/db_base.mak b/src/pgwui_common/templates/db_base.mak
index 694b6ef822de15bdd00526443a9742236d4022be..b4f258bea86f01849c4db131f09dd50c85f6e9c4 100644 (file)
--- a/src/pgwui_common/templates/db_base.mak
+++ b/src/pgwui_common/templates/db_base.mak
@@ -66,9 +66,7 @@
 
 <%def name="database_row(tab_index)">
   <tr>
-    <td class="label">
-      <label for="db_id">Database:</label>
-    </td>
+    <%self.lib:td_label>Database</%self.lib:td_label>
     <td>
       <input name="db"
              tabindex="${tab_index.val}"

diff --git a/src/pgwui_common/templates/lib.mak b/src/pgwui_common/templates/lib.mak
index 867c2614ad5bd52a429d92c8fe7436631b7e7bcf..2824d577674c33403abaaa3cdd87b7f97a4b39a3 100644 (file)
--- a/src/pgwui_common/templates/lib.mak
+++ b/src/pgwui_common/templates/lib.mak
@@ -35,3 +35,11 @@
      | <a href="${pgwui["urls"]["pgwui_logout"]}"> Logout</a>
    % endif
 </%def>
+
+## Table data
+
+<%def name="td_label()">
+        <td class="label">
+          <label for="user_id">${capture(caller.body) | trim}:</label>
+        </td>
+</%def>