diff options
Diffstat (limited to 'template/en/default/admin')
63 files changed, 248 insertions, 232 deletions
diff --git a/template/en/default/admin/classifications/add.html.tmpl b/template/en/default/admin/classifications/add.html.tmpl index 1a6941f67..90b15d539 100644 --- a/template/en/default/admin/classifications/add.html.tmpl +++ b/template/en/default/admin/classifications/add.html.tmpl @@ -34,6 +34,6 @@ <input type="hidden" name="token" value="[% token FILTER html %]"> </FORM> -[% PROCESS admin/classifications/footer.html.tmpl %] +[% PROCESS admin/classifications/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index 5a3800f7a..ffd7d2f02 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -58,6 +58,6 @@ <input type="hidden" name="token" value="[% token FILTER html %]"> </form> -[% PROCESS admin/classifications/footer.html.tmpl %] +[% PROCESS admin/classifications/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/edit-common.html.tmpl b/template/en/default/admin/classifications/edit-common.html.tmpl index e0db0089f..b839c9384 100644 --- a/template/en/default/admin/classifications/edit-common.html.tmpl +++ b/template/en/default/admin/classifications/edit-common.html.tmpl @@ -24,7 +24,7 @@ <tr> <th align="right">Classification:</th> - <td><input size=64 maxlength=64 name="classification" + <td><input size=64 maxlength=64 name="classification" value="[% classification.name FILTER html %]"></td> </tr> <tr> diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index 17d04de67..138ecd50b 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -55,13 +55,13 @@ </tr> </table> - <input type=hidden name="classificationold" + <input type=hidden name="classificationold" value="[% classification.name FILTER html %]"> <input type=hidden name="action" value="update"> <input type="hidden" name="token" value="[% token FILTER html %]"> <input type=submit value="Update"> </form> -[% PROCESS admin/classifications/footer.html.tmpl %] +[% PROCESS admin/classifications/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index bc78cbb6e..af29be324 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -34,7 +34,7 @@ [% FOREACH cl = classifications %] <tr> <td valign="top"><a href="editclassifications.cgi?action=edit&classification=[% cl.name FILTER uri %]"><b>[% cl.name FILTER html %]</b></a></td> - <td valign="top"> + <td valign="top"> [% IF cl.description %] [% cl.description FILTER html_light %] [% ELSE %] @@ -63,4 +63,4 @@ </tr> </table> -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index a3dae68bb..60b08b430 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -49,7 +49,7 @@ from '[% product.name FILTER html %]' product <tr> <td valign="top">Default assignee:</td> <td valign="top">[% comp.default_assignee.login FILTER html %]</td> - + [% IF Param('useqacontact') %] </tr> <tr> @@ -103,23 +103,23 @@ from '[% product.name FILTER html %]' product </table> <h2>Confirmation</h2> - + [% IF comp.bug_count %] [% IF !Param("allowbugdeletion") %] <p> Sorry, there - [% IF comp.bug_count > 1 %] - are [% comp.bug_count %] [%+ terms.bugs %] + [% IF comp.bug_count > 1 %] + are [% comp.bug_count %] [%+ terms.bugs %] [% ELSE %] - is [% comp.bug_count %] [%+ terms.bug %] + is [% comp.bug_count %] [%+ terms.bug %] [% END %] - outstanding for this component. You must reassign + outstanding for this component. You must reassign [% IF comp.bug_count > 1 %] - those [% terms.bugs %] + those [% terms.bugs %] [% ELSE %] that [% terms.bug %] [% END %] @@ -130,8 +130,8 @@ from '[% product.name FILTER html %]' product <table border="0" cellpadding="20" width="70%" bgcolor="red"><tr><td> - There [% IF comp.bug_count > 1 %] - are [% comp.bug_count %] [%+ terms.bugs %] + There [% IF comp.bug_count > 1 %] + are [% comp.bug_count %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] [% END %] @@ -147,7 +147,7 @@ from '[% product.name FILTER html %]' product [% IF comp.bug_count == 0 || Param('allowbugdeletion') %] <p>Do you really want to delete this component?</p> - + <form method="post" action="editcomponents.cgi"> <input type="submit" id="delete" value="Yes, delete"> <input type="hidden" name="action" value="delete"> @@ -160,4 +160,4 @@ from '[% product.name FILTER html %]' product [% PROCESS admin/components/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl index b6b79f8b6..13b2c8e41 100644 --- a/template/en/default/admin/components/create.html.tmpl +++ b/template/en/default/admin/components/create.html.tmpl @@ -23,7 +23,7 @@ # product: object; Bugzilla::Product object representing the product to # which the component belongs. #%] - + [% title = BLOCK %]Add component to the [% product.name FILTER html %] product[% END %] [% PROCESS global/header.html.tmpl javascript_urls = [ "js/field.js" ] @@ -35,7 +35,7 @@ <table border="0" cellpadding="4" cellspacing="0"> [% PROCESS "admin/components/edit-common.html.tmpl" %] - + </table> <hr> <input type="submit" id="create" value="Add"> diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index e1083e7e8..ecfb3e299 100644 --- a/template/en/default/admin/components/edit.html.tmpl +++ b/template/en/default/admin/components/edit.html.tmpl @@ -44,7 +44,7 @@ <tr> <th class="field_label"><label for="isactive">Enabled For [% terms.Bugs %]:</label></th> - <td><input id="isactive" name="isactive" type="checkbox" value="1" + <td><input id="isactive" name="isactive" type="checkbox" value="1" [% 'checked="checked"' IF comp.isactive %]></td> </tr> <tr> @@ -67,7 +67,7 @@ <input type="hidden" name="componentold" value="[% comp.name FILTER html %]"> <input type="hidden" name="product" value="[% product.name FILTER html %]"> <input type="hidden" name="token" value="[% token FILTER html %]"> - <input type="submit" value="Save Changes" id="update"> or <a + <input type="submit" value="Save Changes" id="update"> or <a href="editcomponents.cgi?action=del&product= [%- product.name FILTER uri %]&component= [%- comp.name FILTER uri %]">Delete</a> this component. diff --git a/template/en/default/admin/components/footer.html.tmpl b/template/en/default/admin/components/footer.html.tmpl index ec1869b29..aa3509bb7 100644 --- a/template/en/default/admin/components/footer.html.tmpl +++ b/template/en/default/admin/components/footer.html.tmpl @@ -19,7 +19,7 @@ #%] [%# INTERFACE: - # comp: object; Bugzilla::Component object representing the component + # comp: object; Bugzilla::Component object representing the component # product: object; Bugzilla::Product object representing the product to # which the component belongs. #%] @@ -27,26 +27,26 @@ <hr> <p> -Edit +Edit [% IF comp && !no_edit_component_link %] - component <a + component <a title="Edit Component '[% comp.name FILTER html %]'" href="editcomponents.cgi?action=edit&product= [%- product.name FILTER uri %]&component=[% comp.name FILTER uri %]"> - '[% comp.name FILTER html %]'</a> + '[% comp.name FILTER html %]'</a> or edit [% END %] [% IF !no_edit_other_components_link %] -other components of product <a +other components of product <a title="Choose a component from product '[% product.name FILTER html %]' to edit" href="editcomponents.cgi?product= - [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>, - or edit + [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>, + or edit [% END %] -product <a +product <a title="Edit Product '[% product.name FILTER html %]'" href="editproducts.cgi?action=edit&product= [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>. diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index b45b97565..7a333d33d 100644 --- a/template/en/default/admin/components/list.html.tmpl +++ b/template/en/default/admin/components/list.html.tmpl @@ -42,17 +42,17 @@ [% columns = [ - { + { name => "name" heading => "Edit component..." contentlink => edit_contentlink }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 }, - { + { name => "initialowner" heading => "Default Assignee" }, diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 0910f9802..7defbd065 100644 --- a/template/en/default/admin/components/select-product.html.tmpl +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -32,14 +32,14 @@ %] [% columns = [ - { + { name => "name" heading => "Edit components of..." - contentlink => "editcomponents.cgi?product=%%name%%" + contentlink => "editcomponents.cgi?product=%%name%%" }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 } ] diff --git a/template/en/default/admin/custom_fields/cf-js.js.tmpl b/template/en/default/admin/custom_fields/cf-js.js.tmpl index cc1a4e4aa..e7c669af1 100644 --- a/template/en/default/admin/custom_fields/cf-js.js.tmpl +++ b/template/en/default/admin/custom_fields/cf-js.js.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is NASA. - # Portions created by NASA are Copyright (C) 2008 + # Portions created by NASA are Copyright (C) 2008 # San Jose State University Foundation. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org> diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl index 2b3f0eadb..79a9603a3 100644 --- a/template/en/default/admin/custom_fields/create.html.tmpl +++ b/template/en/default/admin/custom_fields/create.html.tmpl @@ -110,7 +110,7 @@ YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('ty <input type="text" id="reverse_desc" name="reverse_desc" value="" size="40" disabled="disabled"> <br> Use this label for the list of [% terms.bugs %] that link to - [%+ terms.abug %] with this + [%+ terms.abug %] with this [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field. For example, if the description is "Is a duplicate of", the reverse description would be "Duplicates of this [% terms.bug %]". diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl index ab6eeec0c..147d6ee93 100644 --- a/template/en/default/admin/custom_fields/edit.html.tmpl +++ b/template/en/default/admin/custom_fields/edit.html.tmpl @@ -92,7 +92,7 @@ value="[% field.reverse_desc FILTER html %]"> <br> Use this label for the list of [% terms.bugs %] that link to - [%+ terms.abug %] with this + [%+ terms.abug %] with this [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field. For example, if the description is "Is a duplicate of", the reverse description would be "Duplicates of this [% terms.bug %]". @@ -111,7 +111,7 @@ [% FOREACH sel_field = Bugzilla.fields({ is_select => 1 }) %] [% NEXT IF sel_field.id == field.id %] <option value="[% sel_field.id FILTER html %]" - [% ' selected="selected"' + [% ' selected="selected"' IF sel_field.id == field.visibility_field.id %]> [% sel_field.description FILTER html %] ([% sel_field.name FILTER html %]) @@ -121,7 +121,7 @@ <label for="visibility_values"> <strong>is set to any of:</strong> </label> - <select multiple="multiple" size="5" name="visibility_values" + <select multiple="multiple" size="5" name="visibility_values" id="visibility_values" class="field_value"> [% FOREACH value = field.visibility_field.legal_values %] <option value="[% value.id FILTER html %]" @@ -131,7 +131,7 @@ [% END %] [%+ display_value(field.visibility_field.name, value.name) FILTER html %] </option> - [% END %] + [% END %] </select> </td> </tr> @@ -156,7 +156,7 @@ [% FOREACH sel_field = Bugzilla.fields({ is_select => 1 }) %] [% NEXT IF sel_field.id == field.id %] <option value="[% sel_field.id FILTER html %]" - [% ' selected="selected"' + [% ' selected="selected"' IF sel_field.id == field.value_field.id %]> [% sel_field.description FILTER html %] ([% sel_field.name FILTER html %]) diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl index 689aa0591..d4d12b0ed 100644 --- a/template/en/default/admin/custom_fields/list.html.tmpl +++ b/template/en/default/admin/custom_fields/list.html.tmpl @@ -91,7 +91,7 @@ contentlink => delete_contentlink } } -%] +%] [% PROCESS admin/table.html.tmpl columns = columns diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl index 088154120..8abc7e148 100644 --- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl +++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl @@ -20,7 +20,7 @@ #%] [% title = BLOCK %] - Delete Value '[% value.name FILTER html %]' from the + Delete Value '[% value.name FILTER html %]' from the '[% field.description FILTER html %]' ([% field.name FILTER html %]) field [% END %] @@ -63,11 +63,11 @@ [% IF value.is_default || value.bug_count || (value_count == 1) || value.controls_visibility_of_fields.size - || value.controlled_values_array.size + || value.controlled_values_array.size %] <p>Sorry, but the '[% value.name FILTER html %]' value cannot be deleted - from the '[% field.description FILTER html %]' field for the following + from the '[% field.description FILTER html %]' field for the following reason(s):</p> <ul class="warningmessages"> @@ -85,7 +85,7 @@ [% IF value.bug_count %] <li> [% IF value.bug_count > 1 %] - There are [% value.bug_count FILTER html %] [%+ terms.bugs %] + There are [% value.bug_count FILTER html %] [%+ terms.bugs %] with this field value. [% ELSE %] There is 1 [% terms.bug %] with this field value. @@ -97,7 +97,7 @@ href="buglist.cgi?[% field.name FILTER uri %]= [%- value.name FILTER uri %]"> [% IF value.bug_count > 1 %] - those [% terms.bugs %] + those [% terms.bugs %] [% ELSE %] that [% terms.bug %] [% END %] @@ -117,7 +117,7 @@ [% FOREACH field = value.controls_visibility_of_fields %] <a href="editfields.cgi?action=edit&name= [%- field.name FILTER uri %]"> - [%- field.description FILTER html %] + [%- field.description FILTER html %] ([% field.name FILTER html %])</a><br> [% END %] </li> @@ -158,4 +158,4 @@ no_edit_link = 1 +%] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl index 019831489..c96111f22 100644 --- a/template/en/default/admin/fieldvalues/create.html.tmpl +++ b/template/en/default/admin/fieldvalues/create.html.tmpl @@ -17,7 +17,7 @@ [%# INTERFACE: # field: object; the field the value is being created for #%] - + [% title = BLOCK %] Add Value for the '[% field.description FILTER html %]' ([% field.name FILTER html %]) field [% END %] @@ -26,7 +26,7 @@ %] <p> - This page allows you to add a new value for the + This page allows you to add a new value for the '[% field.description FILTER html %]' field. </p> @@ -47,7 +47,7 @@ <tr> <th align="right"><label for="is_open">Status Type:</label></th> <td> - <input type="radio" id="open_status" name="is_open" value="1" + <input type="radio" id="open_status" name="is_open" value="1" checked="checked"> <label for="open_status">Open</label><br> <input type="radio" id="closed_status" name="is_open" value="0"> @@ -65,7 +65,7 @@ [% IF field.value_field %] <tr> <th align="right"> - <label for="visibility_value_id">Only appears when + <label for="visibility_value_id">Only appears when [%+ field.value_field.description FILTER html %] is set to: </label> </th> diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl index 9c42ce639..8d20e1e41 100644 --- a/template/en/default/admin/fieldvalues/edit.html.tmpl +++ b/template/en/default/admin/fieldvalues/edit.html.tmpl @@ -21,7 +21,7 @@ [% PROCESS global/variables.none.tmpl %] [% title = BLOCK %] - Edit Value '[% value.name FILTER html %]' for the + Edit Value '[% value.name FILTER html %]' for the '[% field.description FILTER html %]' ([% field.name FILTER html %]) field [% END %] [% PROCESS global/header.html.tmpl @@ -49,7 +49,7 @@ </tr> <tr> <th align="right"><label for="sortkey">Sortkey:</label></th> - <td><input id="sortkey" size="6" maxlength="6" name="sortkey" + <td><input id="sortkey" size="6" maxlength="6" name="sortkey" value="[%- value.sortkey FILTER html %]"></td> </tr> [% IF field.name == "bug_status" %] @@ -71,7 +71,7 @@ [% FOREACH field_value = field.value_field.legal_values %] [% NEXT IF field_value.name == '' %] <option value="[% field_value.id FILTER none %]" - [% ' selected="selected"' + [% ' selected="selected"' IF field_value.id == value.visibility_value.id %]> [% IF field.value_field.name == 'component' %] [% field_value.product.name FILTER html %]: @@ -86,7 +86,7 @@ [% END %] <tr> <th align="right"><label for="is_active">Enabled for [% terms.bugs %]:</label></th> - <td><input id="is_active" name="is_active" type="checkbox" value="1" + <td><input id="is_active" name="is_active" type="checkbox" value="1" [%+ 'checked="checked"' IF value.is_active %] [%+ 'disabled="disabled"' IF value.is_default OR value.is_static %]> [% IF value.is_default %] diff --git a/template/en/default/admin/fieldvalues/footer.html.tmpl b/template/en/default/admin/fieldvalues/footer.html.tmpl index 7d4a41d47..1b94b5c0e 100644 --- a/template/en/default/admin/fieldvalues/footer.html.tmpl +++ b/template/en/default/admin/fieldvalues/footer.html.tmpl @@ -36,7 +36,7 @@ [% END %] [% IF value.defined && !no_edit_link %] - Edit value <a + Edit value <a title="Edit value '[% value.name FILTER html %]' for the ' [%- field.name FILTER html %]' field" href="editvalues.cgi?action=edit&field= @@ -46,7 +46,7 @@ [% END %] [% UNLESS no_edit_other_link %] - Edit other values for the <a + Edit other values for the <a href="editvalues.cgi?field= [%- field.name FILTER uri %]">'[% field.description FILTER html %]'</a> field. diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl index 2b6aedb6f..d84f9a59d 100644 --- a/template/en/default/admin/fieldvalues/list.html.tmpl +++ b/template/en/default/admin/fieldvalues/list.html.tmpl @@ -16,7 +16,7 @@ [%# INTERFACE: # values: array of hashes having the following properties: # - name: string; The value. - # - sortkey: number; The sortkey used to order the value when + # - sortkey: number; The sortkey used to order the value when # displayed to the user in a list. # # field: object; the field we are editing values for. @@ -41,12 +41,12 @@ [% columns = [ - { + { name => "name" heading => "Edit field value..." contentlink => edit_contentlink }, - { + { name => "sortkey" heading => "Sortkey" }, diff --git a/template/en/default/admin/fieldvalues/select-field.html.tmpl b/template/en/default/admin/fieldvalues/select-field.html.tmpl index 3704d42aa..33f6f656b 100644 --- a/template/en/default/admin/fieldvalues/select-field.html.tmpl +++ b/template/en/default/admin/fieldvalues/select-field.html.tmpl @@ -16,7 +16,7 @@ [%# INTERFACE: # fields: Array of hashes. Each hash contains only one key, "name." - # The names are the same as the keys from field_descs + # The names are the same as the keys from field_descs # (see global/field-descs.html.tmpl). #%] @@ -30,7 +30,7 @@ %] [% columns = [ - { + { name => "name" heading => "Edit field values for..." content_use_field = 1 diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 69dc05bd3..b3cdf52e8 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -120,7 +120,7 @@ <option value="[% comp FILTER html %]">[% comp FILTER html %]</option> [% END %] </select><br> - <input type="submit" id="categoryAction-include" + <input type="submit" id="categoryAction-include" name="categoryAction-include" value="Include"> <input type="submit" id="categoryAction-exclude" name="categoryAction-exclude" value="Exclude"> @@ -128,13 +128,13 @@ <td style="vertical-align: top;"> <b>Inclusions:</b><br> [% PROCESS category_select name="inclusion_to_remove" categories = inclusions %]<br> - <input type="submit" id="categoryAction-removeInclusion" + <input type="submit" id="categoryAction-removeInclusion" name="categoryAction-removeInclusion" value="Remove Inclusion"> </td> <td style="vertical-align: top;"> <b>Exclusions:</b><br> [% PROCESS category_select name="exclusion_to_remove" categories = exclusions %]<br> - <input type="submit" id="categoryAction-removeExclusion" + <input type="submit" id="categoryAction-removeExclusion" name="categoryAction-removeExclusion" value="Remove Exclusion"> </td> </tr> 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 diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl index 20a6deee7..7fd93439a 100644 --- a/template/en/default/admin/keywords/confirm-delete.html.tmpl +++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl @@ -35,7 +35,7 @@ There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %] with this keyword set. [% END %] - + Are you <b>sure</b> you want to delete the <code>[% keyword.name FILTER html %]</code> keyword? </p> @@ -50,4 +50,4 @@ <p><a href="editkeywords.cgi">Edit other keywords</a>.</p> -[% PROCESS global/footer.html.tmpl %] +[% 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 e5d6aa0df..02bf84218 100644 --- a/template/en/default/admin/keywords/create.html.tmpl +++ b/template/en/default/admin/keywords/create.html.tmpl @@ -22,7 +22,7 @@ [%# INTERFACE: # none #%] - + [% PROCESS global/header.html.tmpl title = "Add keyword" subheader = "This page allows you to add a new keyword." diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl index 068e8e254..1d47610df 100644 --- a/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -63,20 +63,20 @@ </table> <h2>Confirmation</h2> - + [% IF milestone.bug_count %] <table border="0" cellpadding="20" width="70%" bgcolor="red"> <tr><td> There - [% IF milestone.bug_count > 1 %] - are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] + [% IF milestone.bug_count > 1 %] + are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] [% END %] entered for this milestone! When you delete this milestone, <b><blink>ALL</blink></b> of these [% terms.bugs %] will be retargeted - to [% product.default_milestone FILTER html %], the default milestone for + to [% product.default_milestone FILTER html %], the default milestone for the [% product.name FILTER html %] product. </td></tr> </table> @@ -95,4 +95,4 @@ [% PROCESS admin/milestones/footer.html.tmpl %] -[% PROCESS global/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 index d7c2f580f..740ef2e67 100644 --- a/template/en/default/admin/milestones/create.html.tmpl +++ b/template/en/default/admin/milestones/create.html.tmpl @@ -22,7 +22,7 @@ # product: object; Bugzilla::Product object representing the product to # which the milestone belongs. #%] - + [% title = BLOCK %]Add Milestone to Product '[% product.name FILTER html %]'[% END %] [% subheader = BLOCK %]This page allows you to add a new milestone to product '[% product.name FILTER html %]'.[% END %] diff --git a/template/en/default/admin/milestones/footer.html.tmpl b/template/en/default/admin/milestones/footer.html.tmpl index 1cae69e17..f35283d6f 100644 --- a/template/en/default/admin/milestones/footer.html.tmpl +++ b/template/en/default/admin/milestones/footer.html.tmpl @@ -40,11 +40,11 @@ [% UNLESS no_add_milestone_link %] <a title="Add a milestone to product '[% product.name FILTER html %]'" href="editmilestones.cgi?action=add&product= - [%- product.name FILTER uri %]">Add</a> a milestone. + [%- product.name FILTER uri %]">Add</a> a milestone. [% END %] [% IF milestone.name && !no_edit_milestone_link %] - Edit milestone <a + Edit milestone <a title="Edit Milestone '[% milestone.name FILTER html %]' of product ' [%- product.name FILTER html %]'" href="editmilestones.cgi?action=edit&product= @@ -54,13 +54,13 @@ [% END %] [% UNLESS no_edit_other_milestones_link %] - Edit other milestones of product <a + Edit other milestones of product <a href="editmilestones.cgi?product= [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>. [% END %] - Edit product <a + Edit product <a href="editproducts.cgi?action=edit&product= [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>. diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 6392f567f..4a79b9c31 100644 --- a/template/en/default/admin/milestones/list.html.tmpl +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -45,12 +45,12 @@ [% columns = [ - { + { name => "name" heading => "Edit milestone..." contentlink => edit_contentlink }, - { + { name => "sortkey" heading => "Sortkey" }, @@ -88,8 +88,8 @@ content => "(Default milestone)" override_contentlink => 1 contentlink => undef - } -%] + } +%] [% Hook.process('before_table') %] diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index 587db6d65..ab052377b 100644 --- a/template/en/default/admin/milestones/select-product.html.tmpl +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -32,14 +32,14 @@ %] [% columns = [ - { + { name => "name" heading => "Edit milestones of..." - contentlink => "editmilestones.cgi?product=%%name%%" + contentlink => "editmilestones.cgi?product=%%name%%" }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 } ] diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl index 15d4f1e29..324603125 100644 --- a/template/en/default/admin/params/bugchange.html.tmpl +++ b/template/en/default/admin/params/bugchange.html.tmpl @@ -41,7 +41,7 @@ "If off, then all $terms.bugs initially have the default " _ "milestone for the product being filed in.", - musthavemilestoneonaccept => + musthavemilestoneonaccept => "If you are using ${field_descs.target_milestone}, do you want to require" _ " that the milestone be set in order for a user to set" _ " ${terms.abug}'s status to ${accept_status}?", diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl index a0d9664ad..9c09610e1 100644 --- a/template/en/default/admin/params/bugfields.html.tmpl +++ b/template/en/default/admin/params/bugfields.html.tmpl @@ -37,7 +37,7 @@ usebugaliases => "Do you wish to use $terms.bug aliases, which allow you to assign " _ "$terms.bugs an easy-to-remember name by which you can refer to them?", - use_see_also => + use_see_also => "Do you wish to use the See Also field? It allows you refer to" _ " $terms.bugs in other installations. Even if you disable this field," _ " $terms.bug relationships (URLs) already set on $terms.bugs will" diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl index cd135e1d2..e7b480c69 100644 --- a/template/en/default/admin/params/common.html.tmpl +++ b/template/en/default/admin/params/common.html.tmpl @@ -138,7 +138,7 @@ <font color="red"> <blink>Unknown param type [% param.type FILTER html %]!!!</blink> </font> - [% END %] + [% END %] </p> [% UNLESS param.no_reset %] <p> diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index 05e8f09a2..248d818a9 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -49,16 +49,12 @@ _ " afterward.</p>", announcehtml => - "If this field is non-empty, then $terms.Bugzilla will" - _ " display whatever is in this field at the top of every" - _ " HTML page. The HTML you put in this field is not wrapped or" - _ " enclosed in anything. You might want to wrap it inside a" - _ "<tt><div></tt>. Give the div <em>id=\"message\"</em> to get" - _ " green text inside a red box, or <em>class=\"bz_private\"</em> for" - _ " dark red on a red background. Anything defined in " - _ " <tt>skins/standard/global.css</tt>" - _ " will work. To get centered text, use <em>style=\"text-align: " - _ " center;\"</em>.", + "If this field is non-empty, then $terms.Bugzilla will display whatever is" + _ " in this field at the top of every HTML page. The HTML you put in this" + _ " field is not wrapped or enclosed in anything. You might want to wrap it" + _ " inside a <code><p></code> tag. Give it" + _ " <code>class=\"warning\"</code> to make the text red. Anything defined" + _ " in <code>skins/standard/global.css</code> will work.", upgrade_notification => "$terms.Bugzilla can inform you when a new release is available." diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl index 041af6833..1fca6488c 100644 --- a/template/en/default/admin/params/groupsecurity.html.tmpl +++ b/template/en/default/admin/params/groupsecurity.html.tmpl @@ -50,13 +50,13 @@ usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _ "specific groups?", - + strict_isolation => "Don't allow users to be assigned to, " _ "be qa-contacts on, " _ "be added to CC list, " _ "or make or remove dependencies " _ "involving any bug that is in a product on which that " _ - "user is forbidden to edit.", + "user is forbidden to edit.", } %] diff --git a/template/en/default/admin/params/index.html.tmpl b/template/en/default/admin/params/index.html.tmpl index de6a56f2e..3ded64710 100644 --- a/template/en/default/admin/params/index.html.tmpl +++ b/template/en/default/admin/params/index.html.tmpl @@ -37,7 +37,7 @@ <a href="editparams.cgi?section= [%- panel.name FILTER uri %]#[% param.name FILTER uri %]_desc"> [% param.name FILTER html %]</a> - </td> + </td> <td> [% panel.title FILTER html %] </td> diff --git a/template/en/default/admin/params/reports.html.tmpl b/template/en/default/admin/params/reports.html.tmpl new file mode 100644 index 000000000..79b6af35d --- /dev/null +++ b/template/en/default/admin/params/reports.html.tmpl @@ -0,0 +1,20 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] +[% + title = "Reports" + desc = "Configure reporting parameters" +%] + +[% param_descs = { + report_secbugs_active => "Enable or disable the security $terms.bugs report feature." + report_secbugs_emails => + "Comma delimited list of the email addresses that the security $terms.bugs report will be sent to.", + report_secbugs_products => + "JSON array of the products the security $terms.bugs report will report on. e.g [\"Prod1\", \"Prod2\"]", + } +%] diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl index d574edca7..8eaf53889 100644 --- a/template/en/default/admin/params/usermatch.html.tmpl +++ b/template/en/default/admin/params/usermatch.html.tmpl @@ -30,7 +30,7 @@ "sites where there are a large number of users.", ajax_user_autocompletion => "If this option is set, typing characters in a certain user " _ - "fields will display a list of matches that can be selected from.", + "fields will display a list of matches that can be selected from.", maxusermatches => "Search for no more than this many matches.<br> " _ "If set to '1', no users will be displayed on ambiguous matches. " _ diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index aa728df75..1bd04a5e1 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -18,7 +18,7 @@ # # (classification fields available if Param('useclassification') is enabled:) # - # classification: Bugzilla::Classification object; The classification + # classification: Bugzilla::Classification object; The classification # the product is in # #%] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index d2167c64b..e7046dbe8 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -15,7 +15,7 @@ [%# INTERFACE: # classification: Bugzilla::Classification object; If classifications - # are enabled, then this is + # are enabled, then this is # the currently selected classification # #%] @@ -43,7 +43,7 @@ <tr> <th align="right">Version:</th> - <td><input size="64" maxlength="255" name="version" + <td><input size="64" maxlength="255" name="version" value="[% version FILTER html %]"> </td> </tr> @@ -63,7 +63,7 @@ </form> [% PROCESS "admin/products/footer.html.tmpl" - no_add_product_link = 1 + no_add_product_link = 1 no_edit_product_link = 1 %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index 4812707cd..2bb0c8920 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -29,10 +29,10 @@ <td><b>[% classification.name FILTER html %]</b></td> </tr> [% END %] - + <tr> <th align="right">Product:</th> - <td><input size="64" maxlength="64" name="product" + <td><input size="64" maxlength="64" name="product" value="[% product.name FILTER html %]"> </td> </tr> @@ -62,7 +62,7 @@ </td> </tr> [% END %] - + <tr> <th align="right">Open for [% terms.bug %] entry:</th> <td><input type="checkbox" name="is_active" value="1" diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index 3bd78a958..ad928b716 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -20,7 +20,7 @@ # # (classification fields available if Param('useclassification') is enabled:) # - # classification: Bugzilla::Classification object; The classification + # classification: Bugzilla::Classification object; The classification # the product is in #%] @@ -134,16 +134,16 @@ versions:</a> [% product.bug_count FILTER html %]</a></td> </tr> </table> - - <input type="hidden" name="product_old_name" + + <input type="hidden" name="product_old_name" value="[% product.name FILTER html %]"> <input type="hidden" name="action" value="update"> <input type="hidden" name="token" value="[% token FILTER html %]"> <input type="submit" id="update-product" value="Save Changes"> </form> - + [% PROCESS "admin/products/footer.html.tmpl" - no_add_product_link = 1 + no_add_product_link = 1 no_edit_product_link = 1 %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/footer.html.tmpl b/template/en/default/admin/products/footer.html.tmpl index 78e1864a7..542a526df 100644 --- a/template/en/default/admin/products/footer.html.tmpl +++ b/template/en/default/admin/products/footer.html.tmpl @@ -17,7 +17,7 @@ # product: Bugzilla::Product Object; the product # # classification: Bugzilla::Classification object ; If classifications - # are enabled, then this is the currently + # are enabled, then this is the currently # selected classification # # no_XXX_link: boolean; if defined, then don't show the corresponding @@ -35,7 +35,7 @@ [% classification_url_part_start = BLOCK %]classification= [%- classification.name FILTER uri %] [% END %] - [% classification_text = BLOCK %] + [% classification_text = BLOCK %] of classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -58,8 +58,8 @@ [% END %] [% IF product && !no_edit_product_link %] - Edit product <a - title="Edit Product '[% product.name FILTER html %]' + Edit product <a + title="Edit Product '[% product.name FILTER html %]' [%- classification_text %]" href="editproducts.cgi?action=edit&product=[% product.name FILTER uri %]"> '[% product.name FILTER html %]'</a>. @@ -68,7 +68,7 @@ [%# Edit other products (in a classification if specified): %] [% UNLESS no_edit_other_products_link %] - Edit <a + Edit <a href="editproducts.cgi? [%- classification_url_part_start FILTER none %]">other products [% classification_text %]</a>. diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index f9c836980..05abc5fdb 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -27,7 +27,7 @@ [% PROCESS global/header.html.tmpl title = title %] [% FOREACH group = mandatory_groups %] <P> -group '[% group.name FILTER html %]' impacts [% group.count %] +group '[% group.name FILTER html %]' impacts [% group.count %] [%+ terms.bugs %] for which the group is newly mandatory and will be added. [% END %] diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 8c634ebfe..027c80172 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -23,8 +23,8 @@ [% title = BLOCK %] Edit Group Controls for [% product.name FILTER html %] [% END %] -[% PROCESS global/header.html.tmpl - title = title +[% PROCESS global/header.html.tmpl + title = title %] <form method="post" action="editproducts.cgi"> diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl index 353ce5c75..5bc7cd4d2 100644 --- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl @@ -10,7 +10,7 @@ # # The Original Code is the Bugzilla Bug Tracking System. # - # Contributor(s): André Batosti <batosti@async.com.br> + # Contributor(s): André Batosti <batosti@async.com.br> # #%] @@ -37,7 +37,7 @@ [% IF changes._group_controls.now_mandatory.size %] [% FOREACH g = changes._group_controls.now_mandatory %] - Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is + Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is mandatory for this product<p> [% g.bug_count FILTER html %] [%+ terms.bugs %] added<p> [% END %] diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index 161cc4b5b..94f19f108 100644 --- a/template/en/default/admin/products/list-classifications.html.tmpl +++ b/template/en/default/admin/products/list-classifications.html.tmpl @@ -28,17 +28,17 @@ %] [% columns = [ - { + { name => "name" heading => "Edit products of..." contentlink => 'editproducts.cgi?classification=%%name%%' }, - { + { name => "description" heading => "Description" allow_html_content => 1 }, - { + { name => "product_count" align => "right" heading => "Product Count" diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 0641c6283..dceeefed6 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -14,10 +14,10 @@ #%] [%# INTERFACE: - # products: array of Bugzilla::Product objects + # products: array of Bugzilla::Product objects # # classification: Bugzilla::Classification object; If classifications - # are enabled, then this is + # are enabled, then this is # the currently selected classification # showbugcounts: boolean; true if bug counts should be included in the table #%] @@ -28,7 +28,7 @@ [% classification_url_part = BLOCK %]&classification= [%- classification.name FILTER uri %] [%- END %] - [% classification_title = BLOCK %] + [% classification_title = BLOCK %] in classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -38,17 +38,17 @@ %] [% columns = [ - { + { name => "name" heading => "Edit product..." contentlink => 'editproducts.cgi?action=edit&product=%%name%%' }, - { + { name => "description" heading => "Description" allow_html_content => 1 }, - { + { name => "is_active" heading => "Open For New $terms.Bugs" yesno_field => 1 diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl index d93022a6e..5ddea6675 100644 --- a/template/en/default/admin/products/updated.html.tmpl +++ b/template/en/default/admin/products/updated.html.tmpl @@ -32,7 +32,7 @@ [% END %] [% END %] -[% title = BLOCK %]Updating Product '[% product.name FILTER html %]' +[% title = BLOCK %]Updating Product '[% product.name FILTER html %]' [% classification_text FILTER none %][% END %] [% PROCESS global/header.html.tmpl title = title @@ -63,7 +63,7 @@ [% IF product.is_active %] open for [% ELSE %] - closed to + closed to [% END %] new [% terms.bugs %]. </p> @@ -79,15 +79,15 @@ [% IF changes.allows_unconfirmed.defined %] <p> [% IF product.allows_unconfirmed %] - The product now allows the + The product now allows the [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status. [% ELSE %] - The product no longer allows the + The product no longer allows the [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status. - Note that any + Note that any <a href="buglist.cgi?product= - [%- product.name FILTER uri %]&bug_status=UNCONFIRMED"> - [%- terms.bugs %] that currently have the + [%- product.name FILTER uri %]&bug_status=UNCONFIRMED"> + [%- terms.bugs %] that currently have the [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status</a> will remain in that status until they are edited. [% END %] diff --git a/template/en/default/admin/settings/edit.html.tmpl b/template/en/default/admin/settings/edit.html.tmpl index eeb6c3203..23c8fdbce 100644 --- a/template/en/default/admin/settings/edit.html.tmpl +++ b/template/en/default/admin/settings/edit.html.tmpl @@ -96,7 +96,7 @@ page, and the Default Value will automatically apply to everyone. </td> </tr> </table> - + </form> [% ELSE %] There are no preferences to edit. diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index e88ae2617..24b934732 100644 --- a/template/en/default/admin/sudo.html.tmpl +++ b/template/en/default/admin/sudo.html.tmpl @@ -17,7 +17,7 @@ # # Contributor(s): A. Karl Kornel <karl@kornel.name> #%] - + [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl @@ -26,28 +26,28 @@ style_urls = ['skins/standard/admin.css'] doc_section = "useradmin.html#impersonatingusers" %] - + [% DEFAULT target_login = "" %] <p> - The <b>sudo</b> feature of [% terms.Bugzilla %] allows you to impersonate a - user for a short time While an sudo session is in progress, every action you - perform will be taking place as if you had logged in as the user whom will be + The <b>sudo</b> feature of [% terms.Bugzilla %] allows you to impersonate a + user for a short time While an sudo session is in progress, every action you + perform will be taking place as if you had logged in as the user whom will be impersonating. </p> <p class="areyoureallyreallysure"> - This is a very powerful feature; you should be very careful while using it. + This is a very powerful feature; you should be very careful while using it. Your actions may be logged more carefully than normal. </p> <form action="relogin.cgi" method="POST"> <p> - To begin, + To begin, [% IF Param('usemenuforusers') %] - select + select [% ELSE %] - enter the login of + enter the login of [% END %] <label for="target_login">the <u>u</u>ser to impersonate</label>: [% INCLUDE global/userselect.html.tmpl @@ -58,39 +58,39 @@ size => 30 %] </p> - + [% IF !Param('usemenuforusers') %] <p> The username must be entered exactly. No matching will be performed. </p> [% END %] - + <p> Next, please take a moment to explain <label for="reason">why you are doing this:<br> <input type="text" id="reason" name="reason" size="80" maxlength="200" value="[% reason_default FILTER html %]"> </p> - + <p> The message you enter here will be sent to the impersonated user by email. - You may leave this empty if you wish, but they will still know that you + You may leave this empty if you wish, but they will still know that you are impersonating them. </p> - + [% IF user.authorizer.can_login %] <p> Finally, enter <label for="current_password">your [% terms.Bugzilla %] password</label>: <input type="password" id="current_password" name="current_password" size="20"> <br> - This is done for two reasons. First of all, it is done to reduce - the chances of someone doing large amounts of damage using your - already-logged-in account. Second, it is there to force you to take the + This is done for two reasons. First of all, it is done to reduce + the chances of someone doing large amounts of damage using your + already-logged-in account. Second, it is there to force you to take the time to consider if you really need to use this feature. </p> [% END %] - + <p> Click the button to begin the session: <input type="submit" id="begin_sudo" value="Begin Session"> diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index 69fae3dac..f96688b2c 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -21,8 +21,8 @@ [%# INTERFACE: # - # columns: - # array of hashes representing the columns in the table. + # columns: + # array of hashes representing the columns in the table. # Each hash contains data for a single column. Hash keys: # name: Name of the field in the data param # heading: The text to print at the header cell @@ -30,11 +30,11 @@ # Expressions of format %%xxx%% are replaced with value # with the key xxx in data hash of the current row. # content: If specified, the content of this variable is used - # instead of the data pulled from the current row. + # instead of the data pulled from the current row. # NOTE: This value is only partially HTML filtered! - # content_use_field: If defined and true, then each value in the + # content_use_field: If defined and true, then each value in the # column corresponds with a key in the - # field_descs field, and that value from the + # field_descs field, and that value from the # field_descs hash will be used instead of "content." # See fieldvalues/select-field for an example of use. # This content WILL be HTML-filtered in this case. @@ -69,7 +69,7 @@ # against. The second hash then again points to another hash. Within this # third hash (3), the keys represent values to match against. The item # contains a fourth hash (4) specifying overridden values. - # + # # Each column value mentioned in the 'columns' documentation above # can be overwritten (apart from name and heading). To override a # table-cell value 'xxx', specify a new 'xxx' value, and specify a @@ -123,7 +123,7 @@ [%# Are there any specific overrides for this column? %] [% FOREACH match_field = overrides.${c.name}.keys %] - + [% override = overrides.${c.name}.${match_field}.${row.$match_field} %] [% NEXT UNLESS override %] @@ -153,7 +153,7 @@ [% END %] <a href="[% link_uri %]"> [% END %] - + [% IF content_use_field && field_descs.exists(row.${c.name}) %] [% colname = row.${c.name} %] [% field_descs.${colname} FILTER html %] @@ -174,11 +174,11 @@ [% END %] [% END %] [% END %] - + [% IF contentlink %] </a> [% END %] - + </td> [% END %] </tr> diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl index b9dbccb36..a6994ac3f 100644 --- a/template/en/default/admin/users/search.html.tmpl +++ b/template/en/default/admin/users/search.html.tmpl @@ -21,7 +21,7 @@ # id: group id # name: group name #%] - + [% PROCESS global/header.html.tmpl title = "Search users" diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl index c4ab07010..32cc43f10 100644 --- a/template/en/default/admin/users/userdata.html.tmpl +++ b/template/en/default/admin/users/userdata.html.tmpl @@ -24,7 +24,7 @@ <th><label for="login">Login name:</label></th> <td> [% IF editusers %] - <input size="64" maxlength="255" name="login" + <input size="64" maxlength="255" name="login" id="login" value="[% otheruser.login FILTER html %]"> [% IF editform %] [% IF !otheruser.in_group('bz_sudo_protect') %] diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl index 39091d5fc..64d931cb1 100644 --- a/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/template/en/default/admin/versions/confirm-delete.html.tmpl @@ -67,16 +67,16 @@ [% IF version.bug_count %] <p> Sorry, there - [% IF version.bug_count > 1 %] - are [% version.bug_count FILTER none %] [%+ terms.bugs %] + [% IF version.bug_count > 1 %] + are [% version.bug_count FILTER none %] [%+ terms.bugs %] [% ELSE %] - is [% version.bug_count FILTER none %] [%+ terms.bug %] + is [% version.bug_count FILTER none %] [%+ terms.bug %] [% END %] - outstanding for this version. You must move + outstanding for this version. You must move [% IF version.bug_count > 1 %] - those [% terms.bugs %] + those [% terms.bugs %] [% ELSE %] that [% terms.bug %] [% END %] @@ -85,7 +85,7 @@ [% ELSE %] <p>Do you really want to delete this version?</p> - + <form method="post" action="editversions.cgi"> <input type="submit" id="delete" value="Yes, delete"> <input type="hidden" name="action" value="delete"> @@ -98,4 +98,4 @@ [% PROCESS admin/versions/footer.html.tmpl %] -[% PROCESS global/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 index 2b75dabeb..3529c3238 100644 --- a/template/en/default/admin/versions/create.html.tmpl +++ b/template/en/default/admin/versions/create.html.tmpl @@ -22,7 +22,7 @@ # product: object; Bugzilla::Product object representing the product to # which the version is being created for #%] - + [% title = BLOCK %]Add Version to Product '[% product.name FILTER html %]'[% END %] [% subheader = BLOCK %]This page allows you to add a new version to product '[% product.name FILTER html %]'.[% END %] diff --git a/template/en/default/admin/versions/footer.html.tmpl b/template/en/default/admin/versions/footer.html.tmpl index ae26e5744..6c94b9ce1 100644 --- a/template/en/default/admin/versions/footer.html.tmpl +++ b/template/en/default/admin/versions/footer.html.tmpl @@ -38,11 +38,11 @@ [% UNLESS no_add_version_link %] <a title="Add a version to product '[% product.name FILTER html %]'" href="editversions.cgi?action=add&product= - [%- product.name FILTER uri %]">Add</a> a version. + [%- product.name FILTER uri %]">Add</a> a version. [% END %] [% IF version.name && !no_edit_version_link %] - Edit version <a + Edit version <a title="Edit Version '[% version.name FILTER html %]' of product ' [%- product.name FILTER html %]'" href="editversions.cgi?action=edit&product= @@ -52,13 +52,13 @@ [% END %] [% UNLESS no_edit_other_versions_link %] - Edit other versions of product <a + Edit other versions of product <a href="editversions.cgi?product= [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>. [% END %] - Edit product <a + Edit product <a href="editproducts.cgi?action=edit&product= [%- product.name FILTER uri %]">'[% product.name FILTER html %]'</a>. diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index 69435d220..f77b7e870 100644 --- a/template/en/default/admin/versions/list.html.tmpl +++ b/template/en/default/admin/versions/list.html.tmpl @@ -41,7 +41,7 @@ [% columns = [ - { + { name => "name" heading => "Edit version..." contentlink => edit_contentlink diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index 7fded475e..ccb46a193 100644 --- a/template/en/default/admin/versions/select-product.html.tmpl +++ b/template/en/default/admin/versions/select-product.html.tmpl @@ -32,14 +32,14 @@ %] [% columns = [ - { + { name => "name" heading => "Edit versions of..." - contentlink => "editversions.cgi?product=%%name%%" + contentlink => "editversions.cgi?product=%%name%%" }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 } ] |