Patch for bug 190226: templatize editversions.cgi; patch by GavinS <bugzilla@chimpychompy.org>, r=jouni, a=myk.

9 files changed, 598 insertions, 0 deletions

diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl
new file mode 100644
index 000000000..5f9b93943
--- /dev/null
+++ b/template/en/default/admin/versions/confirm-delete.html.tmpl
@@ -0,0 +1,124 @@
+[%# 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 version
+  #
+  # bug_count: number; The number of bugs targetted at the version
+  #
+  # product: string; The name of the product
+  #
+  #%]
+
+[% title = BLOCK %]Delete Version 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">Version:</td>
+  <td valign="top">[% name FILTER html %]</td>
+</tr>
+<tr>
+  <td valign="top">Version of Product:</td>
+  <td valign="top">[% product FILTER html %]</td>
+</tr>
+<tr>
+  <td valign="top">[% terms.Bugs %]:</td>
+  <td valign="top">
+[% IF bug_count %]
+  <a title="List of [% terms.bugs %] targetted at version '
+           [% name FILTER html %]'"
+     href="buglist.cgi?version=[% 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 version. You must move 
+
+    [% IF bug_count > 1 %]
+       those [% terms.bugs %] 
+    [% ELSE %]
+       that [% terms.bug %]
+    [% END %]
+
+    to another version 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 version!  When you delete this
+      version, <b><blink>ALL</blink></b> stored [% terms.bugs %] will be deleted,
+      too.
+      You could not even see the [% terms.bug %] history for this version anymore!
+      </td></tr></table>
+
+  [% END %]
+
+[% END %]
+
+[% IF bug_count == 0 || Param('allowbugdeletion') %]
+
+  <p>Do you really want to delete this version?<p>
+  
+  <form method="post" action="editversions.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="version" value="[% name FILTER html %]">
+  </form>
+
+[% END %]
+
+[% PROCESS admin/versions/footer.html.tmpl %]
+
+[% PROCESS global/footer.html.tmpl %] 
diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl
new file mode 100644
index 000000000..594bf4f87
--- /dev/null
+++ b/template/en/default/admin/versions/create.html.tmpl
@@ -0,0 +1,54 @@
+[%# 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 the product the version is being created for
+  #%]
+  
+[% title = BLOCK %]Add Version to Product '[% product FILTER html %]'[% END %]
+[% h2 = BLOCK %]This page allows you to add a new version to product
+                '[% product FILTER html %]'.[% END %]
+[% PROCESS global/header.html.tmpl
+  title = title
+  h2 = h2
+%]
+
+<form method="post" action="editversions.cgi">
+  <table border="0" cellpadding="4" cellspacing="0">
+    <tr>
+      <th align="right"><label for="version">Version:</label></th>
+      <td><input id="version" size="64" maxlength="64" name="version"
+                 value=""></td>
+    </tr>
+  </table>
+  <input type="submit" value="Add">
+  <input type="hidden" name="action" value="new">
+  <input type="hidden" name='product' value="[% product FILTER html %]">
+
+</form>
+
+<p>
+
+[% PROCESS admin/versions/footer.html.tmpl
+    no_add_version_link = 1
+ %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/created.html.tmpl b/template/en/default/admin/versions/created.html.tmpl
new file mode 100644
index 000000000..84445cccd
--- /dev/null
+++ b/template/en/default/admin/versions/created.html.tmpl
@@ -0,0 +1,44 @@
+[%# 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 version
+  #
+  # product: string; the name of the product the version belongs to
+  #%]
+  
+[% title = BLOCK %]Adding new Version of Product
+                   '[% product FILTER html %]'[% END %]
+[% PROCESS global/header.html.tmpl
+  title = title
+%]
+
+<p>The version '<a title="Edit version '[% name FILTER html %]' of product '
+   [%- product FILTER html %]'"
+   href="editversions.cgi?action=edit&amp;product=
+   [%- product FILTER url_quote %]&amp;version=[% name FILTER url_quote %]">
+   [%- name FILTER html %]</a>' has been created.</p>
+
+<p>
+
+[% PROCESS admin/versions/footer.html.tmpl %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/deleted.html.tmpl b/template/en/default/admin/versions/deleted.html.tmpl
new file mode 100644
index 000000000..f6945ccd3
--- /dev/null
+++ b/template/en/default/admin/versions/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 version.
+  #
+  # product: string; the name of the product the version belonged to
+  #
+  # deleted_bug_count: number; the number of bugs which were deleted
+  #                            (if bug deletion is allowed)
+  #%]
+  
+[% title = BLOCK %]Deleted Version '[% 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 > 1 %] 
+    [%+ terms.bugs %]
+  [% ELSE %]
+    [%+ terms.bug %]
+  [% END %].
+
+  </p><p>
+  [% deleted_bug_count %]
+  [% IF deleted_bug_count > 1 %] 
+    [%+ terms.bugs %]
+  [% ELSE %]
+    [%+ terms.bug %]
+  [% END %]
+  deleted.
+
+[% ELSE %]
+  No [% terms.bugs %] were targetted at the version.
+[% END %]
+</p>
+
+<p>Version '[% name FILTER html %]' deleted.</p>
+
+<p>
+
+[% PROCESS admin/versions/footer.html.tmpl
+  no_edit_version_link = 1
+ %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl
new file mode 100644
index 000000000..ef1fbd270
--- /dev/null
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -0,0 +1,59 @@
+[%# 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 version
+  #
+  # product: string; The product the version belongs to
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% title = BLOCK %]Edit Version '[% name FILTER html %]' of product '
+                   [%- product FILTER html %]'[% END %]
+[% PROCESS global/header.html.tmpl
+  title = title
+%]
+
+<form method="post" action="editversions.cgi">
+  <table border="0" cellpadding="4" cellspacing="0">
+
+    <tr>
+      <th valign="top"><label for="version">Version:</label></th>
+      <td><input id="version" size="64" maxlength="64" name="version" value="
+      [%- name FILTER html %]"></td>
+    </tr>
+
+  </table>
+
+  <input type="hidden" name="versionold" value="[% name FILTER html %]">
+  <input type="hidden" name="action" value="update">
+  <input type="hidden" name="product" value="[% product FILTER html %]">
+  <input type="submit" value="Update">
+
+</form>
+
+<p>
+
+[% PROCESS admin/versions/footer.html.tmpl
+  no_edit_version_link = 1 %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/footer.html.tmpl b/template/en/default/admin/versions/footer.html.tmpl
new file mode 100644
index 000000000..252005697
--- /dev/null
+++ b/template/en/default/admin/versions/footer.html.tmpl
@@ -0,0 +1,66 @@
+[%# 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 version
+  #
+  # product: string; the name of the product which the version
+  #                  belongs/belonged to
+  #
+  # no_XXX_link: boolean; if defined, then don't show the corresponding
+  #                       link. Supported parameters are:
+  #
+  # no_edit_version_link
+  # no_edit_other_versions_link
+  # no_add_version_link
+  #%]
+  
+<p>
+
+<hr>
+
+[% UNLESS no_add_version_link %]
+  <a title="Add a version to product '[% product FILTER html %]'"
+     href="editversions.cgi?action=add&amp;product=
+          [%- product FILTER url_quote %]">Add</a> a version. 
+[% END %]
+
+[% IF name && !no_edit_version_link %]
+  Edit version <a 
+  title="Edit Version '[% name FILTER html %]' of product '
+         [%- product FILTER html %]'"
+  href="editversions.cgi?action=edit&amp;product=
+        [%- product FILTER url_quote %]&amp;version=[% name FILTER url_quote %]">
+        '[% name FILTER html %]'</a>.
+[% END %]
+
+[% UNLESS no_edit_other_versions_link %]
+  Edit other versions of product <a 
+  href="editversions.cgi?product=
+        [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+   
+[% END %]
+
+  Edit product <a 
+  href="editproducts.cgi?action=edit&amp;product=
+        [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+
+</p>
diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl
new file mode 100644
index 000000000..ec47c18d7
--- /dev/null
+++ b/template/en/default/admin/versions/list.html.tmpl
@@ -0,0 +1,71 @@
+[%# 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:
+  # versions: array of hashes having the following properties:
+  #   - name: string; The name of the version.
+  #
+  # product: string; the name of the product we are editing versions for
+  #%]
+
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% title = BLOCK %]Select version of product
+                   '[% product FILTER html %]'[% END %]
+[% PROCESS global/header.html.tmpl
+  title = title
+%]
+
+[% edit_contentlink = BLOCK %]editversions.cgi?action=edit&amp;product=
+  [%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+[% delete_contentlink = BLOCK %]editversions.cgi?action=del&amp;product=
+  [%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+
+
+[% columns = [
+     { 
+       name => "name"
+       heading => "Edit version..."
+       contentlink => edit_contentlink
+     },
+     {
+       heading => "Action"
+       content => "Delete"
+       contentlink => delete_contentlink
+     }
+   ]
+%]
+
+[% PROCESS admin/table.html.tmpl
+     columns = columns
+     data = versions
+%]
+
+<p>
+
+[% PROCESS admin/versions/footer.html.tmpl
+  no_edit_other_versions_link = 1
+ %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl
new file mode 100644
index 000000000..621649cd2
--- /dev/null
+++ b/template/en/default/admin/versions/select-product.html.tmpl
@@ -0,0 +1,62 @@
+[%# 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 following properties:
+  #   - name: string; The name of the product.
+  #   - description: string; The description of the product.
+  #%]
+
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
+  title = "Edit versions for which product?"
+%]
+
+[% bug_count_contentlink = BLOCK %]buglist.cgi?version=%%name%%&amp;product=
+  [%- product FILTER url_quote %][% END %]
+
+[% columns = [
+     { 
+       name => "name"
+       heading => "Edit versions of..."
+       contentlink => "editversions.cgi?product=%%name%%" 
+     },
+     { 
+       name => "description"
+       heading => "Description" 
+       allow_html_content => 1
+     }
+   ]
+%]
+
+[% PROCESS admin/table.html.tmpl
+     columns = columns
+     data = products
+%]
+
+<p>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/updated.html.tmpl b/template/en/default/admin/versions/updated.html.tmpl
new file mode 100644
index 000000000..04851adae
--- /dev/null
+++ b/template/en/default/admin/versions/updated.html.tmpl
@@ -0,0 +1,49 @@
+[%# 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_name: boolean; defined if the 'name' field was updated
+  #
+  # name: string; the new name of the version
+  #
+  # product: string; the name of the product the version belongs to
+  #%]
+  
+[% title = BLOCK %]Updating Version '[% name FILTER html %]' of Product
+                   '[% product FILTER html %]'[% END %]
+[% PROCESS global/header.html.tmpl
+  title = title
+%]
+
+[% IF updated_name %]
+  <p>Updated Version name to: '[% name FILTER html %]'.</p>
+[% END %]
+
+[% UNLESS updated_name %]
+  <p>Nothing changed for version '[% name FILTER html %]'.
+[% END %]
+   
+<p>
+
+[% PROCESS admin/versions/footer.html.tmpl %]
+
+[% PROCESS global/footer.html.tmpl %]