From 8f35cfedd052502f5606c88d400939fc425c6a13 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Mon, 6 Jan 2003 15:54:16 +0000 Subject: Bug 181047 - Change non-output templates to have a ctype of "none". Patch by gerv; r=bbaetz, a=justdave. --- .../en/default/global/confirm-user-match.html.tmpl | 2 +- template/en/default/global/field-descs.html.tmpl | 60 ---------------------- template/en/default/global/field-descs.none.tmpl | 60 ++++++++++++++++++++++ template/en/default/global/user-error.html.tmpl | 2 +- template/en/default/list/change-columns.html.tmpl | 2 +- template/en/default/list/table.html.tmpl | 2 +- template/en/default/reports/report-bar.png.tmpl | 2 +- template/en/default/reports/report-line.png.tmpl | 2 +- template/en/default/reports/report-pie.png.tmpl | 2 +- template/en/default/reports/report-table.html.tmpl | 2 +- template/en/default/reports/report.csv.tmpl | 2 +- template/en/default/reports/report.html.tmpl | 2 +- template/en/default/search/form.html.tmpl | 2 +- .../default/search/search-report-select.html.tmpl | 2 +- 14 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 template/en/default/global/field-descs.html.tmpl create mode 100644 template/en/default/global/field-descs.none.tmpl (limited to 'template') diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index dd624dbdd..92fa47a53 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -39,7 +39,7 @@ #%] [% # use the global field descs %] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% IF matchsuccess == 1 %] [% PROCESS global/header.html.tmpl title="Confirm Match" %] diff --git a/template/en/default/global/field-descs.html.tmpl b/template/en/default/global/field-descs.html.tmpl deleted file mode 100644 index 6d8086423..000000000 --- a/template/en/default/global/field-descs.html.tmpl +++ /dev/null @@ -1,60 +0,0 @@ -[%# 1.0@bugzilla.org %] -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham - #%] - -[%# Remember to PROCESS rather than INCLUDE this template. %] - -[% field_descs = { "[Bug creation]" => "[Bug creation]", - "alias" => "Alias", - "assigned_to" => "Assignee", - "bug_file_loc" => "URL", - "bug_id" => "Bug ID", - "bug_severity" => "Severity", - "bug_status" => "Status", - "changeddate" => "Last Changed Date", - "cc" => "CC", - "cclist_accessible" => "CC list accessible?", - "component_id" => "Component ID", - "component" => "Component", - "creation_ts" => "Bug Creation time", - "delta_ts" => "Last Changed time", - "estimated_time" => "Orig. Est.", - "everconfirmed" => "Ever confirmed?", - "groupset" => "Groupset", - "keywords" => "Keywords", - "newcc" => "CC", - "op_sys" => "OS", - "opendate" => "Open Date", - "percentage_complete" => "%Complete", - "priority" => "Priority", - "product_id" => "Product ID", - "product" => "Product", - "qa_contact" => "QA Contact", - "remaining_time" => "Hours Left", - "rep_platform" => "Hardware", - "reporter" => "Reporter", - "reporter_accessible" => "Reporter accessible?", - "resolution" => "Resolution", - "short_desc" => "Summary", - "status_whiteboard" => "Whiteboard", - "target_milestone" => "Target Milestone", - "version" => "Version", - "votes" => "Votes", - "work_time" => "Hours Worked"} %] diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl new file mode 100644 index 000000000..6d8086423 --- /dev/null +++ b/template/en/default/global/field-descs.none.tmpl @@ -0,0 +1,60 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# Remember to PROCESS rather than INCLUDE this template. %] + +[% field_descs = { "[Bug creation]" => "[Bug creation]", + "alias" => "Alias", + "assigned_to" => "Assignee", + "bug_file_loc" => "URL", + "bug_id" => "Bug ID", + "bug_severity" => "Severity", + "bug_status" => "Status", + "changeddate" => "Last Changed Date", + "cc" => "CC", + "cclist_accessible" => "CC list accessible?", + "component_id" => "Component ID", + "component" => "Component", + "creation_ts" => "Bug Creation time", + "delta_ts" => "Last Changed time", + "estimated_time" => "Orig. Est.", + "everconfirmed" => "Ever confirmed?", + "groupset" => "Groupset", + "keywords" => "Keywords", + "newcc" => "CC", + "op_sys" => "OS", + "opendate" => "Open Date", + "percentage_complete" => "%Complete", + "priority" => "Priority", + "product_id" => "Product ID", + "product" => "Product", + "qa_contact" => "QA Contact", + "remaining_time" => "Hours Left", + "rep_platform" => "Hardware", + "reporter" => "Reporter", + "reporter_accessible" => "Reporter accessible?", + "resolution" => "Resolution", + "short_desc" => "Summary", + "status_whiteboard" => "Whiteboard", + "target_milestone" => "Target Milestone", + "version" => "Version", + "votes" => "Votes", + "work_time" => "Hours Worked"} %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 965a3fb27..33ebb9472 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -29,7 +29,7 @@ # alphabetical order by error tag, and leave a blank line between errors. #%] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% DEFAULT title = "Error" %] diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl index d049d0c6c..097a886bb 100644 --- a/template/en/default/list/change-columns.html.tmpl +++ b/template/en/default/list/change-columns.html.tmpl @@ -28,7 +28,7 @@ this feature requires cookies to work.

