Use table row abstractions

diff --git a/src/pgwui_upload_core/templates/upload.mak b/src/pgwui_upload_core/templates/upload.mak
index a9a88d457d04499fed67de21f948f68a0c722f05..3fe36fd8864a83a2e68220d051a8d6dea8cb1b34 100644 (file)
--- a/src/pgwui_upload_core/templates/upload.mak
+++ b/src/pgwui_upload_core/templates/upload.mak
@@ -59,8 +59,8 @@
 
 <%def name="format_row(tab_index)">
   <tr>
-    <td class="label">Uploaded Data Format:</td>
-    <td>
+    <%self.lib:td_label>Uploaded Data Format</%self.lib:td_label>
+    <%self.lib:td_input tab_index="${tab_index}" tab_inc="${2}">
       <input name="upload_fmt"
              id="upload_fmt_csv_id"
              tabindex="${tab_index.val}"
@@ -78,31 +78,30 @@
              ${tab_checked | n}
              />
       <label class="label" for="upload_fmt_tab_id">Tab delimited</label>
-    </td>
+    </%self.lib:td_input>
   </tr>
-  <% tab_index.inc(2) %>
 </%def>
 
 <%def name="nulls_row(tab_index)">
   % if show_choice(pgwui, 'null'):
     <tr>
-      <td class="label">
-        <label for="upload_null_id">Upload NULL Values: </label>
-      </td>
-      <td>
+      <%self.lib:td_label for_id="upload_null_id">
+        Upload NULL Values
+      </%self.lib:td_label>
+      <%self.lib:td_input tab_index="${tab_index}">
         <input name="upload_null"
                id="upload_null_id"
                tabindex="${tab_index.val}"
                type="checkbox"
                ${upload_null | n}
                />
-      </td>
+      </%self.lib:td_input>
     </tr>
     <tr>
-      <td class="label">
-        <label for="null_rep_id">NULL Representation: </label>
-      </td>
-      <td>
+      <%self.lib:td_label for_id="null_rep_id">
+        NULL Representation
+      </%self.lib:td_label>
+      <%self.lib:td_input tab_index="${tab_index}">
         <input name="null_rep"
                id="null_rep_id"
                tabindex="${tab_index.val + 1}"
@@ -110,67 +109,62 @@
                size="10"
                value="${null_rep}"
                />
-      </td>
+      </%self.lib:td_input>
     </tr>
-    <% tab_index.inc(2) %>
   % endif
 </%def>
 
 <%def name="file_row(tab_index)">
   <tr>
-    <td class="label">
-      <label for="datafile_id">
-        File to upload:
-      </label>
+    <%self.lib:td_label for_id="datafile_id">
+        File to upload
+    </%self.lib:td_label>
     </td>
-    <td colspan="2">
+    ## Missing colspan="2" here
+    <%self.lib:td_input tab_index="${tab_index}">
       <input name="datafile"
              tabindex="${tab_index.val}"
              id="datafile_id"
              type="file"
              size="75"
              />
-    </td>
+    </%self.lib:td_input>
   </tr>
-  <% tab_index.inc() %>
 </%def>
 
 <%def name="trim_row(tab_index)">
   % if show_choice(pgwui, 'trim'):
       <tr>
-        <td class="label">
-          <label for="trim_upload_id">Trim Leading/Trailing Spaces:</label>
-        </td>
-        <td>
+        <%self.lib:td_label for_id="trim_upload_id">
+          Trim Leading/Trailing Spaces
+        </%self.lib:td_label>
+        <%self.lib:td_input tab_index="${tab_index}">
           <input name="trim_upload"
                  tabindex="${tab_index.val}"
                  id="trim_upload_id"
                  type="checkbox"
                  ${trim_upload | n}
                  />
-        </td>
+        </%self.lib:td_input>
       </tr>
-      <% tab_index.inc() %>
   % endif
 </%def>
 
 <%def name="literal_row(tab_index)">
   % if show_choice(pgwui, 'literal_column_headings'):
     <tr>
-      <td class="label">
-        <label for="literal_col_headings_id">Literal
-               Uploaded Column Headings:</label>
-      </td>
-      <td>
+      <%self.lib:td_label for_id="literal_col_headings_id">
+        Literal Uploaded Column Headings
+      </%self.lib:td_label>
+      <%self.lib:td_input tab_index="${tab_index}">
         <input name="literal_col_headings"
                tabindex="${tab_index.val}"
                id="literal_col_headings_id"
                type="checkbox"
                ${literal_col_headings | n}
                />
-      </td>
+      </%self.lib:td_input>
     </tr>
-    <% tab_index.inc() %>
   % endif
 </%def>