Fix for bug 251898: Add function information to PatchReader output.

Added support for the function strings included in unified and
contextual diffs, which is included in PatchReader-0.9.5. r=jkeiser,
a=justdave.

diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl
index ffd525db5434027da1dd844f064c4c2ea037d3e7..a25c1125a7c714ef868994596bff68dbea4d9f97 100644 (file)
--- a/template/en/default/attachment/diff-file.html.tmpl
+++ b/template/en/default/attachment/diff-file.html.tmpl
@@ -24,7 +24,7 @@
   # relations can change and screw up the javascript for restoring, collapsing
   # and expanding.  Do not change without testing all three of those.
   #%]
-<table class="file_table"><thead><tr><td class="file_head" colspan="2"><a href="#" onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %] style="display: none"> 
+<table class="file_table"><thead><tr><td class="file_head" colspan="2"><a style="text-decoration: none" href="#" onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %] style="display: none"> 
   [% IF lxr_prefix && !file.is_add %]
     <a href="[% lxr_prefix %]">[% file.filename FILTER html %]</a>
   [% ELSE %]
@@ -49,7 +49,9 @@ incremental_restore()
 [% section_num = 0 %]
 [% FOREACH section = sections %]
   [% section_num = section_num + 1 %]
-  <tr><th class="section_head" colspan="2">
+  <tr><th colspan="2" class="section_head">
+    <table cellpadding="0" cellspacing="0">
+    <tr><th width="95%" align="left">
   [% IF file.is_add %]
     Added
   [% ELSIF file.is_remove %]
@@ -63,15 +65,19 @@ incremental_restore()
       <a href="[% bonsai_prefix %]#[% section.old_start %]">
     [% END %]
     [% IF section.old_lines > 1 %]
-      Lines [% section.old_start %]-[% section.old_start + section.old_lines - 1 %]
+      &nbsp;Lines&nbsp;[% section.old_start %]-[% section.old_start + 
+                                             section.old_lines - 1 %]
     [% ELSE %]
-      Line [% section.old_start %]
+      Line&nbsp;[% section.old_start %]
     [% END %]
     [% IF bonsai_prefix %]
       </a>
     [% END %]
+    &nbsp;&nbsp;[% section.func_info FILTER html IF section.func_info %]
   [% END %] 
-  (<a name="[% file.filename FILTER html %]_sec[% section_num %]"><a href="#[% file.filename FILTER html %]_sec[% section_num %]">Link Here</a></a>)
+    </th><th>
+  <a name="[% file.filename FILTER html %]_sec[% section_num %]"><a href="#[% file.filename FILTER html %]_sec[% section_num %]">Link&nbsp;Here</a></a>&nbsp;
+    </th></tr></table>
   </th></tr>
   [% FOREACH group = section.groups %]
     [% IF group.context %]