Use TabIndex in inherited templates

diff --git a/src/pgwui_upload_core/templates/upload.mak b/src/pgwui_upload_core/templates/upload.mak
index a0886aeae59a9b5980d9b1d03311b08ff133b11f..a53c2478dbee691831bddd3a97bdf820c155f400 100644 (file)
--- a/src/pgwui_upload_core/templates/upload.mak
+++ b/src/pgwui_upload_core/templates/upload.mak
@@ -1,5 +1,5 @@
 <%doc>
-  Copyright (C) 2015, 2018, 2020, 2021 The Meme Factory, Inc.
+  Copyright (C) 2015, 2018, 2020, 2021, 2024 The Meme Factory, Inc.
   http://www.karlpinc.com/
  
      This file is part of PGWUI_Upload_Core.
@@ -52,36 +52,38 @@
         </td>
         <td>
           <input name="trim_upload"
-                 tabindex="${tab_index}"
+                 tabindex="${tab_index.val}"
                  id="trim_upload_id"
                  type="checkbox"
                  ${trim_upload | n}
                  />
         </td>
       </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>
+        <input name="literal_col_headings"
+               tabindex="${tab_index.val}"
+               id="literal_col_headings_id"
+               type="checkbox"
+               ${literal_col_headings | n}
+               />
+      </td>
+    </tr>
+    <% tab_index.inc() %>
   % endif
 </%def>
 
 <%def name="append_elements(form_elements)">
     <% form_elements.append(trim_row) %>
-    % if show_choice(pgwui, 'literal_column_headings'):
-        <%def name="literal_row(tab_index)">
-              <tr>
-                <td class="label">
-                  <label for="literal_col_headings_id">Literal
-                         Uploaded Column Headings:</label>
-                </td>
-                <td>
-                  <input name="literal_col_headings"
-                         tabindex="${tab_index}"
-                         id="literal_col_headings_id"
-                         type="checkbox"
-                         ${literal_col_headings | n}
-                         />
-                </td>
-              </tr>
-        </%def>
-
-        <% form_elements.append(literal_row) %>
-    % endif
+    <% form_elements.append(literal_row) %>
 </%def>