Bug 766528: Use field-label.html.tmpl for timetracking fields

r/a=LpSolit

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index acb0dc7336d8984eb644e415e2fa9a3a2f5e9d75..cecf16784532d3a72e81a11625199dbdf23ba1ac 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -956,27 +956,27 @@
 [% BLOCK section_timetracking %]
   <table class="bz_time_tracking_table">
     <tr>
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.estimated_time, editable = 1
+      %]
       <th>
-        <label for="estimated_time">Orig. Est.</label>
-      </th>
-      <th>
-        Current Est.
-      </th>
-      <th>
-        <label for="work_time">Hours Worked</label>
-      </th>
-      <th>
-        <label for="remaining_time">Hours Left</label>
-      </th>
-      <th>
-        %Complete
-      </th>
-      <th>
-        Gain
+        Current Est.:
       </th>
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.work_time, editable = 1
+      %]
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.remaining_time, editable = 1
+      %]
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.percentage_complete, editable = 1
+      %]
       <th>
-        <label for="deadline">Deadline</label>
+        Gain:
       </th>
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.deadline, editable = 1
+      %]
     </tr>
     <tr>
       <td>

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 18179d20c7cf7b3b1aa7aec54b3bfcca17ec62a6..c4a7ef9646032fae97e665f00364465e550bbd1f 100644 (file)
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -127,7 +127,9 @@
   </tr>
   [% IF user.is_timetracker %]
     <tr>
-      <th><label for="estimated_time">Estimated Hours:</label></th>
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.estimated_time, editable = 1
+      %]
       <td>
         <input id="estimated_time"
                name="estimated_time"
@@ -139,7 +141,9 @@
           editable = 1, allow_dont_change = 1 %]
     </tr>
     <tr>
-      <th><label for="remaining_time">Remaining Hours:</label></th>
+      [% INCLUDE "bug/field-label.html.tmpl"
+         field = bug_fields.remaining_time, editable = 1
+      %]
       <td>
         <input id="remaining_time"
                name="remaining_time"