summaryrefslogtreecommitdiffstats
path: root/template/en/default/attachment
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-12-20 19:50:12 +0100
committerGitHub <noreply@github.com>2017-12-20 19:50:12 +0100
commit7754ea1c7cab26b5b40e7653f1d6cbe7d246c975 (patch)
treeed39b1672e477e22ca5f5a3c8afd075e29c25750 /template/en/default/attachment
parentd87c64e5805adb4bae54b10d517c10463a9251fc (diff)
downloadbugzilla-7754ea1c7cab26b5b40e7653f1d6cbe7d246c975.tar.gz
bugzilla-7754ea1c7cab26b5b40e7653f1d6cbe7d246c975.tar.xz
Bug 1361890 - Remove asset concatenation
Diffstat (limited to 'template/en/default/attachment')
-rw-r--r--template/en/default/attachment/diff-header.html.tmpl22
1 files changed, 11 insertions, 11 deletions
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index b407b4f3a..b2be0e4f0 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -41,9 +41,9 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% IF attachid %]
Attachment #[% attachid %]: [% description FILTER html %]
[% ELSE %]
- Diff Between
+ Diff Between
#[% oldid %]: <a href="[% PROCESS diffurl id=oldid %]">[% old_desc FILTER html %]</a>
- and
+ and
#[% newid %]: <a href="[% PROCESS diffurl id=newid %]">[% new_desc FILTER html %]</a>
[% END %]
for <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] #[% bugid %]</a>
@@ -57,14 +57,14 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% ELSE %]
<html>
<head>
- <link href="[% 'skins/standard/attachment.css' FILTER mtime %]"
+ <link href="[% 'skins/standard/attachment.css' FILTER version %]"
rel="stylesheet" type="text/css">
- <script src="[% 'js/attachment.js' FILTER mtime %]"
+ <script src="[% 'js/attachment.js' FILTER version %]"
type="text/javascript"></script>
</head>
<body onload="[% onload FILTER html %]">
[% END %]
-
+
[%# If we have attachid, we are in diff, otherwise we're in interdiff %]
[% IF attachid %]
[%# HEADER %]
@@ -100,12 +100,12 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
|
[% END %]
[% END %]
-
+
[%# Collapse / Expand %]
<a href="#"
onmouseover="lastStatus = window.status; window.status='Collapse All'; return true"
onmouseout="window.status = lastStatus; return true"
- onclick="return collapse_all()">Collapse All</a> |
+ onclick="return collapse_all()">Collapse All</a> |
<a href="#"
onmouseover="lastStatus = window.status; window.status='Expand All'; return true"
onmouseout="window.status = lastStatus; return true"
@@ -115,14 +115,14 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[%# only happens for normal viewing, not interdiff %]
| <span style='font-weight: bold'>Context:</span>
[% IF context == "patch" %]
- (<strong>Patch</strong> /
+ (<strong>Patch</strong> /
[% ELSE %]
- (<a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER uri %]">Patch</a> /
+ (<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> /
+ <a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER uri %]&amp;context=file">File</a> /
[% END %]
[% IF context == "patch" || context == "file" %]
@@ -150,7 +150,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% ELSE %]
<br><br>
[% END %]
-
+
[%# Restore Stuff %]
<form name="checkboxform" action="attachment.cgi">
<input type="checkbox" name="restore_indicator" style="display: none">