Patch for bug 190220: templatize editcomponents.cgi; patch by GavinS <bugzilla@chimpychompy.org>; r=jouni, a=justdave.

22 files changed, 906 insertions, 10 deletions

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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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
+%]
+
+<table border="1" cellpadding="4" cellspacing="0">
+<tr bgcolor="#6666FF">
+  <th valign="top" align="left">Field</th>
+  <th valign="top" align="left">Value</th>
+</tr>
+<tr>
+  <td valign="top">Component:</td>
+  <td valign="top">[% name FILTER html %]</td>
+</tr>
+<tr>
+  <td valign="top">Component Description:</td>
+  <td valign="top">[% description FILTER html %]</td>
+</tr>
+<tr>
+  <td valign="top">Initial owner:</td>
+  <td valign="top">[% initialowner FILTER html %]</td>
+  
+[% IF Param('useqacontact') %]
+</tr>
+<tr>
+  <td valign="top">Initial QA contact:</td>
+  <td valign="top">[% initialqacontact FILTER html %]</td>
+[% END %]
+  
+</tr>
+<tr>
+  <td valign="top">Component of Product:</td>
+  <td valign="top">[% product FILTER html %]</td>
+
+[% IF product_description %]  
+</tr>
+<tr>
+  <td valign="top">Product Description:</td>
+  <td valign="top">[% product_description FILTER html %]</td>
+[% END %]
+
+[% IF Param('usetargetmilestone') %]
+</tr>
+<tr>
+  <td valign="top">Product Milestone URL:</td>
+  <td valign="top"><a href="[% milestoneurl FILTER uri %]">[% milestoneurl FILTER html %]</a></td>
+[% END %]
+
+</tr>
+<tr>
+  <TD VALIGN="top">Closed for [% terms.bugs %]:</TD>
+  <TD VALIGN="top">[% IF $disallownew %]Yes[% ELSE %]No[% END %]</td>
+</tr>
+<tr>
+  <td valign="top">[% terms.Bugs %]:</td>
+  <td valign="top">
+[% IF bug_count %]
+  <a title="List of [% terms.bugs %] for component '[% name FILTER html %]'"
+     href="buglist.cgi?component=[% name FILTER url_quote %]&amp;product=
+          [%- product FILTER url_quote %]">[% bug_count %]</a>
+[% ELSE %]
+  None
+[% END %]
+  </td>
+</tr>
+</table>
+
+<h2>Confirmation</h2>
+  
+[% 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 %]
+
+    <table border="0" cellpadding="20" width="70%" bgcolor="red"><tr><td>
+
+      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, <b><blink>ALL</blink></b> stored [% terms.bugs %] will be deleted,
+      too.
+      You could not even see the [% terms.bug %] history for this component anymore!
+      </td></tr></table>
+
+  [% END %]
+
+[% END %]
+
+[% IF bug_count == 0 || Param('allowbugdeletion') %]
+
+  <p>Do you really want to delete this component?<p>
+  
+  <form method="post" action="editcomponents.cgi">
+  <input type="submit" value="Yes, delete">
+  <input type="hidden" name="action" value="delete">
+  <input type="hidden" name="product" value="[% product FILTER html %]">
+  <input type="hidden" name="component" value="[% name FILTER html %]">
+  </form>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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
+%]
+
+<form method="post" action="editcomponents.cgi">
+  <table border="0" cellpadding="4" cellspacing="0">
+    <tr>
+      <th align="right">Component:</th>
+      <td><input size="64" maxlength="64" name="component" value=""></td>
+    </tr>
+    <tr>
+      <th align="right">Description:</th>
+      <td>
+        <textarea rows="4" cols="64" wrap="virtual"
+                  name="description"></textarea>
+      </td>
+    </tr>
+    <tr>
+      <th align="right">Initial Owner:</th>
+      <td><input size="64" maxlength="64" name="initialowner" value=""></td>
+    </tr>
+[% IF Param('useqacontact') %]
+    <tr>
+      <th align="right">Initial QA Contact:</th>
+      <td><input size="64" maxlength="64" name="initialqacontact" value=""></td>
+    </tr>
+[% END %]
+  </table>
+  <hr>
+  <input type="submit" value="Add">
+  <input type="hidden" name="action" value="new">
+  <input type="hidden" name='open_name' value='All Open'>
+  <input type="hidden" name='closed_name' value='All Closed'>
+  <input type="hidden" name='product' value="[% product FILTER html %]">
+
+</form>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/create.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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
+%]
+
+<p>The component '<a href="editcomponents.cgi?action=edit&amp;product=
+   [%- product FILTER url_quote %]&amp;component=[% name FILTER url_quote %]">
+   [%- name FILTER html %]</a>' has been created.</p>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/created.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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
+%]
+
+<p>
+[% 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 %].
+
+  </p><p>
+  [% deleted_bug_count %]
+  [%- IF deleted_bug_count %] 
+    [% terms.bugs %]
+  [% ELSE %]
+    [% terms.bug %]
+  [% END %]
+  deleted.
+
+[% ELSE %]
+  No [% terms.bugs %] existed for the component.
+[% END %]
+</p>
+
+<p>Flag inclusions and exclusions deleted.</p>
+
+<p>Component '[% name FILTER html %]' deleted.</p>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/deleted.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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
+%]
+
+<form method="post" action="editcomponents.cgi">
+  <table border="0" cellpadding="4" cellspacing="0">
+
+    <tr>
+      <td valign="top">Component:</td>
+      <td><input size="64" maxlength="64" name="component" value="
+      [%- name FILTER html %]"></td>
+    </tr>
+    <tr>
+      <td valign="top">Component Description:</td>
+      <td><textarea rows="4" cols="64" wrap="virtual"
+        name="description">[% description FILTER html %]</textarea>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top">Initial owner:</td>
+      <td><input size="64" maxlength="64" name="initialowner" value="
+      [%- initialowner FILTER html %]"></td>
+  
+[% IF Param('useqacontact') %]
+    </tr>
+    <tr>
+      <td valign="top">Initial QA contact:</td>
+      <td><input size="64" maxlength="64" name="initialqacontact" value="
+      [%- initialqacontact FILTER html %]"></td>
+[% END %]
+  
+    </tr>
+    <tr>
+      <td>[% terms.Bugs %]:</td>
+      <td>
+[% IF bug_count > 0 %]
+        <a title="Bugs in component '[% name FILTER html %]'"
+           href="buglist.cgi?component=
+                [%- name FILTER url_quote %]&amp;product=
+                [%- product FILTER url_quote %]">[% bug_count %]</a>
+[% ELSE %]
+        None
+[% END %]
+      </td>
+    </tr>
+
+  </table>
+
+
+   <input type="hidden" name="componentold" value="
+        [%- name FILTER html %]">
+   <input type="hidden" name="descriptionold" value="
+        [%- description FILTER html %]">
+   <input type="hidden" name="initialownerold" value="
+        [%- initialowner FILTER html %]">
+   <input type="hidden" name="initialqacontactold" value="
+        [%- initialqacontact FILTER html %]">
+   <input type="hidden" name="action" value="update">
+   <input type="hidden" name="product" value="[% product FILTER html %]">
+   <input type="submit" value="Update">
+
+</form>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/edit.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# INTERFACE:
+  # name: string; the name of the component
+  #
+  # product: string; the name of the product which the component
+  #                  belongs/belonged to
+  #%]
+  
+<p>
+
+<hr>
+Edit 
+
+[% IF name && !no_edit_component_link %]
+  component <a 
+  title="Edit Component '[% name FILTER html %]'"
+  href="editcomponents.cgi?action=edit&amp;product=
+  [%- product FILTER url_quote %]&amp;component=[% name FILTER url_quote %]">
+   '[% name FILTER html %]'</a> 
+  or edit
+[% END %]
+
+[% IF !no_edit_other_components_link %]
+other components of product <a 
+  title="Choose a component from product '[% product FILTER html %]' to edit"
+  href="editcomponents.cgi?product=
+  [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>, 
+  or edit 
+[% END %]
+
+product <a 
+  title="Edit Product '[% product FILTER html %]'"
+  href="editproducts.cgi?action=edit&amp;product=
+  [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+
+</p>
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
--- /dev/null
+++ b/template/en/default/admin/components/footer.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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&amp;product=
+  [%- product FILTER url_quote %]&amp;component=%%name%%[% END %]
+[% delete_contentlink = BLOCK %]editcomponents.cgi?action=del&amp;product=
+  [%- product FILTER url_quote %]&amp;component=%%name%%[% END %]
+[% bug_count_contentlink = BLOCK %]buglist.cgi?component=%%name%%&amp;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
+%]
+
+<p><a href="editcomponents.cgi?action=add&amp;product=[% product FILTER url_quote %]">Add</a>
+    a new component to product '[% product FILTER html %]'</p>
+
+[% IF ! showbugcounts %]
+
+<p><a href="editcomponents.cgi?showbugcounts=1&amp;[% cgi.query_string %]">
+    Redisplay table with [% terms.bug %] counts (slower)</a></p>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/list.html.tmpl.orig
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%%&amp;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 %]
+
+<p><a href="editcomponents.cgi?showbugcounts=1&amp;[% cgi.query_string %]">
+    Redisplay table with [% terms.bug %] counts (slower)</a></p>
+
+[% END %]
+
+<p>
+
+[% 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
--- /dev/null
+++ b/template/en/default/admin/components/select-product.html.tmpl.orig
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 <bugzilla@chimpychompy.org>
+  #%]
+
+[%# 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 %]
+  <p>
+  <table>
+    <tr>
+      <td>Updated description to:</td>
+      <td>'[% description FILTER html %]'</td>
+    </tr>
+  </table>
+[% END %]
+
+[% IF updated_initialowner %]
+  <p>Updated Initial Owner to: '[% initialowner FILTER html %]'.</p>
+[% END %]
+
+[% IF updated_initialqacontact %]
+  <p>
+  [% IF initialqacontact %]
+    Updated Initial QA Contact to '[% initialqacontact FILTER html %]'.
+  [% ELSE %]
+    Removed initial QA Contact.
+  [% END %]
+  </p>
+[% END %]
+
+[% IF updated_name %]
+  <p>Updated Component name to: '[% name FILTER html %]'.</p>
+[% END %]
+
+[% UNLESS updated_description || updated_initialowner || 
+          updated_initialqacontact || updated_name %]
+  <p>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
--- /dev/null
+++ b/template/en/default/admin/components/updated.html.tmpl.orig
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&amp;id=%id%" 
+       contentlink => "editkeywords.cgi?action=edit&amp;id=%%id%%" 
      },
      { 
        name => "description"
@@ -53,7 +53,7 @@
      { 
        heading => "Action" 
        content => "Delete"
-       contentlink => "editkeywords.cgi?action=delete&amp;id=%id%"
+       contentlink => "editkeywords.cgi?action=delete&amp;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 %]
           <a href="[% link_uri %]">
         [% 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 @@
   </tr>
 [% END %]
 
+[% IF data.size == 0 %]
+  <tr><td colspan="[% columns.size %]" align="center"><i>&lt;none&gt;</i></td></tr>
+[% END %]
+
+
 [%###################  TABLE FOOTER   ######################%]
 
 </table>
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"