Use common form elements

diff --git a/src/pgwui_copy/templates/copy.mak b/src/pgwui_copy/templates/copy.mak
index 9bab99241568b44857f7220810851a16a34a0660..8cc4881ee693ade72e5e68821f52aaa430c79062 100644 (file)
--- a/src/pgwui_copy/templates/copy.mak
+++ b/src/pgwui_copy/templates/copy.mak
@@ -23,6 +23,7 @@
   Karl O. Pinc <kop@karlpinc.com>
 
   This template uses the following variables in it's context:
+    havecreds   Already logged in
     crfs_token
     user
     db_changed (used by base.mk)
@@ -38,9 +39,13 @@
     from pgwui_common.path import asset_abspath
 
     errors_base_mak = asset_abspath('pgwui_common:templates/errors_base.mak')
+    auth_parts_mak = asset_abspath('pgwui_common:templates/auth_parts.mak')
 %>
 
 <%inherit file="${errors_base_mak}" />
+<%namespace file="${auth_parts_mak}"
+            name="auth_parts"
+            inheritable="True" />
 
 <%block name="title">${pgwui['pgwui_copy']['menu_label']}</%block>
 <%block name="meta_keywords">
@@ -65,44 +70,12 @@
 
 <form action="" enctype="multipart/form-data" method="post">
   <div>
-  <input name="action"
-         type="hidden"
-         value="u"
-         />
-  <input type="hidden"
-         name="csrf_token"
-         value="${csrf_token}"
-         />
+  ${self.auth_parts.hidden_vars(csrf_token)}
   </div>
 
   <table>
-    <tr>
-      <td class="label">
-        <label for="user_id">Username:</label>
-      </td>
-      <td>
-        <input name="user"
-               tabindex="1"
-               id="user_id"
-               type="text"
-               size="30"
-               value="${user}"
-               />
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <label for="password_id">Password:</label>
-      </td>
-      <td>
-        <input name="password"
-               tabindex="2"
-               id="password_id"
-               type="password"
-               size="30"
-               />
-      </td>
-    </tr>
+      ${self.auth_parts.user_row(1, havecreds, user)}
+      ${self.auth_parts.password_row(2, havecreds)}
 
     ## A blank table row for spacing
     <tr><td/><td/></tr>