diff options
| author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-09-27 20:20:00 -0700 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-09-27 20:20:00 -0700 |
| commit | 9c13acab14bf2e2597d51aa0aedda2496d34a7a0 (patch) | |
| tree | fd696cb9008a6f6c69c9e54ee101a81b877b039b | |
| parent | f64efa79bd78ab59cb65588feacf93e0de475e48 (diff) | |
| download | bugs-9c13acab14bf2e2597d51aa0aedda2496d34a7a0.tar bugs-9c13acab14bf2e2597d51aa0aedda2496d34a7a0.tar.gz bugs-9c13acab14bf2e2597d51aa0aedda2496d34a7a0.tar.bz2 bugs-9c13acab14bf2e2597d51aa0aedda2496d34a7a0.tar.xz bugs-9c13acab14bf2e2597d51aa0aedda2496d34a7a0.zip | |
Bug 595380: Add a ?mtime string to all of the manually-inserted
<script src> and <link href> tags in Bugzilla
r=glob, a=mkanat
| -rw-r--r-- | Bugzilla/Template.pm | 2 | ||||
| -rw-r--r-- | template/en/default/attachment/diff-header.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/list/list-simple.html.tmpl | 3 |
6 files changed, 11 insertions, 8 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 0997415b2..5ff5482b2 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -795,7 +795,7 @@ sub create { email => \&Bugzilla::Util::email_filter, - mtime_url => \&mtime_filter, + mtime => \&mtime_filter, # iCalendar contentline filter ics => [ sub { diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl index 650d90f73..c13b2e7ba 100644 --- a/template/en/default/attachment/diff-header.html.tmpl +++ b/template/en/default/attachment/diff-header.html.tmpl @@ -57,8 +57,10 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [% ELSE %] <html> <head> - <link href="skins/standard/attachment.css" rel="stylesheet" type="text/css"> - <script src="js/attachment.js" type="text/javascript"></script> + <link href="[% 'skins/standard/attachment.css' FILTER mtime %]" + rel="stylesheet" type="text/css"> + <script src="[% 'js/attachment.js' FILTER mtime %]" + type="text/javascript"></script> </head> <body onload="[% onload FILTER html %]"> [% END %] diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 9a7a050af..4f7795b12 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -22,7 +22,7 @@ [% PROCESS bug/time.html.tmpl %] -<script src="js/comments.js" type="text/javascript"> +<script src="[% 'js/comments.js' FILTER mtime %]" type="text/javascript"> </script> [% DEFAULT start_at = 0 mode = "show" %] diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 661f37dd1..24418e44a 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -30,7 +30,7 @@ [% DEFAULT flag_table_id = "flags" %] -<script type="text/javascript" src="js/flag.js"></script> +<script src="[% 'js/flag.js' FILTER mtime %]" type="text/javascript"></script> <table id="[% flag_table_id FILTER html %]"> [% UNLESS flag_no_header %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index e6764ed2b..772e775e9 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -104,7 +104,7 @@ [%# This allows people to switch back to the "Classic" skin if they # are in another skin. #%] - <link href="[% 'skins/standard/global.css' FILTER mtime_url FILTER html %]" + <link href="[% 'skins/standard/global.css' FILTER mtime FILTER html %]" rel="alternate stylesheet" title="[% setting_descs.standard FILTER html %]"> [% FOREACH style_url = css_sets.standard %] @@ -327,5 +327,5 @@ [% END %] [% BLOCK format_js_link %] - <script type="text/javascript" src="[% javascript_url FILTER mtime_url FILTER html %]"></script> + <script type="text/javascript" src="[% javascript_url FILTER mtime FILTER html %]"></script> [% END %] diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl index 125a164f0..f4c3549ed 100644 --- a/template/en/default/list/list-simple.html.tmpl +++ b/template/en/default/list/list-simple.html.tmpl @@ -39,7 +39,8 @@ <head> <title>[% title FILTER html %]</title> <base href="[% urlbase FILTER html %]"> - <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"> + <link href="[% 'skins/standard/buglist.css' FILTER mtime %]" + rel="stylesheet" type="text/css"> </head> <body> |