diff options
Diffstat (limited to 'template/en/default')
9 files changed, 239 insertions, 8 deletions
diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl index 5ff826b86..76e2cc31f 100755 --- a/template/en/default/admin/keywords/confirm-delete.html.tmpl +++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl @@ -49,7 +49,6 @@ <input type="submit" value="Yes, really delete the keyword"> </form> -<p>Go back to the <a href="query.cgi">query page</a> -or <a href="editkeywords.cgi">edit other keywords</a>.</p> +<p><a href="editkeywords.cgi">Edit other keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl index 49698a1db..6811b9997 100755 --- a/template/en/default/admin/keywords/create.html.tmpl +++ b/template/en/default/admin/keywords/create.html.tmpl @@ -49,7 +49,6 @@ <input type="hidden" name="action" value="new"> </form> -<p>Go back to the <a href="query.cgi">query page</a> -or <a href="editkeywords.cgi">edit other keywords</a>.</p> +<p><a href="editkeywords.cgi">Edit other keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/created.html.tmpl b/template/en/default/admin/keywords/created.html.tmpl new file mode 100755 index 000000000..ebb6a1f9f --- /dev/null +++ b/template/en/default/admin/keywords/created.html.tmpl @@ -0,0 +1,36 @@ +<!-- 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): Terry Weissman <terry@mozilla.org> + # Vlad Dascalu <jocuri@softhome.net> + #%] + +[%# INTERFACE: + # name: string; the name of the current keyword. + #%] + +[% PROCESS global/header.html.tmpl + title = "Adding new keyword" +%] + +<p>The keyword [% name FILTER html %] has been added.</p> + +<p><a href="editkeywords.cgi">Edit existing keywords</a> or +<a href="editkeywords.cgi?action=add">add another keyword</a>.</p> + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl new file mode 100755 index 000000000..2f84e147a --- /dev/null +++ b/template/en/default/admin/keywords/edit.html.tmpl @@ -0,0 +1,68 @@ +<!-- 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): Terry Weissman <terry@mozilla.org> + # Vlad Dascalu <jocuri@softhome.net> + #%] + +[%# INTERFACE: + # keyword_id: number. The ID of the keyword. + # name: string. The name of the keyword. + # description: string. The description of the keyword. + # bug_count: number. The number of bugs with the keyword. + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Edit keyword" +%] + +<form method="post" action="editkeywords.cgi"> + <table border="0" cellpadding="4" cellspacing="0"> + <input type="hidden" name="id" value="[% keyword_id %]"> + <tr> + <th align="right">Name:</th> + <td><input size="64" maxlength="64" name="name" value="[% name FILTER html %]"></td> + </tr> + <tr> + <th align="right">Description:</th> + <td> + <textarea rows="4" cols="64" wrap="virtual" + name="description">[% description FILTER html %]</textarea> + </td> + </tr> + <tr> + <th align="right">[% terms.Bugs %]:</th> + <td> + [% IF bug_count %] + [% bug_count %] + [% ELSE %] + none + [% END %] + </td> + </tr> + </table> + + <input type="submit" value="Update"> + <input type="hidden" name="action" value="update"> +</form> + +<p><a href="editkeywords.cgi">Edit other keywords</a>.</p> + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl new file mode 100755 index 000000000..e1f6eefbd --- /dev/null +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -0,0 +1,95 @@ +<!-- 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): Terry Weissman <terry@mozilla.org> + # Vlad Dascalu <jocuri@softhome.net> + #%] + +[%# INTERFACE: + # max_table_size: number. Determines the maximum number of + # rows in each keywords table. + # keywords: array with keyword objects having the properties: + # - keyword_id: number. The ID of the keyword. + # - name: string. The name of the keyword. + # - description: string. The description of the keyword. + # - bug_count: number. The number of bugs with the keyword. + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Select keyword" +%] + +[% max_table_size = 50 %] + +[% BLOCK table_header %] + <table border="1" cellpadding="4" cellspacing="0"> + <tr bgcolor="#6666FF"> + <th align="left">Edit keyword ...</th> + <th align="left">Description</th> + <th align="left">[% terms.Bugs %]</th> + <th align="left">Action</th> + </tr> +[% END %] + +[% BLOCK table_footer %] + </table> +[% END %] + +[% FOREACH keyword = keywords %] + [% IF loop.count() % max_table_size == 1 %] + [% PROCESS table_header %] + [% END %] + + <tr> + <th valign="top"> + <a href="editkeywords.cgi?action=edit&id=[% keyword.id %]">[% keyword.name FILTER html %]</a> + </th> + <td valign="top"> + [% IF keyword.description %] + [% keyword.description FILTER html %] + [% ELSE %] + <font color="red">missing</font> + [% END %] + </td> + <td valign="top" align="right"> + [% IF keyword.bug_count %] + [% keyword.bug_count %] + [% ELSE %] + none + [% END %] + </td> + <th valign="top"> + <a href="editkeywords.cgi?action=delete&id=[% keyword.id %]">Delete</a> + </th> + </tr> + + [% IF !loop.last() && loop.count() % max_table_size == 0 %] + [% PROCESS table_footer %] + [% END %] +[% END %] + + <tr> + <td valign="top" colspan="3">Add a new keyword</td> + <td><a href="editkeywords.cgi?action=add">Add</td> + </tr> + +[% PROCESS table_footer %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/rebuild-cache.html.tmpl b/template/en/default/admin/keywords/rebuild-cache.html.tmpl index 4c4ea4b9a..bd68f9ed5 100755 --- a/template/en/default/admin/keywords/rebuild-cache.html.tmpl +++ b/template/en/default/admin/keywords/rebuild-cache.html.tmpl @@ -21,8 +21,8 @@ #%] [%# INTERFACE: - # action: string. Contains the current action (either "update" or "delete"). - # name: string. Contains the name of the current keyword. + # action: string; the current action (either "update" or "delete"). + # name: string; the name of the current keyword. #%] [% IF action == "update" %] @@ -50,7 +50,6 @@ Keyword [% name FILTER html %] [%+status FILTER html %]. keyword cache</a></b> </p> -<p>Go back to the <a href="query.cgi">query page</a> or -<a href="editkeywords.cgi">edit more keywords</a>.</p> +<p><a href="editkeywords.cgi">Edit more keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index c75f86bb3..05b52c5b8 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -492,6 +492,16 @@ 'const.CONTROLMAPMANDATORY', ], +'admin/keywords/list.html.tmpl' => [ + 'keyword.id', + 'keyword.bug_count', +], + +'admin/keywords/edit.html.tmpl' => [ + 'keyword_id', + 'bug_count', +], + 'admin/keywords/confirm-delete.html.tmpl' => [ 'keyword_id', 'bug_count', diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 82be89b1d..6f0881c20 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -171,6 +171,10 @@ [% ELSIF error == "invalid_field_name" %] Can't use [% field FILTER html %] as a field name. + + [% ELSIF error == "invalid_keyword_id" %] + The keyword ID <em>[% id FILTER html %]</em> couldn't be + found. [% ELSIF error == "missing_bug_id" %] No [% terms.bug %] ID was given. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 1bbd00efc..f20081529 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -387,6 +387,27 @@ [% ELSIF error == "invalid_username_or_password" %] [% title = "Invalid Username Or Password" %] The username or password you entered is not valid. + + [% ELSIF error == "keyword_access_denied" %] + [% title = "Access Denied" %] + Sorry, you aren't a member of the 'editkeywords' group, and so + you aren't allowed to add, modify or delete keywords. + + [% ELSIF error == "keyword_already_exists" %] + [% title = "Keyword Already Exists" %] + A keyword with the name [% name FILTER html %] already exists. + + [% ELSIF error == "keyword_blank_description" %] + [% title = "Blank Keyword Description Not Allowed" %] + You must enter a non-blank description for the keyword. + + [% ELSIF error == "keyword_blank_name" %] + [% title = "Blank Keyword Name Not Allowed" %] + You must enter a non-blank name for the keyword. + + [% ELSIF error == "keyword_invalid_name" %] + [% title = "Invalid Keyword Name" %] + You may not use commas or whitespace in a keyword name. [% ELSIF error == "login_needed_for_password_change" %] [% title = "Login Name Required" %] |