From 8d91efaa1fe8eb3828e123b7ff3356c5107f3ebd Mon Sep 17 00:00:00 2001 From: "justdave%bugzilla.org" <> Date: Sat, 11 Sep 2004 13:48:13 +0000 Subject: Bug 190224: templatize editmilestones.cgi Patch by GavinS r=jouni, a=justdave --- .../admin/milestones/confirm-delete.html.tmpl | 135 +++++++++++++++++++++ .../en/default/admin/milestones/create.html.tmpl | 59 +++++++++ .../en/default/admin/milestones/created.html.tmpl | 44 +++++++ .../en/default/admin/milestones/deleted.html.tmpl | 69 +++++++++++ .../en/default/admin/milestones/edit.html.tmpl | 67 ++++++++++ .../en/default/admin/milestones/footer.html.tmpl | 66 ++++++++++ .../en/default/admin/milestones/list.html.tmpl | 77 ++++++++++++ .../admin/milestones/select-product.html.tmpl | 60 +++++++++ .../en/default/admin/milestones/updated.html.tmpl | 58 +++++++++ template/en/default/filterexceptions.pl | 11 +- template/en/default/global/user-error.html.tmpl | 37 ++++++ 11 files changed, 682 insertions(+), 1 deletion(-) create mode 100644 template/en/default/admin/milestones/confirm-delete.html.tmpl create mode 100644 template/en/default/admin/milestones/create.html.tmpl create mode 100644 template/en/default/admin/milestones/created.html.tmpl create mode 100644 template/en/default/admin/milestones/deleted.html.tmpl create mode 100644 template/en/default/admin/milestones/edit.html.tmpl create mode 100644 template/en/default/admin/milestones/footer.html.tmpl create mode 100644 template/en/default/admin/milestones/list.html.tmpl create mode 100644 template/en/default/admin/milestones/select-product.html.tmpl create mode 100644 template/en/default/admin/milestones/updated.html.tmpl (limited to 'template/en') diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl new file mode 100644 index 000000000..893b849ae --- /dev/null +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -0,0 +1,135 @@ +[%# 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 milestone + # + # default_milestone: string; The default milestone for the product + # + # bug_count: number; The number of bugs targetted at the milestone + # + # product: string; The name of the product + # + #%] + +[% title = BLOCK %]Delete Milestone of Product '[% product FILTER html %]' + [% END %] + +[% PROCESS global/header.html.tmpl + title = title +%] + + + + + + + + + + + + + + + + + + +
FieldValue
Milestone:[% name FILTER html %]
Milestone of Product:[% product FILTER html %]
[% 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 milestone. You must move + + [% IF bug_count > 1 %] + those [% terms.bugs %] + [% ELSE %] + that [% terms.bug %] + [% END %] + + to another milestone 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 milestone! When you delete this + milestone, ALL stored [% terms.bugs %] will be deleted, + too. + You could not even see the [% terms.bug %] history for this milestone anymore! +
+ + [% END %] + +[% END %] + +[% IF default_milestone == name %] + +

Sorry, but '[% name FILTER html %]' is the default milestone for product ' + [%- product FILTER html %]', and so it can not be deleted. + + [% ELSE %] + + [% IF bug_count == 0 || Param('allowbugdeletion') %] + +

Do you really want to delete this milestone?

+ +

+ + + + +
+ + [% END %] + +[% END %] + +[% PROCESS admin/milestones/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl new file mode 100644 index 000000000..ac707c195 --- /dev/null +++ b/template/en/default/admin/milestones/create.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 + #%] + +[%# INTERFACE: + # product: string; name of the product the milestone is being created for + #%] + +[% title = BLOCK %]Add Milestone to Product '[% product FILTER html %]'[% END %] +[% h2 = BLOCK %]This page allows you to add a new milestone to product + '[% product FILTER html %]'.[% END %] +[% PROCESS global/header.html.tmpl + title = title + h2 = h2 +%] + +
+ + + + + + + + + +
+ + + + +
+ +

+ +[% PROCESS admin/milestones/footer.html.tmpl + no_add_milestone_link = 1 + %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/created.html.tmpl b/template/en/default/admin/milestones/created.html.tmpl new file mode 100644 index 000000000..87e08cebe --- /dev/null +++ b/template/en/default/admin/milestones/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 + #%] + +[%# INTERFACE: + # name: string; the name of the newly created milestone + # + # product: string; the name of the product the milestone belongs to + #%] + +[% title = BLOCK %]Adding new Milestone of Product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +

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

+ +

+ +[% PROCESS admin/milestones/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/deleted.html.tmpl b/template/en/default/admin/milestones/deleted.html.tmpl new file mode 100644 index 000000000..61abb38e5 --- /dev/null +++ b/template/en/default/admin/milestones/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 milestone. + # + # product: string; the name of the product the milestone belonged to + # + # deleted_bug_count: number; the number of bugs which were deleted + # (if bug deletion is allowed) + #%] + +[% title = BLOCK %]Deleted Milestone '[% 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 > 1 %] + [%+ terms.bugs %] + [% ELSE %] + [%+ terms.bug %] + [% END %]. + +

+ [% deleted_bug_count %] + [% IF deleted_bug_count > 1 %] + [%+ terms.bugs %] + [% ELSE %] + [%+ terms.bug %] + [% END %] + deleted. + +[% ELSE %] + No [% terms.bugs %] were targetted at the milestone. +[% END %] +

+ +

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

+ +

+ +[% PROCESS admin/milestones/footer.html.tmpl + no_edit_milestone_link = 1 + %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl new file mode 100644 index 000000000..6b5ec8fb0 --- /dev/null +++ b/template/en/default/admin/milestones/edit.html.tmpl @@ -0,0 +1,67 @@ +[%# 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 milestone + # + # sortkey: number; milestone sortkey + # + # product: string; The product the milestone belongs to + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% title = BLOCK %]Edit Milestone '[% name FILTER html %]' of product ' + [%- product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +

+ + + + + + + + + + + +
+ + + + + + + +
+ +

+ +[% PROCESS admin/milestones/footer.html.tmpl + no_edit_milestone_link = 1 %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/footer.html.tmpl b/template/en/default/admin/milestones/footer.html.tmpl new file mode 100644 index 000000000..8980d642e --- /dev/null +++ b/template/en/default/admin/milestones/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 + #%] + +[%# INTERFACE: + # name: string; the name of the milestone + # + # product: string; the name of the product which the milestone + # belongs/belonged to + # + # no_XXX_link: boolean; if defined, then don't show the corresponding + # link. Supported parameters are: + # + # no_edit_milestone_link + # no_edit_other_milestones_link + # no_add_milestone_link + #%] + +

+ +

+ +[% UNLESS no_add_milestone_link %] + Add a milestone. +[% END %] + +[% IF name && !no_edit_milestone_link %] + Edit milestone + '[% name FILTER html %]'. +[% END %] + +[% UNLESS no_edit_other_milestones_link %] + Edit other milestones of product '[% product FILTER html %]'. + +[% END %] + + Edit product '[% product FILTER html %]'. + +

diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl new file mode 100644 index 000000000..160dcd6da --- /dev/null +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -0,0 +1,77 @@ +[%# 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: + # milestones: array of hashes having the following properties: + # - name: string; The name of the milestone. + # - sortkey: number; The sortkey used to order the milestone. + # + # product: string; the name of the product we are editing milestones for + #%] + +[% USE Bugzilla %] +[% cgi = Bugzilla.cgi %] + +[% PROCESS global/variables.none.tmpl %] + +[% title = BLOCK %]Select milestone of product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +[% edit_contentlink = BLOCK %]editmilestones.cgi?action=edit&product= + [%- product FILTER url_quote %]&milestone=%%name%%[% END %] +[% delete_contentlink = BLOCK %]editmilestones.cgi?action=del&product= + [%- product FILTER url_quote %]&milestone=%%name%%[% END %] + + +[% columns = [ + { + name => "name" + heading => "Edit milestone..." + contentlink => edit_contentlink + }, + { + name => "sortkey" + heading => "Sortkey" + }, + ] +%] + +[% columns.push({ + heading => "Action" + content => "Delete" + contentlink => delete_contentlink + }) %] + +[% PROCESS admin/table.html.tmpl + columns = columns + data = milestones +%] + +

+ +[% PROCESS admin/milestones/footer.html.tmpl + no_edit_other_milestones_link = 1 + %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl new file mode 100644 index 000000000..b1eee5ecf --- /dev/null +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -0,0 +1,60 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): 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 milestones for which product?" +%] + +[% bug_count_contentlink = BLOCK %]buglist.cgi?target_milestone=%%name%%&product= + [%- product FILTER url_quote %][% END %] + +[% columns = [ + { + name => "name" + heading => "Edit milestones of..." + contentlink => "editmilestones.cgi?product=%%name%%" + }, + { + name => "description" + heading => "Description" + allow_html_content => 1 + } + ] +%] + +[% PROCESS admin/table.html.tmpl + columns = columns + data = products +%] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/updated.html.tmpl b/template/en/default/admin/milestones/updated.html.tmpl new file mode 100644 index 000000000..bfc09e210 --- /dev/null +++ b/template/en/default/admin/milestones/updated.html.tmpl @@ -0,0 +1,58 @@ +[%# 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 milestone + # + # sortkey & updated_sortkey: the milestone sortkey + # + # product: string; the name of the product the milestone belongs to + #%] + +[% title = BLOCK %]Updating Milestone '[% name FILTER html %]' of Product + '[% product FILTER html %]'[% END %] +[% PROCESS global/header.html.tmpl + title = title +%] + +[% IF updated_name %] +

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

+[% END %] + +[% IF updated_sortkey %] +

Updated Milestone sortkey to: '[% sortkey FILTER html %]'.

+[% END %] + +[% UNLESS updated_sortkey || updated_name %] +

Nothing changed for milestone '[% name FILTER html %]'. +[% END %] + +

+ +[% PROCESS admin/milestones/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 9c8cd3b5b..8d03d1aae 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -30,7 +30,8 @@ # Values always used for numbers - [% (i|j|k|n|count) %] # Params - [% Param(... # Safe functions - [% (time2str|GetBugLink)... -# Safe vmethods - [% foo.size %] +# Safe vmethods - [% foo.size %] [% foo.length %] +# [% foo.push() %] # TT loop variables - [% loop.count %] # Already-filtered stuff - [% wibble FILTER html %] # where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml|none @@ -559,6 +560,14 @@ 'cgi.query_string' ], +'admin/milestones/confirm-delete.html.tmpl' => [ + 'bug_count' +], + +'admin/milestones/deleted.html.tmpl' => [ + 'deleted_bug_count' +], + '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 7638806cf..27e9ec863 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -181,6 +181,11 @@ Sorry, you aren't a member of the 'editcomponents' group, and so you aren't allowed to add, modify or delete components. + [% ELSIF error == "auth_cant_edit_milestones" %] + [% title = "Access Denied" %] + Sorry, you aren't a member of the 'editcomponents' group, and so + you aren't allowed to add, modify or delete milestones. + [% ELSIF error == "component_already_exists" %] [% title = "Component Already Exists" %] A component with the name '[% name FILTER html %]' already exists. @@ -553,6 +558,33 @@ [% title = "Login Name Required" %] You must enter a login name when using your login as a pronoun. + [% ELSIF error == "milestone_already_exists" %] + [% title = "Milestone Already Exists" %] + The milestone '[% name FILTER html %]' already exists for product ' + [%- product FILTER html %]'. + + [% ELSIF error == "milestone_blank_name" %] + [% title = "Blank Milestone Name Not Allowed" %] + You must enter a name for this milestone. + + [% ELSIF error == "milestone_name_too_long" %] + [% title = "Milestone Name Is Too Long" %] + The name of a milestone is limited to 20 characters. + '[% name FILTER html %]' is too long ([% name.length %] characters). + + [% ELSIF error == "milestone_no_action" %] + [% title = "No valid action specified" %] + No valid action was specified when trying to edit milestones. + + [% ELSIF error == "milestone_not_specified" %] + [% title = "No Milestone Specified" %] + No milestone specified when trying to edit milestones. + + [% ELSIF error == "milestone_not_valid" %] + [% title = "Specified Milestone Does Not Exist" %] + The milestone '[% milestone FILTER html %]' for product + '[% product FILTER html %]' does not exist. + [% ELSIF error == "milestone_required" %] [% title = "Milestone Required" %] You must determine a target milestone for [% terms.bug %] @@ -560,6 +592,11 @@ if you are going to accept it. Part of accepting [% terms.abug %] is giving an estimate of when it will be fixed. + [% ELSIF error == "milestone_sortkey_invalid" %] + [% title = "Invalid Milestone Sortkey" %] + The sortkey '[% sortkey FILTER html %]' for milestone ' + [% name FILTER html %]' is not a valid (positive) number. + [% ELSIF error == "misarranged_dates" %] [% title = "Misarranged Dates" %] Your start date ([% datefrom FILTER html %]) is after -- cgit v1.2.3-24-g4f1b