From e0779526883e06fdd418557d7f5928b3ec443e43 Mon Sep 17 00:00:00 2001 From: "jocuri%softhome.net" <> Date: Sat, 31 Jul 2004 05:16:36 +0000 Subject: Patch for bug 190220: templatize editcomponents.cgi; patch by GavinS ; r=jouni, a=justdave. --- .../admin/components/confirm-delete.html.tmpl | 172 +++++++++++++++++++++ .../admin/components/confirm-delete.html.tmpl.orig | 0 .../en/default/admin/components/create.html.tmpl | 69 +++++++++ .../default/admin/components/create.html.tmpl.orig | 0 .../en/default/admin/components/created.html.tmpl | 40 +++++ .../admin/components/created.html.tmpl.orig | 0 .../en/default/admin/components/deleted.html.tmpl | 69 +++++++++ .../admin/components/deleted.html.tmpl.orig | 0 .../en/default/admin/components/edit.html.tmpl | 105 +++++++++++++ .../default/admin/components/edit.html.tmpl.orig | 0 .../en/default/admin/components/footer.html.tmpl | 56 +++++++ .../default/admin/components/footer.html.tmpl.orig | 0 .../en/default/admin/components/list.html.tmpl | 119 ++++++++++++++ .../default/admin/components/list.html.tmpl.orig | 0 .../admin/components/select-product.html.tmpl | 85 ++++++++++ .../admin/components/select-product.html.tmpl.orig | 0 .../en/default/admin/components/updated.html.tmpl | 82 ++++++++++ .../admin/components/updated.html.tmpl.orig | 0 template/en/default/admin/keywords/list.html.tmpl | 6 +- template/en/default/admin/table.html.tmpl | 23 ++- template/en/default/filterexceptions.pl | 22 ++- template/en/default/global/user-error.html.tmpl | 68 +++++++- 22 files changed, 906 insertions(+), 10 deletions(-) create mode 100644 template/en/default/admin/components/confirm-delete.html.tmpl create mode 100644 template/en/default/admin/components/confirm-delete.html.tmpl.orig create mode 100644 template/en/default/admin/components/create.html.tmpl create mode 100644 template/en/default/admin/components/create.html.tmpl.orig create mode 100644 template/en/default/admin/components/created.html.tmpl create mode 100644 template/en/default/admin/components/created.html.tmpl.orig create mode 100644 template/en/default/admin/components/deleted.html.tmpl create mode 100644 template/en/default/admin/components/deleted.html.tmpl.orig create mode 100644 template/en/default/admin/components/edit.html.tmpl create mode 100644 template/en/default/admin/components/edit.html.tmpl.orig create mode 100644 template/en/default/admin/components/footer.html.tmpl create mode 100644 template/en/default/admin/components/footer.html.tmpl.orig create mode 100644 template/en/default/admin/components/list.html.tmpl create mode 100644 template/en/default/admin/components/list.html.tmpl.orig create mode 100644 template/en/default/admin/components/select-product.html.tmpl create mode 100644 template/en/default/admin/components/select-product.html.tmpl.orig create mode 100644 template/en/default/admin/components/updated.html.tmpl create mode 100644 template/en/default/admin/components/updated.html.tmpl.orig (limited to 'template/en/default') diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl new file mode 100644 index 000000000..a810e026b --- /dev/null +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -0,0 +1,172 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # name: string; The name of the component + # + # description: string; Component description, may be empty + # + # bug_count: number; The number of bugs belonging to the component + # + # initialowner: string; initial owner, may be empty + # + # initialqacontact: string; if system parameter is set to use the initial + # qa contact field, then this will be it, + # may be empty + # + # milestoneurl: string; milestone url, if milestones are in use, + # may be empty + # + # product: string; The name of the product + # + # disallownew: boolean; Are new bugs allowed for the product flag + # + # product_description: string; Description of product + #%] + +[% title = BLOCK %]Delete Component of Product '[% product FILTER html %]' + [% END %] + +[% PROCESS global/header.html.tmpl + title = title +%] + + + + + + + + + + + + + + + + + + +[% IF Param('useqacontact') %] + + + + +[% END %] + + + + + + +[% IF product_description %] + + + + +[% END %] + +[% IF Param('usetargetmilestone') %] + + + + +[% END %] + + + + + + + + + + +
FieldValue
Component:[% name FILTER html %]
Component Description:[% description FILTER html %]
Initial owner:[% initialowner FILTER html %]
Initial QA contact:[% initialqacontact FILTER html %]
Component of Product:[% product FILTER html %]
Product Description:[% product_description FILTER html %]
Product Milestone URL:[% milestoneurl FILTER html %]
Closed for [% terms.bugs %]:[% IF $disallownew %]Yes[% ELSE %]No[% END %]
[% terms.Bugs %]: +[% IF bug_count %] + [% bug_count %] +[% ELSE %] + None +[% END %] +
+ +

