diff options
Diffstat (limited to 'template/en/default/admin/groups')
| -rw-r--r-- | template/en/default/admin/groups/confirm-remove.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/admin/groups/create.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/admin/groups/delete.html.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/admin/groups/edit.html.tmpl | 28 | ||||
| -rw-r--r-- | template/en/default/admin/groups/list.html.tmpl | 4 |
5 files changed, 34 insertions, 34 deletions
diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl index 54d961623..a3830702c 100644 --- a/template/en/default/admin/groups/confirm-remove.html.tmpl +++ b/template/en/default/admin/groups/confirm-remove.html.tmpl @@ -46,21 +46,21 @@ <p>This option will remove all explicitly defined users from '[% group.name FILTER html %].'</p> [% END %] - + <p>Generally, you will only need to do this when upgrading groups created with [% terms.Bugzilla %] versions 2.16 and earlier. Use this option with <b>extreme care</b> and consult the documentation for further information. </p> - + <form method="post" action="editgroups.cgi"> <input type="hidden" name="group_id" value="[% group.id FILTER html %]"> <input type="hidden" name="regexp" value="[% regexp FILTER html %]"> <input type="hidden" name="action" value="remove_regexp"> - + <input name="token" type="hidden" value="[% token FILTER html %]"> <input id="confirm" name="confirm" type="submit" value="Confirm"> <p>Or <a href="editgroups.cgi">return to the Edit Groups page</a>.</p> </form> - -[% PROCESS global/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index a6facbfe1..6b733538a 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -100,8 +100,8 @@ than deleting the group would be. <b>Note: If you are creating a group, you probably want it to be usable for [% terms.bugs %], in which case you should leave this checked.</b></p> -<p><b>User RegExp</b> is optional, and if filled in, will -automatically grant membership to this group to anyone with an +<p><b>User RegExp</b> is optional, and if filled in, will +automatically grant membership to this group to anyone with an email address that matches this regular expression.</p> <p> @@ -111,13 +111,13 @@ email address that matches this regular expression.</p> in comments in [% terms.bugs %] besides the name of the author of comments. </p> -<p>By default, the new group will be associated with existing -products. Unchecking the "Insert new group into all existing -products" option will prevent this and make the group become +<p>By default, the new group will be associated with existing +products. Unchecking the "Insert new group into all existing +products" option will prevent this and make the group become visible only when its controls have been added to a product.</p> <p>Back to the <a href="./">main [% terms.bugs %] page</a> or to the <a href="editgroups.cgi">group list</a>. -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index b93c84b25..794ca259c 100644 --- a/template/en/default/admin/groups/delete.html.tmpl +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -71,12 +71,12 @@ [% IF group.bugs.size %] <p><b>[% group.bugs.size FILTER html %] [%+ terms.bug %] reports are - visible only to this group. You cannot delete this group while any + visible only to this group. You cannot delete this group while any [%+ terms.bugs %] are using it.</b> <br><a href="buglist.cgi?field0-0-0=bug_group&type0-0-0=equals&value0-0-0= [%- group.name FILTER uri %]">Show me - which [% terms.bugs %]</a> - + which [% terms.bugs %]</a> - <label><input type="checkbox" name="removebugs">Remove all [% terms.bugs %] from this group restriction for me.</label></p> @@ -113,7 +113,7 @@ [% SET hidden = 0 %] [% IF data.controls.othercontrol == constants.CONTROLMAPMANDATORY AND data.controls.membercontrol == constants.CONTROLMAPMANDATORY - AND data.controls.entry + AND data.controls.entry %] [% SET hidden = 1 %] [% END %] @@ -133,14 +133,14 @@ <p><label><input type="checkbox" name="unbind">Delete this group anyway, and remove these controls.</label></p> [% END %] - + [% IF group.flag_types.size %] <p><b>This group restricts who can make changes to flags of certain types. You cannot delete this group while there are flag types using it.</b> <br><a href="editflagtypes.cgi?action=list&group= [%- group.id FILTER uri %]">Show - me which types</a> - + me which types</a> - <label><input type="checkbox" name="removeflags">Remove all flag types from this group for me.</label></p> [% END %] @@ -167,7 +167,7 @@ <h2>Confirmation</h2> <p>Do you really want to delete this group?</p> - [% IF group.users.size || group.bugs.size || group.products.size + [% IF group.users.size || group.bugs.size || group.products.size || group.flags.size %] <p><b>You must check all of the above boxes or correct the @@ -184,4 +184,4 @@ Go back to the <a href="editgroups.cgi">group list</a>. -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl index f0dce8c85..0f764c841 100644 --- a/template/en/default/admin/groups/edit.html.tmpl +++ b/template/en/default/admin/groups/edit.html.tmpl @@ -26,7 +26,7 @@ # group - A Bugzilla::Group representing the group being edited. # *_current - Arrays of Bugzilla::Group objects that show the current # values for this group, as far as grants. - # *_available - Arrays of Bugzilla::Group objects that show the current + # *_available - Arrays of Bugzilla::Group objects that show the current # available values for each grant. #%] @@ -58,7 +58,7 @@ <th>Group:</th> <td> [% IF group.is_bug_group %] - <input type="text" name="name" size="60" + <input type="text" name="name" size="60" value="[% group.name FILTER html %]"> [% ELSE %] [% group.name FILTER html %] @@ -70,7 +70,7 @@ <th>Description:</th> <td> [% IF group.is_bug_group %] - <input type="text" name="desc" size="70" + <input type="text" name="desc" size="70" value="[% group.description FILTER html %]"> [% ELSE %] [% group.description FILTER html %] @@ -81,7 +81,7 @@ <tr> <th>User Regexp:</th> <td> - <input type="text" name="regexp" size="40" + <input type="text" name="regexp" size="40" value="[% group.user_regexp FILTER html %]"> </td> </tr> @@ -126,7 +126,7 @@ <tr> <th>Use For [% terms.Bugs %]:</th> <td> - <input type="checkbox" name="isactive" + <input type="checkbox" name="isactive" value="1" [% 'checked="checked"' IF group.is_active %]> </td> </tr> @@ -139,10 +139,10 @@ <table class="grant_table"> <tr> <th class="one">Groups That Are a Member of This Group<br> - ("Users in <var>X</var> are automatically in + ("Users in <var>X</var> are automatically in [%+ group.name FILTER html %]")</th> <th>Groups That This Group Is a Member Of<br> - ("If you are in [% group.name FILTER html %], you are + ("If you are in [% group.name FILTER html %], you are automatically also in...")</th> </tr> <tr> @@ -151,7 +151,7 @@ items_available = members_available items_current = members_current %] </td> - + <td>[% PROCESS select_pair name = "member_of" size = 10 items_available = member_of_available items_current = member_of_current %]</td> @@ -162,7 +162,7 @@ <tr> <th class="one"> Groups That Can Grant Membership in This Group<br> - ("Users in <var>X</var> can add other users to + ("Users in <var>X</var> can add other users to [%+ group.name FILTER html %]") </th> @@ -212,11 +212,11 @@ <input type="submit" id="update-group" value="Update Group"> <input type="hidden" name="token" value="[% token FILTER html %]"> </form> - + <h4>Mass Remove</h4> <p>You can use this form to do mass-removal of users from groups. - This is often very useful if you upgraded from [% terms.Bugzilla %] + This is often very useful if you upgraded from [% terms.Bugzilla %] 2.16.</p> <table><tr><td> @@ -227,7 +227,7 @@ <input type="text" size="20" name="regexp"> <input type="submit" id="remove-membership" value="Remove Memberships"> - <p>If you leave the field blank, all explicit memberships in + <p>If you leave the field blank, all explicit memberships in this group will be removed.</p> <input type="hidden" name="action" value="confirm_remove"> @@ -235,10 +235,10 @@ </fieldset> </form> </td></tr></table> - + <p>Back to the <a href="editgroups.cgi">group list</a>.</p> -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] [% BLOCK select_pair %] <table class="select_pair"> diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index 1d137dc5f..e3e96ee87 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -86,7 +86,7 @@ content => " " } } - } + } %] [% FOREACH group IN ["chartgroup", "insidergroup", "timetrackinggroup", "querysharegroup"] %] @@ -120,7 +120,7 @@ content => "user" } } -%] +%] [% PROCESS admin/table.html.tmpl columns = columns |