summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
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/global
parentd87c64e5805adb4bae54b10d517c10463a9251fc (diff)
downloadbugzilla-7754ea1c7cab26b5b40e7653f1d6cbe7d246c975.tar.gz
bugzilla-7754ea1c7cab26b5b40e7653f1d6cbe7d246c975.tar.xz
Bug 1361890 - Remove asset concatenation
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/header.html.tmpl32
1 files changed, 12 insertions, 20 deletions
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 81db1910b..033d8ea1c 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -142,15 +142,11 @@
[% PROCESS 'global/setting-descs.none.tmpl' %]
[% SET css_sets = css_files(style_urls.unique, no_yui) %]
- [% IF constants.CONCATENATE_ASSETS %]
- [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %]
- [% ELSE %]
- [% FOREACH asset_url = css_sets.standard %]
- [% PROCESS format_css_link %]
- [% END %]
- [% FOREACH asset_url = css_sets.skin %]
- [% PROCESS format_css_link %]
- [% END %]
+ [% FOREACH asset_url = css_sets.standard %]
+ [% PROCESS format_css_link %]
+ [% END %]
+ [% FOREACH asset_url = css_sets.skin %]
+ [% PROCESS format_css_link %]
[% END %]
[% IF style %]
@@ -159,14 +155,8 @@
</style>
[% END %]
- [% IF css_sets.unified_custom %]
- [% IF constants.CONCATENATE_ASSETS %]
- [% PROCESS format_css_link asset_url = css_sets.unified_custom %]
- [% ELSE %]
- [% FOREACH asset_url = css_sets.custom %]
- [% PROCESS format_css_link %]
- [% END %]
- [% END %]
+ [% FOREACH asset_url = css_sets.custom %]
+ [% PROCESS format_css_link %]
[% END %]
[%# jQuery Plugins %]
@@ -175,7 +165,7 @@
[% END %]
[% starting_js_urls.push('js/global.js', 'js/dropdown.js') %]
- [% FOREACH asset_url = concatenate_js(starting_js_urls) %]
+ [% FOREACH asset_url = starting_js_urls %]
[% PROCESS format_js_link %]
[% END %]
@@ -199,7 +189,7 @@
</script>
[% END %]
- [% FOREACH asset_url = concatenate_js(javascript_urls) %]
+ [% FOREACH asset_url = javascript_urls %]
[% PROCESS format_js_link %]
[% END %]
@@ -405,8 +395,10 @@
[% BLOCK format_css_link %]
<link href="[% asset_url FILTER html %]" rel="stylesheet" type="text/css">
+ [% "\n" %]
[% END %]
[% BLOCK format_js_link %]
- <script [% script_nonce FILTER none %] type="text/javascript" src="[% asset_url FILTER mtime FILTER html %]"></script>
+ <script [% script_nonce FILTER none %] type="text/javascript" src="[% asset_url FILTER version FILTER html %]"></script>
+ [% "\n" %]
[% END %]