From 5f7d68ec7d74700f54ee6802309c312fd0468657 Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@gmail.com>
Date: Tue, 26 Jun 2012 21:00:07 +0200
Subject: Bug 766528: Use field-label.html.tmpl for timetracking fields
 r/a=LpSolit

---
 template/en/default/bug/edit.html.tmpl           | 34 ++++++++++++------------
 template/en/default/list/edit-multiple.html.tmpl |  8 ++++--
 2 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'template')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index acb0dc733..cecf16784 100644
--- 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 18179d20c..c4a7ef964 100644
--- 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"
-- 
cgit v1.2.3-24-g4f1b