From 7754ea1c7cab26b5b40e7653f1d6cbe7d246c975 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Wed, 20 Dec 2017 13:50:12 -0500 Subject: Bug 1361890 - Remove asset concatenation --- .../en/default/attachment/diff-header.html.tmpl | 22 +++++++-------- template/en/default/bug/comments.html.tmpl | 14 +++++----- template/en/default/flag/list.html.tmpl | 4 +-- template/en/default/global/header.html.tmpl | 32 ++++++++-------------- template/en/default/list/list-simple.html.tmpl | 2 +- .../en/default/reports/duplicates-simple.html.tmpl | 6 ++-- template/en/default/rest.html.tmpl | 2 +- .../en/default/search/boolean-charts.html.tmpl | 26 +++++++++--------- 8 files changed, 50 insertions(+), 58 deletions(-) (limited to 'template/en') 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 %]: [% old_desc FILTER html %] - and + and #[% newid %]: [% new_desc FILTER html %] [% END %] for [% terms.bug %] #[% bugid %] @@ -57,14 +57,14 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [% ELSE %] - - [% 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 %] Collapse All | + onclick="return collapse_all()">Collapse All | Context: [% IF context == "patch" %] - (Patch / + (Patch / [% ELSE %] - (Patch / + (Patch / [% END %] [% IF context == "file" %] File / [% ELSE %] - File / + File / [% END %] [% IF context == "patch" || context == "file" %] @@ -150,7 +150,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [% ELSE %]

[% END %] - + [%# Restore Stuff %]
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 2f8658c9c..9c8b56217 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 %] - + [% UNLESS flag_no_header %] 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 @@ [% 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 @@ [% 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 %] + [% "\n" %] [% END %] [% BLOCK format_js_link %] - + + [% "\n" %] [% END %] diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl index f4c3549ed..88df3e6a5 100644 --- a/template/en/default/list/list-simple.html.tmpl +++ b/template/en/default/list/list-simple.html.tmpl @@ -39,7 +39,7 @@ [% title FILTER html %] - diff --git a/template/en/default/reports/duplicates-simple.html.tmpl b/template/en/default/reports/duplicates-simple.html.tmpl index a08522790..934d199da 100644 --- a/template/en/default/reports/duplicates-simple.html.tmpl +++ b/template/en/default/reports/duplicates-simple.html.tmpl @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # - # Contributor(s): + # Contributor(s): # Gervase Markham # Max Kanat-Alexander #%] @@ -39,9 +39,9 @@ [% title FILTER html %] - - diff --git a/template/en/default/rest.html.tmpl b/template/en/default/rest.html.tmpl index 0b8321dd1..25bd2233c 100644 --- a/template/en/default/rest.html.tmpl +++ b/template/en/default/rest.html.tmpl @@ -10,7 +10,7 @@ Bugzilla::REST::API - diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl index 3fb1f8eae..abfd164a1 100644 --- a/template/en/default/search/boolean-charts.html.tmpl +++ b/template/en/default/search/boolean-charts.html.tmpl @@ -19,7 +19,7 @@ #%] [% PROCESS "global/field-descs.none.tmpl" %] - + [% types = [ "noop", "equals", @@ -54,11 +54,11 @@
▼
- Custom Search Didn't find what - you're looking for above? This area allows for ANDs, ORs, + Custom Search Didn't find what + you're looking for above? This area allows for ANDs, ORs, and other more complex searches.
-
[% SET indent_level = 0 %] [% SET cond_num = 0 %] @@ -76,8 +76,8 @@ TUI_alternates['custom_search_advanced'] = "Show Advanced Features"; TUI_hide_default('custom_search_advanced'); - - + +