-[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% field_descs.short_short_desc = "Summary (first 60 characters)" %] [% field_descs.short_desc = "Full Summary" %] [% field_descs.assigned_to_realname = "Assignee Realname" %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 455cf1222..8a5d3ac57 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -32,7 +32,7 @@ # by the browser. #%] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% field_descs.short_short_desc = field_descs.short_desc %] [% field_descs.assigned_to_realname = field_descs.assigned_to %] [% field_descs.reporter_realname = field_descs.reporter %] diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl index e199f115c..143768a25 100644 --- a/template/en/default/reports/report-bar.png.tmpl +++ b/template/en/default/reports/report-bar.png.tmpl @@ -21,7 +21,7 @@ [% y_label = "Bugs" %] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl index 1c84e1bf1..5fe7663d0 100644 --- a/template/en/default/reports/report-line.png.tmpl +++ b/template/en/default/reports/report-line.png.tmpl @@ -21,7 +21,7 @@ [% y_label = "Bugs" %] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl index 76a717779..38cc56cc4 100644 --- a/template/en/default/reports/report-pie.png.tmpl +++ b/template/en/default/reports/report-pie.png.tmpl @@ -19,7 +19,7 @@ # Contributor(s): Gervase Markham #%] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 175479d84..f28c39590 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -31,7 +31,7 @@ # tbl: Name of a hash in data which is the table to be plotted. #%] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] diff --git a/template/en/default/reports/report.csv.tmpl b/template/en/default/reports/report.csv.tmpl index 727acb311..6c3ad46d1 100644 --- a/template/en/default/reports/report.csv.tmpl +++ b/template/en/default/reports/report.csv.tmpl @@ -18,7 +18,7 @@ # # Contributor(s): Gervase Markham #%] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% FOREACH tbl = tbl_names %] [% PROCESS "reports/report-table.csv.tmpl" %] diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl index 494dd796f..00d589541 100644 --- a/template/en/default/reports/report.html.tmpl +++ b/template/en/default/reports/report.html.tmpl @@ -42,7 +42,7 @@ [% row_field = "" %] [% END %] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% tbl_field_disp = field_descs.$tbl_field || tbl_field %] [% col_field_disp = field_descs.$col_field || col_field %] diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl index bdd90d54b..0b80bdb26 100644 --- a/template/en/default/search/form.html.tmpl +++ b/template/en/default/search/form.html.tmpl @@ -327,7 +327,7 @@ function selectProduct(f) { { value => "regexp", description => "matches the regexp" }, { value => "notregexp", description => "doesn't match the regexp" } ] %] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [%# If we resubmit to ourselves, we need to know if we are using a format. %] diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl index 9af620d34..cec33089a 100644 --- a/template/en/default/search/search-report-select.html.tmpl +++ b/template/en/default/search/search-report-select.html.tmpl @@ -24,7 +24,7 @@ # default.$name.0: string. The default value for the block, if any. #%] -[% PROCESS "global/field-descs.html.tmpl" %] +[% PROCESS "global/field-descs.none.tmpl" %] [% BLOCK select %] [% rep_fields = ["product", "component", "version", "rep_platform", -- cgit v1.2.3-24-g4f1b