summaryrefslogtreecommitdiffstats
path: root/template
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
parentd87c64e5805adb4bae54b10d517c10463a9251fc (diff)
downloadbugzilla-7754ea1c7cab26b5b40e7653f1d6cbe7d246c975.tar.gz
bugzilla-7754ea1c7cab26b5b40e7653f1d6cbe7d246c975.tar.xz
Bug 1361890 - Remove asset concatenation
Diffstat (limited to 'template')
-rw-r--r--template/en/default/attachment/diff-header.html.tmpl22
-rw-r--r--template/en/default/bug/comments.html.tmpl14
-rw-r--r--template/en/default/flag/list.html.tmpl4
-rw-r--r--template/en/default/global/header.html.tmpl32
-rw-r--r--template/en/default/list/list-simple.html.tmpl2
-rw-r--r--template/en/default/reports/duplicates-simple.html.tmpl6
-rw-r--r--template/en/default/rest.html.tmpl2
-rw-r--r--template/en/default/search/boolean-charts.html.tmpl26
8 files changed, 50 insertions, 58 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">
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 %]
-<script src="[% 'js/comments.js' FILTER mtime %]" type="text/javascript">
+<script src="[% 'js/comments.js' FILTER version %]" type="text/javascript">
</script>
<script type="text/javascript">
@@ -43,7 +43,7 @@
[% IF user.is_insider %]
if (document.getElementById('isprivate_' + real_id).checked) {
document.getElementById('newcommentprivacy').checked = 'checked';
- updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment');
+ updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment');
}
[% END %]
@@ -111,7 +111,7 @@
[% Hook.process("comment_banner") %]
-<!-- This auto-sizes the comments and positions the collapse/expand links
+<!-- This auto-sizes the comments and positions the collapse/expand links
to the right. -->
<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
<td>
@@ -120,13 +120,13 @@
[% IF count >= start_at %]
[% PROCESS a_comment %]
[% END %]
-
+
[% count = count + increment %]
[% END %]
[%# Note: this template is used in multiple places; if you use this hook,
# make sure you are aware of this fact.
- #%]
+ #%]
[% Hook.process("aftercomments") %]
</td>
@@ -217,7 +217,7 @@
[% END %]
<span role="heading" aria-level="2" class="bz_comment_number">
- <a
+ <a
href="show_bug.cgi?id=[% bug.bug_id %]#c[% comment.count %]">
[%- comment_label FILTER html %]</a>
</span>
@@ -260,7 +260,7 @@
[% IF user.is_timetracker &&
(comment.work_time > 0 || comment.work_time < 0) %]
<br>
- Additional hours worked:
+ Additional hours worked:
[% PROCESS formattimeunit time_unit=comment.work_time %]
[% END %]
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 55184c47b..6d2ad69ae 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -22,7 +22,7 @@
[%# We list flags by looping twice over the flag types relevant for the bug.
# In the first loop, we display existing flags and then, for active types,
- # we display UI for adding new flags. In the second loop, we display UI
+ # we display UI for adding new flags. In the second loop, we display UI
# for adding additional new flags for those types for which a flag already
# exists but which are multiplicable (can have multiple flags of the type
# on a single bug/attachment).
@@ -30,7 +30,7 @@
[% DEFAULT flag_table_id = "flags" %]
-<script src="[% 'js/flag.js' FILTER mtime %]" type="text/javascript"></script>
+<script src="[% 'js/flag.js' FILTER version %]" 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 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 %]
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 @@
<head>
<title>[% title FILTER html %]</title>
<base href="[% urlbase FILTER html %]">
- <link href="[% 'skins/standard/buglist.css' FILTER mtime %]"
+ <link href="[% 'skins/standard/buglist.css' FILTER version %]"
rel="stylesheet" type="text/css">
</head>
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 <gerv@gerv.net>
# Max Kanat-Alexander <mkanat@bugzilla.org>
#%]
@@ -39,9 +39,9 @@
<head>
<title>[% title FILTER html %]</title>
- <link href="[% 'skins/standard/global.css' FILTER mtime %]"
+ <link href="[% 'skins/standard/global.css' FILTER version %]"
rel="stylesheet" type="text/css">
- <link href="[% 'skins/standard/duplicates.css' FILTER mtime %]"
+ <link href="[% 'skins/standard/duplicates.css' FILTER version %]"
rel="stylesheet" type="text/css">
</head>
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 @@
<html>
<head>
<title>Bugzilla::REST::API</title>
- <link href="[% urlbase FILTER none %][% 'skins/standard/global.css' FILTER mtime %]"
+ <link href="[% urlbase FILTER none %][% 'skins/standard/global.css' FILTER version %]"
rel="stylesheet" type="text/css">
</head>
<body>
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 @@
<div class="bz_section_title" id="custom_search_filter">
<div id="custom_search_query_controller" class="arrow">&#9660;</div>
<a id="chart" href="javascript:TUI_toggle_class('custom_search_query')" >
- Custom Search</a> <span class="section_help">Didn't find what
- you're looking for above? This area allows for ANDs, ORs,
+ Custom Search</a> <span class="section_help">Didn't find what
+ you're looking for above? This area allows for ANDs, ORs,
and other more complex searches.</span>
</div>
-<div id="custom_search_filter_section"
+<div id="custom_search_filter_section"
class="bz_search_section custom_search_query">
[% 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');
</script>
- <script type="text/javascript" src="[% 'js/custom-search.js' FILTER mtime %]"></script>
- <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER mtime %]"></script>
+ <script type="text/javascript" src="[% 'js/custom-search.js' FILTER version %]"></script>
+ <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER version %]"></script>
<script type="text/javascript">
redirect_html4_browsers();
[%# These are alternative labels for the AND and OR options in and_all_select %]
@@ -91,7 +91,7 @@
[% BLOCK one_condition %]
[%# Skip any conditions that don't have a field defined. %]
[% RETURN IF !condition.f %]
-
+
[% IF !top_level_any_shown %]
[% INCLUDE any_all_select
name = "j_top" selected = default.j_top.0
@@ -106,10 +106,10 @@
<div class="custom_search_condition"
[% ' style="margin-left: ' _ (indent_level * 2) _ 'em"' IF indent_level %]
[% ' id="custom_search_last_row"' IF with_buttons %]>
-
+
[% IF previous_condition.f == "OP" %]
[% INCLUDE any_all_select
- name = "j" _ (cond_num - 1)
+ name = "j" _ (cond_num - 1)
selected = previous_condition.j %]
[% END %]
@@ -155,17 +155,17 @@
</option>
[% END %]
</select>
-
+
[% INCLUDE "search/type-select.html.tmpl"
name = "o${cond_num}", class = "custom_search_form_field"
types = types, selected = condition.o %]
-
+
<input name="v[% cond_num FILTER html %]" title="Value"
class="custom_search_form_field"
onchange="fix_query_string(this)"
value="[% condition.v FILTER html %]">
[% END %]
-
+
[% IF with_buttons %]
<button class="custom_search_add_button" type="button"
id="add_button" title="Add a new row"
@@ -177,7 +177,7 @@
</span>
[% END %]
</div>
-
+
[% previous_condition = condition %]
[% END %]
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-25 22:16:20 +0100