diff options
Diffstat (limited to 'template')
5 files changed, 366 insertions, 9 deletions
diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl new file mode 100644 index 000000000..85f89e6e8 --- /dev/null +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -0,0 +1,55 @@ +<!-- 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): Joel Peshkin <bugreport@peshkin.net> + # + #%] + + + +[% PROCESS global/header.html.tmpl title="Confirm Group Control Change for product \'$product\'" %] + +[% FOREACH group = mandatory_groups %] +<P> +group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which the group is +newly mandatory and will be added. +[% END %] + +[% FOREACH group = na_groups %] +<P> +group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which the group is no longer applicable and will be removed. +[% END %] +<form method="post" > + + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] + + <br> + Click "Continue" to proceed with the change including the changes + indicated above. If you do not want these changes, use "back" to + return to the previous page. + <p> + <input type="hidden" name="confirmed" value="confirmed"> + <input type="submit" value="Continue"> + </p> + +</form> + + +[% PROCESS global/footer.html.tmpl %] + + diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl new file mode 100644 index 000000000..11bb99de5 --- /dev/null +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -0,0 +1,284 @@ +<!-- 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): Joel Peshkin <bugreport@peshkin.net> + #%] + + +[% filt_product = product FILTER html %] +[% PROCESS global/header.html.tmpl + title = "Edit Group Controls for '$filt_product'" +%] + +<form method="post" action="editproducts.cgi"> + <input type="hidden" name="action" value="updategroupcontrols"> + <input type="hidden" name="product" value="[% filt_product %]"> + + <table id="form" cellspacing="0" cellpadding="4" border="1"> + <tr bgcolor="#6666ff"> + <th>Group</th> + <th>Entry</th> + <th>MemberControl</th> + <th>OtherControl</th> + <th>Canedit</th> + <th>Bugs</th> + </tr> + [% FOREACH group = groups %] + [% IF group.isactive == 0 AND group.bugcount > 0 %] + <tr bgcolor="#bbbbbb"> + <td> + [% group.name FILTER html %] + </td> + <td align="center" colspan=4> + Disabled + </td> + <td> + [% group.bugcount %] + </td> + <tr> + [% ELSIF group.isactive != 0 %] + <tr> + <td> + [% group.name FILTER html %] + </td> + <td> + <input type=checkbox value=1 name=entry_[% group.id %] + [% " checked=\"checked\"" IF group.entry %]> + </td> + <td> + <select name="membercontrol_[% group.id %]"> + <option value=[% const.CONTROLMAPNA %] + [% " selected=\"selected\"" + IF group.membercontrol == const.CONTROLMAPNA %] + >NA + </option> + <option value=[% const.CONTROLMAPSHOWN %] + [% " selected=\"selected\"" + IF group.membercontrol == const.CONTROLMAPSHOWN %] + >Shown + </option> + <option value=[% const.CONTROLMAPDEFAULT %] + [% " selected=\"selected\"" + IF group.membercontrol == const.CONTROLMAPDEFAULT %] + >Default + </option> + <option value=[% const.CONTROLMAPMANDATORY %] + [% " selected=\"selected\"" + IF group.membercontrol == const.CONTROLMAPMANDATORY %] + >Mandatory + </option> + </select> + </td> + <td> + <select name="othercontrol_[% group.id %]"> + <option value=[% const.CONTROLMAPNA %] + [% " selected=\"selected\"" + IF group.othercontrol == const.CONTROLMAPNA %] + >NA + </option> + <option value=[% const.CONTROLMAPSHOWN %] + [% " selected=\"selected\"" + IF group.othercontrol == const.CONTROLMAPSHOWN %] + >Shown + </option> + <option value=[% const.CONTROLMAPDEFAULT %] + [% " selected=\"selected\"" + IF group.othercontrol == const.CONTROLMAPDEFAULT %] + >Default + </option> + <option value=[% const.CONTROLMAPMANDATORY %] + [% " selected=\"selected\"" + IF group.othercontrol == const.CONTROLMAPMANDATORY %] + >Mandatory + </option> + </select> + </td> + <td> + <input type=checkbox value=1 name=canedit_[% group.id %] + [% " checked=\"checked\"" IF group.canedit %]> + </td> + <td> + [% group.bugcount %] + </td> + </tr> + [% END %] + [% END %] + + </table> + <br> + <input type=submit name="submit" value="submit"> + <br> +</form> + + +<p> +These settings control the relationship of the groups to this +product. +<p> +If any group has <b>Entry</b> selected, then this product will +restrict bug entry to only those users who are members of all the +groups with entry selected. +<p> +If any group has <b>Canedit</b> selected, then this product +will be read-only for any users who are not members of all of +the groups with Canedit selected. ONLY users who are members of +all the canedit groups will be able to edit. This is an additional +restriction that further restricts what can be edited by a user. +<p> +The <b>MemberControl</b> and <b>OtherControl</b> fields +indicate which bugs will be placed in +this group according to the following definitions. +<br> +<table border=1> + <tr> + <th> + MemberControl + </th> + <th> + OtherControl + </th> + <th> + Interpretation + </th> + </tr> + <tr> + <td> + NA + </td> + <td> + NA + </td> + <td> + Bugs in this product are never associated with this group. + </td> + </tr> + <tr> + <td> + Shown + </td> + <td> + NA + </td> + <td> + Bugs in this product are permitted to be restricted to this + group. Users who are a member of this group will be able + to place bugs in this group. + </td> + </tr> + <tr> + <td> + Shown + </td> + <td> + Shown + </td> + <td> + Bugs in this product can be placed in this group by anyone + with permission to edit the bug even if they are not a member + of this group. + </td> + </tr> + <tr> + <td> + Shown + </td> + <td> + Default + </td> + <td> + Bugs in this product can be placed in this group by anyone + with permission to edit the bug even if they are not a member + of this group. Non-members place bugs in this group by default. + </td> + </tr> + <tr> + <td> + Shown + </td> + <td> + Mandatory + </td> + <td> + Bugs in this product are permitted to be restricted to this + group. Users who are a member of this group will be able + to place bugs in this group. + Non-members will be forced to restrict bugs to this group + when they initially enter a bug in this product. + </td> + </tr> + <tr> + <td> + Default + </td> + <td> + NA + </td> + <td> + Bugs in this product are permitted to be restricted to this + group and are placed in this group by default. + Users who are a member of this group will be able + to place bugs in this group. + </td> + </tr> + <tr> + <td> + Default + </td> + <td> + Default + </td> + <td> + Bugs in this product are permitted to be restricted to this + group and are placed in this group by default. + Users who are a member of this group will be able + to place bugs in this group. Non-members will be able to + restrict bugs to this group on entry and will do so by default + </td> + </tr> + <tr> + <td> + Default + </td> + <td> + Mandatory + </td> + <td> + Bugs in this product are permitted to be restricted to this + group and are placed in this group by default. + Users who are a member of this group will be able + to place bugs in this group. Non-members will be forced + to place bugs in this group on entry. + </td> + </tr> + <tr> + <td> + Mandatory + </td> + <td> + Mandatory + </td> + <td> + Bugs in this product are required to be restricted to this + group. Users are not given any option. + </td> + </tr> +</table> + + +[% PROCESS global/footer.html.tmpl %] + diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 575c0ea07..4af65af1c 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -405,20 +405,28 @@ <br> [% IF groups.size > 0 %] - <br> - <b>Only users in all of the selected groups can view this bug:</b> - <br> - <font size="-1">(Unchecking all boxes makes this a public bug.)</font> - <br> - <br> [% FOREACH group = groups %] + [% IF NOT group.mandatory %] + [% IF NOT emitted_description %] + [% emitted_description = 1 %] + <br> + <b>Only users in all of the selected groups can view this bug:</b> + <br> + <font size="-1"> + (Unchecking all boxes makes this a more public bug.) + </font> + <br> + <br> + [% END %] + <input type="checkbox" name="bit-[% group.bit %]" value="1" [% " checked=\"checked\"" IF group.ison %] [% " disabled=\"disabled\"" IF NOT group.ingroup %]> [% group.description %] <br> + [% END %] [% END %] [% IF NOT user.inallgroups %] @@ -431,7 +439,7 @@ [% IF bug.inagroup %] <p> - <b>But users in the roles selected below can always view this bug:</b> + <b>Users in the roles selected below can always view this bug:</b> <br> <small> (The assignee diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl index 77a2ab762..bba85d637 100644 --- a/template/en/default/bug/process/verify-new-product.html.tmpl +++ b/template/en/default/bug/process/verify-new-product.html.tmpl @@ -81,14 +81,14 @@ <h3>Verify Bug Group</h3> <p> - Do you want to add the bug to its new product's group (if any)? + Do you want to add the bug to its new product's default groups (if any)? </p> <p> <input type="radio" name="addtonewgroup" value="no"><b>no</b><br> <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br> <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked"> - <b>yes, but only if the bug was in its old product's group</b><br> + <b>yes, but only if the bug was in any of its old product's default groups</b><br> </p> [% END %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index b3b50f68a..885cf24cd 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -230,6 +230,12 @@ It must also not contain any of these special characters: <tt>\ ( ) & < > , ; : " [ ]</tt>, or any whitespace. + [% ELSIF error == "illegal_group_control_combination" %] + [% title = "Your Group Control Combination Is Illegal" %] + Your group control combination for group " + [% groupname FILTER html %] + " is illegal. + [% ELSIF error == "illegal_is_obsolete" %] [% title = "Your Query Makes No Sense" %] The only legal values for the <em>Attachment is obsolete</em> field are @@ -462,6 +468,10 @@ [% title = "Access Denied" %] You do not have the permissions necessary to access that product. + [% ELSIF error == "product_edit_denied" %] + [% title = "Product Edit Access Denied" %] + You are not permitted to edit bugs in product [% product %]. + [% ELSIF error == "query_name_missing" %] [% title = "No Query Name Specified" %] You must enter a name for your query. |