Confirmation

+ +[% IF bug_count %] + + [% IF !Param("allowbugdeletion") %] + + Sorry, there + + [% IF bug_count > 1 %] + are [% bug_count %] [%+ terms.bugs %] + [% ELSE %] + is [% bug_count %] [%+ terms.bug %] + [% END %] + + outstanding for this component. You must reassign + + [% IF bug_count > 1 %] + those [% terms.bugs %] + [% ELSE %] + that [% terms.bug %] + [% END %] + + to another component before you can delete this one. + + [% ELSE %] + +
+ + There [% IF bug_count > 1 %] + are [% bug_count %] [%+ terms.bugs %] + [% ELSE %] + is 1 [% terms.bug %] + [% END %] + entered for this component! When you delete this + component, ALL stored [% terms.bugs %] will be deleted, + too. + You could not even see the [% terms.bug %] history for this component anymore! +
+ + [% END %] + +[% END %] + +[% IF bug_count == 0 || Param('allowbugdeletion') %] + +

Do you really want to delete this component?

+ +

+ + + + +
+ +[% END %] + +[% PROCESS admin/components/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl.orig b/template/en/default/admin/components/confirm-delete.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl new file mode 100644 index 000000000..0c6a8b335 --- /dev/null +++ b/template/en/default/admin/components/create.html.tmpl @@ -0,0 +1,69 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # product: string; name of product + #%] + +[% title = BLOCK %]Add component to Product '[% product FILTER html %]'[% END %] +[% h2 = BLOCK %]This page allows you to add a new component to product + '[% product FILTER html %]'.[% END %] +[% PROCESS global/header.html.tmpl + title = title + h2 = h2 +%] + +
+ + + + + + + + + + + + + +[% IF Param('useqacontact') %] + + + + +[% END %] +
Component:
Description: + +
Initial Owner:
Initial QA Contact:
+
+ + + + + + +
+ +[% PROCESS admin/components/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/create.html.tmpl.orig b/template/en/default/admin/components/create.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/created.html.tmpl b/template/en/default/admin/components/created.html.tmpl new file mode 100644 index 000000000..54963065d --- /dev/null +++ b/template/en/default/admin/components/created.html.tmpl @@ -0,0 +1,40 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # name: string; the name of the newly created component + # + # product: string; the name of the product the component belongs to + #%] + +[% title = BLOCK %]Adding new Component of Product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +

The component ' + [%- name FILTER html %]' has been created.

+ +[% PROCESS admin/components/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/created.html.tmpl.orig b/template/en/default/admin/components/created.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/deleted.html.tmpl b/template/en/default/admin/components/deleted.html.tmpl new file mode 100644 index 000000000..a429e356c --- /dev/null +++ b/template/en/default/admin/components/deleted.html.tmpl @@ -0,0 +1,69 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # name: string; the name of the deleted component. + # + # product: string; the name of the product the component belonged to + # + # deleted_bug_count: number; the number of bugs which were deleted + # (if bug deletion is allowed) + #%] + +[% title = BLOCK %]Deleted Component '[% name FILTER html %]' of Product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +

+[% IF deleted_bug_count %] + Attachments, [% terms.bug %] activity and dependencies deleted for + [%+ deleted_bug_count %] + [%- IF deleted_bug_count %] + [% terms.bugs %] + [% ELSE %] + [% terms.bug %] + [% END %]. + +

+ [% deleted_bug_count %] + [%- IF deleted_bug_count %] + [% terms.bugs %] + [% ELSE %] + [% terms.bug %] + [% END %] + deleted. + +[% ELSE %] + No [% terms.bugs %] existed for the component. +[% END %] +

+ +

Flag inclusions and exclusions deleted.

+ +

Component '[% name FILTER html %]' deleted.

+ +[% PROCESS admin/components/footer.html.tmpl + no_edit_component_link = 1 + %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/deleted.html.tmpl.orig b/template/en/default/admin/components/deleted.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl new file mode 100644 index 000000000..08ecb8f5e --- /dev/null +++ b/template/en/default/admin/components/edit.html.tmpl @@ -0,0 +1,105 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # name: string; The name of the component. + # + # description: string; Component description, may be empty + # + # initialowner: string; initial owner, may be empty + # + # initialqacontact: string; initial qa contact, may be empty + # + # product: string; The product the component belongs to + # + # bug_count: number; number of bugs belonging to the component + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% title = BLOCK %]Edit Component '[% name FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +
+ + + + + + + + + + + + + + +[% IF Param('useqacontact') %] + + + + +[% END %] + + + + + + + +
Component:
Component Description: +
Initial owner:
Initial QA contact:
[% terms.Bugs %]: +[% IF bug_count > 0 %] + [% bug_count %] +[% ELSE %] + None +[% END %] +
+ + + + + + + + + + +
+ +[% PROCESS admin/components/footer.html.tmpl + no_edit_component_link = 1 %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/edit.html.tmpl.orig b/template/en/default/admin/components/edit.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/footer.html.tmpl b/template/en/default/admin/components/footer.html.tmpl new file mode 100644 index 000000000..1f58622ae --- /dev/null +++ b/template/en/default/admin/components/footer.html.tmpl @@ -0,0 +1,56 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # name: string; the name of the component + # + # product: string; the name of the product which the component + # belongs/belonged to + #%] + +

+ +

+Edit + +[% IF name && !no_edit_component_link %] + component + '[% name FILTER html %]' + or edit +[% END %] + +[% IF !no_edit_other_components_link %] +other components of product '[% product FILTER html %]', + or edit +[% END %] + +product '[% product FILTER html %]'. + +

diff --git a/template/en/default/admin/components/footer.html.tmpl.orig b/template/en/default/admin/components/footer.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl new file mode 100644 index 000000000..027e1e028 --- /dev/null +++ b/template/en/default/admin/components/list.html.tmpl @@ -0,0 +1,119 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # components: array of hashes having the properties: + # - name: string; The name of the component. + # - description: string; The description of the component. + # - initialowner: string; The initial owner of the component. + # - initialqacontact: string; The qa_contact of the component. + # - bug_count: number; The number of bugs in the component + # (if showbugcounts defined). + # + # showbugcounts: if defined, then bug counts should be included in the table + # + # product: string; the name of the product we are editing components for + #%] + +[% USE Bugzilla %] +[% cgi = Bugzilla.cgi %] + +[% PROCESS global/variables.none.tmpl %] + +[% title = BLOCK %]Select component of product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +[% edit_contentlink = BLOCK %]editcomponents.cgi?action=edit&product= + [%- product FILTER url_quote %]&component=%%name%%[% END %] +[% delete_contentlink = BLOCK %]editcomponents.cgi?action=del&product= + [%- product FILTER url_quote %]&component=%%name%%[% END %] +[% bug_count_contentlink = BLOCK %]buglist.cgi?component=%%name%%&product= + [%- product FILTER url_quote %][% END %] + + +[% columns = [ + { + name => "name" + heading => "Edit component..." + contentlink => edit_contentlink + }, + { + name => "description" + heading => "Description" + allow_html_content => 1 + }, + { + name => "initialowner" + heading => "Initial owner" + }, + ] +%] + +[% IF Param('useqacontact') %] + + [% columns.push({ + name => 'initialqacontact' + heading => 'QA Contact' + }) %] + +[% END %] + +[% IF showbugcounts %] + + [% columns.push({ + name => 'bug_count' + heading => "$terms.Bugs" + align => "right" + contentlink => bug_count_contentlink + }) %] + +[% END %] + +[% columns.push({ + heading => "Action" + content => "Delete" + contentlink => delete_contentlink + }) %] + +[% PROCESS admin/table.html.tmpl + columns = columns + data = components + footer = footer_row +%] + +

Add + a new component to product '[% product FILTER html %]'

+ +[% IF ! showbugcounts %] + +

+ Redisplay table with [% terms.bug %] counts (slower)

+ +[% END %] + +[% PROCESS admin/components/footer.html.tmpl + no_edit_other_components_link = 1 + %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/list.html.tmpl.orig b/template/en/default/admin/components/list.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl new file mode 100644 index 000000000..7e6cb8be5 --- /dev/null +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -0,0 +1,85 @@ +[%# 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): Gavin Shelley (bugzilla@chimpychompy.org) + # + #%] + +[%# INTERFACE: + # products: array of hashes having the properties: + # - name: string; The name of the product. + # - description: string; The description of the product. + # - bug_count: number; The number of bugs for the product (if + # showbugcounts defined). + # + # showbugcounts: if defined, then bug counts should be included in the table + #%] + +[% USE Bugzilla %] +[% cgi = Bugzilla.cgi %] + +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Edit components for which product?" +%] + +[% bug_count_contentlink = BLOCK %]buglist.cgi?component=%%name%%&product= + [%- product FILTER url_quote %][% END %] + +[% columns = [ + { + name => "name" + heading => "Edit components of..." + contentlink => "editcomponents.cgi?product=%%name%%" + }, + { + name => "description" + heading => "Description" + allow_html_content => 1 + } + ] +%] + +[% IF showbugcounts %] + +[% columns.push({ + name => 'bug_count' + heading => "$terms.Bugs" + align => "right" + contentlink => bug_count_contentlink + }) %] + +[% END %] + +[% PROCESS admin/table.html.tmpl + columns = columns + data = products + footer = footer_row +%] + +[% IF ! showbugcounts %] + +

+ Redisplay table with [% terms.bug %] counts (slower)

+ +[% END %] + +

+ +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/select-product.html.tmpl.orig b/template/en/default/admin/components/select-product.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/components/updated.html.tmpl b/template/en/default/admin/components/updated.html.tmpl new file mode 100644 index 000000000..2382814df --- /dev/null +++ b/template/en/default/admin/components/updated.html.tmpl @@ -0,0 +1,82 @@ +[%# 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): Gavin Shelley + #%] + +[%# INTERFACE: + # + # 'updated_XXX' variables are booleans, and are defined if the + # 'XXX' field was updated during the edit just being handled. + # Variables called just 'XXX' are strings, and are the _new_ contents + # of the fields. + # + # name & updated_name: the name of the component + # + # description & updated_description: the component description + # + # initialowner & updated_initialowner: the initial owner + # + # initialqacontact & updated_initialqacontact: the initial qa contact + # + # product: string; the name of the product the component belongs to + #%] + +[% title = BLOCK %]Updating Component '[% name FILTER html %]' of Product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +[% IF updated_description %] +

+ + + + + +
Updated description to:'[% description FILTER html %]'
+[% END %] + +[% IF updated_initialowner %] +

Updated Initial Owner to: '[% initialowner FILTER html %]'.

+[% END %] + +[% IF updated_initialqacontact %] +

+ [% IF initialqacontact %] + Updated Initial QA Contact to '[% initialqacontact FILTER html %]'. + [% ELSE %] + Removed initial QA Contact. + [% END %] +

+[% END %] + +[% IF updated_name %] +

Updated Component name to: '[% name FILTER html %]'.

+[% END %] + +[% UNLESS updated_description || updated_initialowner || + updated_initialqacontact || updated_name %] +

Nothing changed for component '[% name FILTER html %]'. +[% END %] + + +[% PROCESS admin/components/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/updated.html.tmpl.orig b/template/en/default/admin/components/updated.html.tmpl.orig new file mode 100644 index 000000000..e69de29bb diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index fbfc92142..113b90433 100755 --- a/template/en/default/admin/keywords/list.html.tmpl +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -22,7 +22,7 @@ #%] [%# INTERFACE: - # keywords: array with keyword objects having the properties: + # keywords: array of hashes having the properties: # - id: number. The ID of the keyword. # - name: string. The name of the keyword. # - description: string. The description of the keyword. @@ -39,7 +39,7 @@ { name => "name" heading => "Edit keyword..." - contentlink => "editkeywords.cgi?action=edit&id=%id%" + contentlink => "editkeywords.cgi?action=edit&id=%%id%%" }, { name => "description" @@ -53,7 +53,7 @@ { heading => "Action" content => "Delete" - contentlink => "editkeywords.cgi?action=delete&id=%id%" + contentlink => "editkeywords.cgi?action=delete&id=%%id%%" } ] %] diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index 8647aea76..ac4e5a666 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -28,13 +28,15 @@ # name: Name of the field in the data param # heading: The text to print at the header cell # contentlink: URI to which the content of a data cell shall be linked to. - # Expressions of format %xxx% are replaced with value + # Expressions of format %%xxx%% are replaced with value # with the key xxx in data hash of the current row. # content: If specified, the content of this variable is used # instead of the data pulled from the current row. # NOTE: This value is not HTML filtered at output! # align: left/center/right. Controls the horizontal alignment of the # text in the column. + # allow_html_content: if defined, then this column allows html content + # so it will not be filtered # # data: # array of hashes representing the data for the table. @@ -65,9 +67,11 @@ [% IF c.contentlink %] [% link_uri = c.contentlink %] - [% FOREACH m = link_uri.match('%(.+?)%'); %] - [% replacement_value = FILTER url_quote; row.$m; END %] - [% link_uri = link_uri.replace("%$m%", replacement_value) %] + [% FOREACH m = link_uri.match('%%(.+?)%%'); %] + [% IF row.$m %] + [% replacement_value = FILTER url_quote; row.$m; END %] + [% link_uri = link_uri.replace("%%$m%%", replacement_value) %] + [% END %] [% END %] [% END %] @@ -75,7 +79,11 @@ [% IF c.content %] [% c.content %] [% ELSE %] - [% row.${c.name} FILTER html %] + [% IF c.allow_html_content %] + [% row.${c.name} FILTER none %] + [% ELSE %] + [% row.${c.name} FILTER html %] + [% END %] [% END %] [% IF c.contentlink %] @@ -87,6 +95,11 @@ [% END %] +[% IF data.size == 0 %] + <none> +[% END %] + + [%################### TABLE FOOTER ######################%] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index e90037f87..f183461ce 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -101,7 +101,6 @@ IF sortvisible', 'column.name', 'column.description', - 'vis_bug_ids.push(bug.id)', 'bug.id', 'bug.count', 'bug.delta', @@ -526,6 +525,27 @@ 'type.flag_count', ], + +'admin/components/confirm-delete.html.tmpl' => [ + 'bug_count' +], + +'admin/components/deleted.html.tmpl' => [ + 'deleted_bug_count' +], + +'admin/components/edit.html.tmpl' => [ + 'bug_count' +], + +'admin/components/list.html.tmpl' => [ + 'cgi.query_string' +], + +'admin/components/select-product.html.tmpl' => [ + 'cgi.query_string' +], + 'account/login.html.tmpl' => [ 'target', ], diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index fcd3ca4fd..28002581a 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -20,7 +20,7 @@ #%] [%# INTERFACE: - # header_done: boolean. True if the header has already been printed. + # header_done: boolean. True if the Bugzilla header has already been printed. # error: string. The tag of the error, or the error message to be displayed # (deprecated). May contain HTML if it's an error message. #%] @@ -142,6 +142,72 @@ [% title = "Comment Too Long" %] Comments cannot be longer than 65,535 characters. + [% ELSIF error == "auth_cant_edit_components" %] + [% title = "Access Denied" %] + Sorry, you aren't a member of the 'editcomponents' group, and so + you aren't allowed to add, modify or delete components. + + [% ELSIF error == "component_already_exists" %] + [% title = "Component Already Exists" %] + A component with the name '[% name FILTER html %]' already exists. + + [% ELSIF error == "component_blank_description" %] + [% title = "Blank Component Description Not Allowed" %] + You must enter a non-blank description for component '[% name FILTER html %]'. + + [% ELSIF error == "component_blank_name" %] + [% title = "Blank Component Name Not Allowed" %] + You must enter a name for this new component. + + [% ELSIF error == "component_must_have_a_name" %] + [% title = "Blank Component Name Not Allowed" %] + You cannot delete the component name for component '[% name FILTER html %]'. + + [% ELSIF error == "component_cant_del_description" %] + [% title = "Blank Component Description Not Allowed" %] + You cannot delete the component description for + component '[% name FILTER html %]'. + + [% ELSIF error == "component_name_too_long" %] + [% title = "Component Name Is Too Long" %] + The name of a component is limited to 64 characters. + '[% name FILTER html %]' is too long ([% name.size %] characters). + + [% ELSIF error == "component_need_initialowner" %] + [% title = "Component Requires Initial Owner" %] + You must enter an initial owner for component '[% name FILTER html %]'. + + [% ELSIF error == "component_need_valid_initialowner" %] + [% title = "Component Requires A Valid Initial Owner" %] + You must use an existing [% terms.Bugzilla %] account as initial owner for + component '[% name FILTER html %]'. + + [% ELSIF error == "component_need_valid_initialqacontact" %] + [% title = "Component Requires A Valid Initial QA Contact" %] + You must use an existing [% terms.Bugzilla %] account as initial QA contact for + component '[% name FILTER html %]'. + + [% ELSIF error == "component_no_action" %] + [% title = "No valid action specified" %] + No valid action was specified when trying to edit components. + + [% ELSIF error == "product_not_specified" %] + [% title = "No Product Specified" %] + No product specified when trying to edit components. + + [% ELSIF error == "component_not_specified" %] + [% title = "No Component Specified" %] + No component specified when trying to edit components. + + [% ELSIF error == "component_not_valid" %] + [% title = "Specified Component Does Not Exist" %] + The component '[% name FILTER html %]' for product + '[% product FILTER html %]' does not exist. + + [% ELSIF error == "product_doesnt_exist" %] + [% title = "Specified Product Does Not Exist" %] + The product '[% product FILTER html %]' does not exist. + [% ELSIF error == "dependency_loop_multi" %] [% title = "Dependency Loop Detected" %] The following [% terms.bug %](s) would appear on both the "depends on" -- cgit v1.2.3-24-g4f1b