Index: page.html
===================================================================
--- page.html	(Revision 14748)
+++ page.html	(Arbeitskopie)
@@ -151,6 +151,12 @@
 </html>
 </tal:block>
 
+<th metal:define-macro="th_label">
+  <label for="any_field" tal:attributes="for name" tal:content="label" i18n:translate="">Text</label>
+</th>
+<th metal:define-macro="th_label_required" class="required">
+  <label for="any_field" tal:attributes="for name" tal:content="label" i18n:translate="">Text</label>
+</th>
 <!--
 The following macros are intended to be used in search pages.
 
@@ -161,12 +167,14 @@
 -->
 <td metal:define-macro="search_input">
   <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name">
+                         name name;
+                         id name">
 </td>
 
 <td metal:define-macro="search_date">
   <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name">
+                         name name;
+                         id name">
   <a class="classhelp" tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
 </td>
 
@@ -176,17 +184,18 @@
     string (eg. "id,title" or "id,name,description") as well as name
   -->
   <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name">
+                         name name;
+                         id name">
   <span tal:replace="structure python:db.issue.classhelp(columns,
                                       property=name)" />
 </td>
 
 <td metal:define-macro="search_select">
-  <select tal:attributes="name name"
+  <select tal:attributes="name name; id name"
           tal:define="value python:request.form.getvalue(name)">
     <option value="" i18n:translate="">don't care</option>
     <tal:block metal:define-slot="extra_options"></tal:block>
-    <option value="" i18n:translate="">------------</option>
+    <option value="" i18n:translate="" disabled="disabled">------------</option>
     <option tal:repeat="s python:db[db_klass].list()"
             tal:attributes="value s/id; selected python:value == s.id"
             tal:content="python:s[db_content]"></option>
@@ -221,18 +230,21 @@
 <td metal:define-macro="column_input">
   <input type="checkbox" name="@columns"
          tal:attributes="value name;
+			 id string:col-$name;
                          checked python:name in cols">
 </td>
 
 <td metal:define-macro="sort_input">
   <input type="radio" name="@sort"
          tal:attributes="value name;
+                         id string:sort_on-$name;
                          checked python:name == sort_on">
 </td>
 
 <td metal:define-macro="group_input">
   <input type="radio" name="@group"
          tal:attributes="value name;
+                         id string:group_on-$name;
                          checked python:name == group_on">
 </td>
 
Index: issue.item.html
===================================================================
--- issue.item.html	(Revision 14748)
+++ issue.item.html	(Arbeitskopie)
@@ -1,5 +1,5 @@
 <!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
-<tal:block metal:use-macro="templates/page/macros/icing">
+<tal:block metal:use-macro="templates/page/macros/icing" >
 <title metal:fill-slot="head_title">
 <tal:block condition="context/id" i18n:translate=""
  >Issue <span tal:replace="context/id" i18n:name="id"
@@ -34,17 +34,25 @@
       onSubmit="return submit_once()" enctype="multipart/form-data"
       tal:attributes="action context/designator">
 
-<table class="form">
-<tr>
- <th class="required" i18n:translate="">Title</th>
+<table class="form" tal:define="
+   th_label          templates/page/macros/th_label;
+   th_label_required templates/page/macros/th_label_required;"
+>
+<tr tal:define="name string:title; label string:Title">
+ <th metal:use-macro="th_label_required"
+  >Title</th>
  <td colspan=3 tal:content="structure python:context.title.field(size=60)">title</td>
 </tr>
 
 <tr>
- <th class="required" i18n:translate="">Priority</th>
+ <tal:set define="name string:priority; label string:Priority">
+ <th metal:use-macro="th_label_required">Priority</th>
  <td tal:content="structure context/priority/menu">priority</td>
- <th i18n:translate="">Status</th>
+ </tal:set>
+ <tal:set define="name string:status; label string:Status">
+ <th metal:use-macro="th_label">Status</th>
  <td tal:content="structure context/status/menu">status</td>
+ </tal:set>
 </tr>
 
 <tr>
Index: issue.search.html
===================================================================
--- issue.search.html	(Revision 14748)
+++ issue.search.html	(Arbeitskopie)
@@ -19,7 +19,10 @@
    sort_input templates/page/macros/sort_input;
    group_input templates/page/macros/group_input;
    search_select templates/page/macros/search_select;
-   search_multiselect templates/page/macros/search_multiselect;">
+   search_multiselect templates/page/macros/search_multiselect;
+   th_label templates/page/macros/th_label;
+   th_label_required templates/page/macros/th_label_required;
+   ">
 
 <tr>
  <th class="header">&nbsp;</th>
@@ -29,16 +32,16 @@
  <th class="header" i18n:translate="">Group on</th>
 </tr>
 
-<tr tal:define="name string:@search_text">
-  <th i18n:translate="">All text*:</th>
+<tr tal:define="name string:@search_text; label string:All text*:">
+  <th metal:use-macro="th_label">All text*:</th>
   <td metal:use-macro="search_input"></td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
 </tr>
 
-<tr tal:define="name string:title">
-  <th i18n:translate="">Title:</th>
+<tr tal:define="name string:title; label string:Title:">
+  <th metal:use-macro="th_label">Title:</th>
   <td metal:use-macro="search_input"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
