From 6c894464cdbe258b5f6a8dd7468d8ad74610baa9 Mon Sep 17 00:00:00 2001
From: jlgijsbers <jlgijsbers@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Fri, 3 Oct 2003 19:15:24 +0000
Subject: [PATCH] Move '<input type="hidden">' elements into a block, it is
 invalid HTML4 Strict to have them at the top of a form.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1896 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 doc/customizing.txt                        |  9 +++++----
 templates/classic/html/file.item.html      | 16 ++++++++--------
 templates/classic/html/issue.item.html     |  9 +++++----
 templates/classic/html/issue.search.html   |  6 ++++--
 templates/classic/html/keyword.item.html   |  9 +++++----
 templates/classic/html/user.forgotten.html | 18 +++++++++++++-----
 templates/classic/html/user.item.html      |  9 +++++----
 templates/classic/html/user.register.html  |  6 ++----
 8 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/doc/customizing.txt b/doc/customizing.txt
index 951a881..f752e54 100644
--- a/doc/customizing.txt
+++ b/doc/customizing.txt
@@ -2,7 +2,7 @@
 Customising Roundup
 ===================
 
-:Version: $Revision: 1.101 $
+:Version: $Revision: 1.102 $
 
 .. This document borrows from the ZopeBook section on ZPT. The original is at:
    http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -2373,8 +2373,6 @@ So putting it all together, and closing the table and form we get::
    <form method="POST" onSubmit="return submit_once()"
          enctype="multipart/form-data">
 
-    <input type="hidden" name="@required" value="name">
-
     <table class="form">
      <tr><th class="header" colspan="2">Category</th></tr>
 
@@ -2385,7 +2383,10 @@ So putting it all together, and closing the table and form we get::
      </tr>
 
      <tr>
-      <td>&nbsp;</td>
+      <td>
+        &nbsp;
+        <input type="hidden" name="@required" value="name"> 
+      </td>
       <td colspan="3" tal:content="structure context/submit">
        submit button will go here
       </td>
diff --git a/templates/classic/html/file.item.html b/templates/classic/html/file.item.html
index ca9f6bd..dd102b2 100644
--- a/templates/classic/html/file.item.html
+++ b/templates/classic/html/file.item.html
@@ -13,13 +13,6 @@ You are not allowed to view this page.
 <form method="POST" onSubmit="return submit_once()"
       enctype="multipart/form-data" tal:condition="context/is_edit_ok">
 
-<input type="hidden" name=":template" value="item">
-<input type="hidden" name=":required" value="name,type">
-
-<input type="hidden" name=":multilink"
-       tal:condition="python:request.form.has_key(':multilink')"
-       tal:attributes="value request/form/:multilink/value">
-
 <table class="form">
  <tr>
   <th>Name</th>
@@ -31,7 +24,14 @@ You are not allowed to view this page.
  </tr>
 
  <tr>
-  <td>&nbsp;</td>
+  <td>
+   &nbsp;
+   <input type="hidden" name=":template" value="item">
+   <input type="hidden" name=":required" value="name,type">
+   <input type="hidden" name=":multilink"
+          tal:condition="python:request.form.has_key(':multilink')"
+          tal:attributes="value request/form/:multilink/value">
+  </td>
   <td tal:content="structure context/submit">submit button here</td>
  </tr>
 </table>
diff --git a/templates/classic/html/issue.item.html b/templates/classic/html/issue.item.html
index 6e3b8f2..1ac2325 100644
--- a/templates/classic/html/issue.item.html
+++ b/templates/classic/html/issue.item.html
@@ -23,9 +23,6 @@ You are not allowed to view this page.
       enctype="multipart/form-data" tal:condition="context/is_edit_ok"
       tal:attributes="action context/designator">
 
-<input type="hidden" name=":template" value="item">
-<input type="hidden" name=":required" value="title,priority">
-
 <table class="form">
 <tr>
  <th class="required">Title</th>
@@ -81,7 +78,11 @@ python:db.user.classhelp('username,realname,address', property='nosy', width='60
 </tr>
 
 <tr>
- <td>&nbsp;</td>
+ <td>
+  &nbsp;
+  <input type="hidden" name=":template" value="item">
+  <input type="hidden" name=":required" value="title,priority">
+ </td>
  <td colspan=3 tal:content="structure context/submit">
   submit button will go here
  </td>
diff --git a/templates/classic/html/issue.search.html b/templates/classic/html/issue.search.html
index 8a41340..a46334f 100644
--- a/templates/classic/html/issue.search.html
+++ b/templates/classic/html/issue.search.html
@@ -6,7 +6,6 @@
 <td class="content" metal:fill-slot="content">
 
 <form method="GET" tal:attributes="action request/classname">
-<input type="hidden" name=":action" value="search">
 
 <table class="form" tal:define="
    cols python:request.columns or 'id activity title status assignedto'.split();
@@ -168,7 +167,10 @@
 </tr>
 
 <tr>
-  <td>&nbsp;</td>
+  <td>
+   &nbsp;
+   <input type="hidden" name=":action" value="search">
+  </td>
   <td><input type="submit" value="Search"></td>
 </tr>
 
diff --git a/templates/classic/html/keyword.item.html b/templates/classic/html/keyword.item.html
index 47f9223..6bb0042 100644
--- a/templates/classic/html/keyword.item.html
+++ b/templates/classic/html/keyword.item.html
@@ -31,9 +31,6 @@
 <form method="POST" onSubmit="return submit_once()"
       enctype="multipart/form-data">
 
- <input type="hidden" name=":required" value="name">
- <input type="hidden" name=":template" value="item">
-
  <table class="form">
   <tr>
    <th>Keyword</th>
@@ -41,7 +38,11 @@
   </tr>
 
   <tr>
-   <td>&nbsp;</td>
+   <td>
+    &nbsp;
+    <input type="hidden" name=":required" value="name">
+    <input type="hidden" name=":template" value="item">
+   </td>
    <td colspan=3 tal:content="structure context/submit">
     submit button will go here
    </td>
diff --git a/templates/classic/html/user.forgotten.html b/templates/classic/html/user.forgotten.html
index 1df6918..d527c46 100644
--- a/templates/classic/html/user.forgotten.html
+++ b/templates/classic/html/user.forgotten.html
@@ -10,11 +10,19 @@
 know the email address you registered with, enter it below.</p>
 
 <form method="POST" onSubmit="return submit_once()">
-<input type="hidden" name="@action" value="passrst">
-<input type="hidden" name="@template" value="forgotten">
-<table class="form">
- <tr><th>Email Address:</th> <td><input name="address"></td> </tr>
- <tr><td></td><td><input type="submit" value="Request password reset"></td></tr>
+    <table class="form">
+      <tr>
+        <th>Email Address:</th>
+        <td><input name="address"></td>
+      </tr>
+      <tr>
+        <td>&nbsp;</td>
+        <td>
+          <input type="hidden" name="@action" value="passrst">
+          <input type="hidden" name="@template" value="forgotten">
+          <input type="submit" value="Request password reset">
+        </td>
+      </tr>
 </table>
 
 <p>Or, if you know your username, then enter it below.</p>
diff --git a/templates/classic/html/user.item.html b/templates/classic/html/user.item.html
index 52c2219..c3cdc78 100644
--- a/templates/classic/html/user.item.html
+++ b/templates/classic/html/user.item.html
@@ -21,9 +21,6 @@ You are not allowed to view this page.
 <form method="POST" onSubmit="return submit_once()"
       enctype="multipart/form-data" tal:condition="context/is_edit_ok">
 
-<input type="hidden" name=":template" value="item">
-<input type="hidden" name=":required" value="username,address">
-
 <table class="form">
  <tr>
   <th>Name</th>
@@ -72,7 +69,11 @@ You are not allowed to view this page.
  </tr>
 
  <tr>
-  <td>&nbsp;</td>
+  <td>
+   &nbsp;
+   <input type="hidden" name=":template" value="item">
+   <input type="hidden" name=":required" value="username,address">
+  </td>
   <td tal:content="structure context/submit">submit button here</td>
  </tr>
 </table>
diff --git a/templates/classic/html/user.register.html b/templates/classic/html/user.register.html
index a226413..f43ca26 100644
--- a/templates/classic/html/user.register.html
+++ b/templates/classic/html/user.register.html
@@ -16,10 +16,6 @@ You are not allowed to view this page.
 
 <tal:block tal:condition="editok">
 <form method="POST" onSubmit="return submit_once()" enctype="multipart/form-data">
-<input type="hidden" name=":template" value="register">
-<input type="hidden" name=":required" value="username">
-<input type="hidden" name=":required" value="password">
-<input type="hidden" name=":required" value="address">
 
 <table class="form">
  <tr>
@@ -66,6 +62,8 @@ You are not allowed to view this page.
  <tr>
   <td>&nbsp;</td>
   <td>
+   <input type="hidden" name=":template" value="register">
+   <input type="hidden" name=":required" value="username,password,address">
    <input type="hidden" name=":action" value="register">
    <input type="submit" name="submit" value="Register">
   </td>
-- 
2.30.2