Use the standard templates in pgwui_common for layout

diff --git a/src/pgwui_copy/templates/copy.mak b/src/pgwui_copy/templates/copy.mak
index dde449b7c37ba415237ea6ccbab724b18ca99c28..b5ec9d4d95310047c58343ca481fbc0ed8c229ab 100644 (file)
--- a/src/pgwui_copy/templates/copy.mak
+++ b/src/pgwui_copy/templates/copy.mak
@@ -38,14 +38,10 @@
 <%!
     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')
+    auth_base_mak = asset_abspath('pgwui_common:templates/auth_base.mak')
 %>
 
-<%inherit file="${errors_base_mak}" />
-<%namespace file="${auth_parts_mak}"
-            name="auth_parts"
-            inheritable="True" />
+<%inherit file="${auth_base_mak}" />
 
 <%block name="title">${pgwui['pgwui_copy']['menu_label']}</%block>
 <%block name="meta_keywords">
@@ -58,106 +54,125 @@
         content="PostgreSQL Web User Interface, Copy a Schema Between Databases" />
 </%block>
 
-
 <%block name="action_success">
    <p><em class="success">The ${schema} schema has been copied</em>
       from the ${from_db} db to the ${to_db}
        db<em class="success">!</em></p>
 </%block>
 
-<h1>Copy A Schema Between Databases</h1>
-
-
-<form action="" enctype="multipart/form-data" method="post">
-  <div>
-  ${self.auth_parts.hidden_vars(csrf_token)}
-  </div>
-
-  <table>
-      ${self.auth_parts.user_row(1, havecreds, user)}
-      ${self.auth_parts.password_row(2, havecreds)}
+<%block name="bottom_matter">
+  <p>
+  * <span class="caution">CAUTION: Overwriting an existing schema will
+  cause deletion of all data and objects outside of the destination
+  schema which relate to any overwritten content.</span>
+  </p>
+</%block>
 
-    ## A blank table row for spacing
-    <tr><td/><td/></tr>
-    <tr>
-      <td class="label">
-        <label for="schema_id">Schema To Copy:</label>
-      </td>
-      <td>
-        <input id="schema_id"
-               name="schema"
-               tabindex="3"
-               type="text"
-               size="30"
-               value="${schema}"
-               />
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <label for="from_db_id">From Database:</label>
+<%def name="schema_row(tab_index)">
+  <tr>
+    <td class="label">
+      <label for="schema_id">Schema To Copy:</label>
+    </td>
+    <td>
+      <input id="schema_id"
+             name="schema"
+             tabindex="${tab_index.val}"
+             type="text"
+             size="30"
+             value="${schema}"
+             />
+    </td>
+  </tr>
+  <% tab_index.inc() %>
+</%def>
+
+<%def name="from_db_row(tab_index)">
+  <tr>
+    <td class="label">
+      <label for="from_db_id">From Database:</label>
+    </td>
+    <td>
+      <input id="from_db_id"
+             name="from_db"
+             tabindex="${tab_index.val}"
+             type="text"
+             size="30"
+             value="${from_db}"
+             />
+    </td>
+  </tr>
+  <% tab_index.inc() %>
+</%def>
+
+<%def name="to_db_row(tab_index)">
+  <tr>
+    <td class="label">
+      <label for="to_db_id">To Database:</label>
+    </td>
+    <td>
+      <input id="to_db_id"
+             name="to_db"
+             tabindex="${tab_index.val}"
+             type="text"
+             size="30"
+             value="${to_db}"
+             />
+    </td>
+  </tr>
+  <% tab_index.inc() %>
+</%def>
+
+<%def name="overwrite_row(tab_index)">
+  <tr>
+    <td class="label">
+      <label for="overwrite_id">Overwrite destination schema<span
+                                style="caution">*</span>:</label>
+    </td>
+    <td>
+      <input name="overwrite"
+             tabindex="${tab_index.inc()}"
+             id="overwrite_id"
+             type="checkbox"
+             ${overwrite | n}
+             />
+    </td>
+  </tr>
+  <% tab_index.inc() %>
+</%def>
+
+<%def name="force_row(tab_index)">
+  <tr>
+    <td class="label">
+      <label for="force_id">Allow Copy To Sensitive DBs:</label>
       </td>
-      <td>
-        <input id="from_db_id"
-               name="from_db"
-               tabindex="4"
-               type="text"
-               size="30"
-               value="${from_db}"
-               />
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <label for="to_db_id">To Database:</label>
-      </td>
-      <td>
-        <input id="to_db_id"
-               name="to_db"
-               tabindex="5"
-               type="text"
-               size="30"
-               value="${to_db}"
-               />
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <label for="overwrite_id">Overwrite destination schema<span
-                                  style="caution">*</span>:</label>
-      </td>
-      <td>
-        <input name="overwrite"
-               tabindex="6"
-               id="overwrite_id"
-               type="checkbox"
-               ${overwrite | n}
-               />
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <label for="force_id">Allow Copy To Sensitive DBs:</label>
-        </td>
-      <td>
-        <input name="force"
-               tabindex="7"
-               id="force_id"
-               type="checkbox"
-               ${force | n}
-                />
-      </td>
-    </tr>
-  </table>
+    <td>
+      <input name="force"
+             tabindex="${tab_index.val}"
+             id="force_id"
+             type="checkbox"
+             ${force | n}
+              />
+    </td>
+  </tr>
+  <% tab_index.inc() %>
+</%def>
+
+<%def name="submit(tab_index)">
+  <input value="Copy" tabindex="${tab_index.val}" type="submit" />
+  <% tab_index.inc() %>
+</%def>
 
-  <p>
-    <input value="Copy" tabindex="20" type="submit" />
-  </p>
-    
-</form>
+<h1>Copy A Schema Between Databases</h1>
 
-<p>
-* <span class="caution">CAUTION: Overwriting an existing schema will
-cause deletion of all data and objects outside of the destination
-schema which relate to any overwritten content.</span>
-</p>
+<% tab_index = self.attr.TabIndex() %>
+<%self:main_form tab_index="${tab_index}" args="tab_index">
+  ## A blank table row for spacing
+  <tr><td/><td/></tr>
+  <%
+  schema_row(tab_index)
+  from_db_row(tab_index)
+  to_db_row(tab_index)
+  overwrite_row(tab_index)
+  force_row(tab_index)
+  %>
+</%self:main_form>