diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/admin/params/patchviewer.html.tmpl | 51 | ||||
| -rw-r--r-- | template/en/default/attachment/diff-file.html.tmpl | 18 | ||||
| -rw-r--r-- | template/en/default/attachment/diff-header.html.tmpl | 30 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 2 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 4 |
5 files changed, 3 insertions, 102 deletions
diff --git a/template/en/default/admin/params/patchviewer.html.tmpl b/template/en/default/admin/params/patchviewer.html.tmpl deleted file mode 100644 index d8aabd4ba..000000000 --- a/template/en/default/admin/params/patchviewer.html.tmpl +++ /dev/null @@ -1,51 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] -[% - title = "Patch Viewer" - desc = "Set up third-party applications to run with PatchViewer" -%] - -[% param_descs = { - cvsroot => "The <a href=\"http://www.cvshome.org\">CVS</a> root that most " _ - "users of your system will be using for 'cvs diff'. Used in " _ - "Patch Viewer ('Diff' option on patches) to figure out where " _ - "patches are rooted even if users did the 'cvs diff' from " _ - "different places in the directory structure. (NOTE: if your " _ - "CVS repository is remote and requires a password, you must " _ - "either ensure the $terms.Bugzilla user has done a 'cvs login' or " _ - "specify the password " _ - "<a href=\"http://www.cvshome.org/docs/manual/cvs_2.html#SEC26\">as " _ - "part of the CVS root</a>.) Leave this blank if you have no " _ - "CVS repository.", - - cvsroot_get => "The CVS root Bugzilla will be using to get patches from. " _ - "Some installations may want to mirror their CVS repository on " _ - "the Bugzilla server or even have it on that same server, and " _ - "thus the repository can be the local file system (and much " _ - "faster). Make this the same as cvsroot if you don't " _ - "understand what this is (if cvsroot is blank, make this blank too).", - - bonsai_url => "The URL to a <a href=\"http://www.mozilla.org/bonsai.html\">Bonsai</a> " _ - "server containing information about your CVS repository. " _ - "Patch Viewer will use this information to create links to " _ - "bonsai's blame for each section of a patch (it will append " _ - "'/cvsblame.cgi?...' to this url). Leave this blank if you " _ - "don't understand what this is.", - - lxr_url => "The URL to an <a href=\"http://sourceforge.net/projects/lxr\">LXR</a> server " _ - "that indexes your CVS repository. Patch Viewer will use this " _ - "information to create links to LXR for each file in a patch. " _ - "Leave this blank if you don't understand what this is.", - - lxr_root => "Some LXR installations do not index the CVS repository from the root -- " _ - "<a href=\"http://lxr.mozilla.org/mozilla\">Mozilla's</a>, for " _ - "example, starts indexing under <code>mozilla/</code>. This " _ - "means URLs are relative to that extra path under the root. " _ - "Enter this if you have a similar situation. Leave it blank " _ - "if you don't know what this is." } -%] 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 %] / +[% file.plus_lines %] 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 [% section.old_start %]-[% section.old_start + section.old_lines - 1 %] [% ELSE %] Line [% 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 %]&context=[% - context FILTER uri %]&collapsed=[% collapsed FILTER uri %]&headers=[% + | <a href="[% PROCESS diffurl id=attachid %]&collapsed=[% collapsed FILTER uri %]&headers=[% headers FILTER uri %]&format=raw">Raw 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 %]&headers=[% headers FILTER uri %]">Patch</a> / - [% END %] - [% IF context == "file" %] - <strong>File</strong> / - [% ELSE %] - <a href="[% PROCESS diffurl id=attachid %]&headers=[% headers FILTER uri %]&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: diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 3c5bfc217..f5f1bd783 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -322,10 +322,8 @@ ], 'attachment/diff-file.html.tmpl' => [ - 'lxr_prefix', 'file.minus_lines', 'file.plus_lines', - 'bonsai_prefix', 'section.old_start', 'section_num', 'current_line_old', diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index 6fb343713..6de588e6d 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -155,10 +155,6 @@ they don't exist. If this is set to 0, checksetup.pl will not create .htaccess files. END - localconfig_cvsbin => <<'END', -If you want to use the CVS integration of the Patch Viewer, please specify -the full path to the "cvs" executable here. -END localconfig_db_check => <<'END', Should checksetup.pl try to verify that your database setup is correct? With some combinations of database servers/Perl modules/moonphase this |