@@ -46,25 +49,26 @@
 </tr>
 
 <tr tal:define="name string:topic;
+	        label string:Topic:;
                 db_klass string:keyword;
                 db_content string:name;">
-  <th i18n:translate="">Topic:</th>
+  <th metal:use-macro="th_label">Topic:</th>
   <td metal:use-macro="search_select"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
   <td metal:use-macro="group_input"></td>
 </tr>
 
-<tr tal:define="name string:id">
-  <th i18n:translate="">ID:</th>
+<tr tal:define="name string:id; label string:ID:">
+  <th metal:use-macro="th_label">ID:</th>
   <td metal:use-macro="search_input"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
   <td>&nbsp;</td>
 </tr>
 
-<tr tal:define="name string:creation">
-  <th i18n:translate="">Creation Date:</th>
+<tr tal:define="name string:creation; label string:Creation Date:">
+  <th metal:use-macro="th_label">Creation Date:</th>
   <td metal:use-macro="search_date"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
@@ -72,10 +76,11 @@
 </tr>
 
 <tr tal:define="name string:creator;
+	        label string:Creator:;
                 db_klass string:user;
                 db_content string:username;"
     tal:condition="db/user/is_view_ok">
-  <th i18n:translate="">Creator:</th>
+  <th metal:use-macro="th_label">Creator:</th>
   <td metal:use-macro="search_select">
     <option metal:fill-slot="extra_options" i18n:translate=""
             tal:attributes="value request/user/id">created by me</option>
@@ -85,8 +90,8 @@
   <td metal:use-macro="group_input"></td>
 </tr>
 
-<tr tal:define="name string:activity">
-  <th i18n:translate="">Activity:</th>
+<tr tal:define="name string:activity; label string:Activity:">
+  <th metal:use-macro="th_label">Activity:</th>
   <td metal:use-macro="search_date"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
@@ -94,10 +99,11 @@
 </tr>
 
 <tr tal:define="name string:actor;
+	        label string:Actor:;
                 db_klass string:user;
                 db_content string:username;"
     tal:condition="db/user/is_view_ok">
-  <th i18n:translate="">Actor:</th>
+  <th metal:use-macro="th_label">Actor:</th>
   <td metal:use-macro="search_select">
     <option metal:fill-slot="extra_options" i18n:translate=""
             tal:attributes="value request/user/id">done by me</option>
@@ -108,9 +114,10 @@
 </tr>
 
 <tr tal:define="name string:priority;
+	        label string:Priority:;
                 db_klass string:priority;
                 db_content string:name;">
-  <th i18n:translate="">Priority:</th>
+  <th metal:use-macro="th_label">Priority:</th>
   <td metal:use-macro="search_select">
     <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
             tal:attributes="selected python:value == '-1'">not selected</option>
@@ -121,9 +128,10 @@
 </tr>
 
 <tr tal:define="name string:status;
+	        label string:Status:;
                 db_klass string:status;
                 db_content string:name;">
-  <th i18n:translate="">Status:</th>
+  <th metal:use-macro="th_label">Status:</th>
   <td metal:use-macro="search_select">
     <tal:block metal:fill-slot="extra_options">
       <option value="-1,1,2,3,4,5,6,7" i18n:translate=""
@@ -138,10 +146,11 @@
 </tr>
 
 <tr tal:define="name string:assignedto;
+	        label string:Assigned to:;
                 db_klass string:user;
                 db_content string:username;"
     tal:condition="db/user/is_view_ok">
-  <th i18n:translate="">Assigned to:</th>
+  <th metal:use-macro="th_label">Assigned to:</th>
   <td metal:use-macro="search_select">
     <tal:block metal:fill-slot="extra_options">
       <option tal:attributes="value request/user/id"
@@ -163,15 +172,15 @@
  <td><input type="radio" name="@group" value=""></td>
 </tr>
 
-<tr>
-<th i18n:translate="">Pagesize:</th>
-<td><input name="@pagesize" size="3" value="50"
+<tr tal:define="name string:pagesize; label string:Pagesize:">
+<th metal:use-macro="th_label">Pagesize:</th>
+<td><input name="@pagesize" id="pagesize" size="3" value="50"
            tal:attributes="value request/form/@pagesize/value | default"></td>
 </tr>
 
-<tr>
-<th i18n:translate="">Start With:</th>
-<td><input name="@startwith" size="3" value="0"
+<tr tal:define="name string:startwith; label string:Start With:">
+<th metal:use-macro="th_label">Start With:</th>
+<td><input name="@startwith" id="startwith" size="3" value="0"
            tal:attributes="value request/form/@startwith/value | default"></td>
 </tr>
 
@@ -189,10 +198,11 @@
 </td>
 </tr>
 
-<tr tal:condition="python:request.user.hasPermission('Edit', 'query')">
- <th i18n:translate="">Query name**:</th>
+<tr tal:condition="python:request.user.hasPermission('Edit', 'query')"
+    tal:define="name string:queryname; label string:Query name**:">
+ <th metal:use-macro="th_label">Query name**:</th>
  <td tal:define="value request/form/@queryname/value | nothing">
-  <input name="@queryname" tal:attributes="value value">
+  <input name="@queryname" id="queryname" tal:attributes="value value">
   <input type="hidden" name="@old-queryname" tal:attributes="value value">
  </td>
 </tr>