Bug 1068494: Remove CVS/Bonsai/LXR-specific bits of Patch Viewer

r=gerv a=glob

2 files changed, 3 insertions, 45 deletions

diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl
index 38c51725b..af99761a6 100644
--- a/template/en/default/attachment/diff-file.html.tmpl
+++ b/template/en/default/attachment/diff-file.html.tmpl
@@ -19,11 +19,7 @@
  onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input
  type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %]
  class="bz_default_hidden">
-  [% IF lxr_prefix && !file.is_add %]
-    <a href="[% lxr_prefix %]">[% file.filename FILTER html %]</a>
-  [% ELSE %]
-    [% file.filename FILTER html %]
-  [% END %]
+  [% file.filename FILTER html %]
   [% IF file.plus_lines %]
     [% IF file.minus_lines %]
       (-[% file.minus_lines %]&nbsp;/&nbsp;+[% file.plus_lines %]&nbsp;lines)
@@ -49,23 +45,13 @@ incremental_restore()
         [% IF file.is_add %]
           Added
         [% ELSIF file.is_remove %]
-          [% IF bonsai_prefix %]
-            <a href="[% bonsai_prefix %]">Removed</a>
-          [% ELSE %]
-            Removed
-          [% END %]
+          Removed
         [% ELSE %]
-          [% IF bonsai_prefix %]
-            <a href="[% bonsai_prefix %]#[% section.old_start %]">
-          [% END %]
           [% IF section.old_lines > 1 %]
             Lines&nbsp;[% section.old_start %]-[% section.old_start + section.old_lines - 1 %]
           [% ELSE %]
             Line&nbsp;[% section.old_start %]
           [% END %]
-          [% IF bonsai_prefix %]
-            </a>
-          [% END %]
           [%+ section.func_info FILTER html IF section.func_info %]
         [% END %]
       </span>
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 3d491fa4e..2a32de974 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -60,8 +60,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
   [% IF headers %]
     <a href="[% PROCESS viewurl id=attachid %]">View</a>
     | <a href="[% PROCESS editurl id=attachid %]">Details</a>
-    | <a href="[% PROCESS diffurl id=attachid %]&amp;context=[%
-               context FILTER uri %]&amp;collapsed=[% collapsed FILTER uri %]&amp;headers=[%
+    | <a href="[% PROCESS diffurl id=attachid %]&amp;collapsed=[% collapsed FILTER uri %]&amp;headers=[%
                headers FILTER uri %]&amp;format=raw">Raw&nbsp;Unified</a>
     | Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]
   [% END %]
@@ -102,33 +101,6 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
    onmouseout="window.status = lastStatus; return true"
    onclick="return expand_all()">Expand All</a>
 
-[% IF do_context %]
-  [%# only happens for normal viewing, not interdiff %]
-  | <strong>Context:</strong>
-  [% IF context == "patch" %]
-    (<strong>Patch</strong> / 
-  [% ELSE %]
-    (<a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER uri %]">Patch</a> / 
-  [% END %]
-  [% IF context == "file" %]
-    <strong>File</strong> /
-  [% ELSE %]
-    <a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER uri %]&amp;context=file">File</a> / 
-  [% END %]
-
-  [% IF context == "patch" || context == "file" %]
-    [% context = 3 %]
-  [% END %]
-  [%# textbox for context %]
-  <form class="inline" action="attachment.cgi">
-    <input type="hidden" name="action" value="diff">
-    <input type="hidden" name="id" value="[% attachid %]">
-    <input type="hidden" name="collapsed" value="[% collapsed FILTER html %]">
-    <input type="hidden" name="headers" value="[% headers FILTER html %]">
-    <input type="text" name="context" value="[% context FILTER html %]" size="3">
-  </form>)
-[% END %]
-
 [% IF warning %]
 <h2 class="warning">
   Warning: