From 61ead83b0ec30fdecef0f5918f112f33359e7146 Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Mon, 5 Dec 2011 19:55:58 +0100
Subject: Bug 577854: URL field header caption does not link to field value
 description (confusingly links to actual URL) r/a=mkanat

---
 template/en/default/bug/edit.html.tmpl        | 14 +++++---------
 template/en/default/bug/field-label.html.tmpl |  3 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'template')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 75c263e68..ecfac6f59 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -490,15 +490,11 @@
 [%############################################################################%]
 [% BLOCK section_url_keyword_whiteboard %]
   <tr>
-    <td class="field_label">
-      <label for="bug_file_loc" accesskey="u"><b>
-        [% IF is_safe_url(bug.bug_file_loc) %]
-          <a href="[% bug.bug_file_loc FILTER html %]"><u>U</u>RL</a>
-        [% ELSE %]
-          <u>U</u>RL
-        [% END %]
-      [%%]</b></label>:
-    </td>
+    [% INCLUDE "bug/field-label.html.tmpl"
+      field = bug_fields.bug_file_loc
+      editable = 1
+      accesskey = "u"
+    %]
     <td>
       [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %]
         <span id="bz_url_edit_container" class="bz_default_hidden"> 
diff --git a/template/en/default/bug/field-label.html.tmpl b/template/en/default/bug/field-label.html.tmpl
index fe3bed75b..ecb49318e 100644
--- a/template/en/default/bug/field-label.html.tmpl
+++ b/template/en/default/bug/field-label.html.tmpl
@@ -24,6 +24,7 @@
   #   hidden: True if the field label should start hidden.
   #   rowspan: a "rowspan" value for the label's <th>.
   #   tag_name: the tag to use to surround the label
+  #   accesskey: access key for the label
   #%]
 
 [% DEFAULT tag_name = "th" %]
@@ -33,7 +34,7 @@
     [% IF rowspan %] rowspan="[% rowspan FILTER html %]"[% END %]>
 
   [% IF editable %]
-    <label for="[% field.name FILTER html %]">
+    <label for="[% field.name FILTER html %]"[% IF accesskey %] accesskey="[% accesskey FILTER html %]"[% END %]>
   [% END %]
 
   <a 
-- 
cgit v1.2.3-24-g4f1b