diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
| commit | ce00a61057535d49aa0e83181a1d317d7842571b (patch) | |
| tree | 280243de9ff791449fb2c82f3f0f2b9bd931d5b2 /template/en | |
| parent | 6367a26da4093a8379e370ef328e9507c98b2e7e (diff) | |
| parent | 6657fa9f5210d5b5a9b14c0cba6882bd56232054 (diff) | |
| download | bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.gz bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.xz | |
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'template/en')
166 files changed, 1824 insertions, 1706 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 8cf5e85ef..84e5bd62a 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -26,7 +26,7 @@ [% IF !target %] [% target = "index.cgi" %] [% END %] - + [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl @@ -57,7 +57,7 @@ <input type="password" id="Bugzilla_password" name="Bugzilla_password" required> </div> - [% IF Param('rememberlogin') == 'defaulton' || + [% IF Param('rememberlogin') == 'defaulton' || Param('rememberlogin') == 'defaultoff' %] <div class="field-remember"> <input type="checkbox" id="Bugzilla_remember" name="Bugzilla_remember" value="on" diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 914fe05b4..f557d05db 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -20,7 +20,7 @@ [%# INTERFACE # none - # + # # Param("maintainer") is used to display the maintainer's email. # Param("emailsuffix") is used to pre-fill the email field. #%] diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl index d794198bc..539fb44c2 100644 --- a/template/en/default/account/created.html.tmpl +++ b/template/en/default/account/created.html.tmpl @@ -37,4 +37,4 @@ created within [% constants.MAX_TOKEN_AGE FILTER html %] days. </p> -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl index 39add3238..c0f094366 100644 --- a/template/en/default/account/email/confirm.html.tmpl +++ b/template/en/default/account/email/confirm.html.tmpl @@ -21,7 +21,7 @@ [%# INTERFACE: # token: string. The token to be used in this address change. #%] - + [% title = "Confirm Change Email" %] [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 8fb36926f..45f5ab11f 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -29,7 +29,7 @@ X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to create a user account using your email address ([% email %]). -To continue creating an account using this email address, visit the +To continue creating an account using this email address, visit the following link by [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=request_new_account diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index e014658dc..70373f52b 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -25,7 +25,7 @@ To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Password Request X-Bugzilla-Type: admin -You have (or someone impersonating you has) requested to change your +You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmpw diff --git a/template/en/default/account/prefs/apikey.html.tmpl b/template/en/default/account/prefs/apikey.html.tmpl index cdbee848b..c4b4074c1 100644 --- a/template/en/default/account/prefs/apikey.html.tmpl +++ b/template/en/default/account/prefs/apikey.html.tmpl @@ -34,25 +34,15 @@ here.</p> <th>Revoked</th> </tr> - [%# because mozreview api-keys only work for the mozreview api, we hide the - # key and prevent renaming #%] [% FOREACH api_key IN api_keys %] <tr[% IF api_key.revoked %] class="apikey_revoked bz_tui_hidden" style="display:none"[% END %]> <td> - [% IF api_key.is_mozreview %] - <i>hidden</i> - [% ELSE %] - [% api_key.api_key FILTER html %] - [% END %] + [% api_key.api_key FILTER html %] </td> <td> - [% IF api_key.is_mozreview %] - MozReview - [% ELSE %] - <input name="description_[% api_key.id FILTER html %]" - id="description_[% api_key.id FILTER html %]" - value="[% api_key.description FILTER html %]"> - [% END %] + <input name="description_[% api_key.id FILTER html %]" + id="description_[% api_key.id FILTER html %]" + value="[% api_key.description FILTER html %]"> </td> [% IF api_key.last_used %] <td>[% api_key.last_used FILTER time %] diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 014bf4f3d..132625368 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -78,7 +78,7 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe <td width="150"></td> <td> [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] - <input type="checkbox" name="[% prefname %]" id="[% prefname %]" + <input type="checkbox" name="[% prefname %]" id="[% prefname %]" value="1" [% " checked" IF user.mail_settings.${constants.REL_ANY}.${constants.EVT_FLAG_REQUESTED} %]> @@ -90,7 +90,7 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe <td width="150"></td> <td> [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] - <input type="checkbox" name="[% prefname %]" id="[% prefname %]" + <input type="checkbox" name="[% prefname %]" id="[% prefname %]" value="1" [% " checked" IF user.mail_settings.${constants.REL_ANY}.${constants.EVT_REQUESTED_FLAG} %]> @@ -159,7 +159,7 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe ] %] [% IF Param('useqacontact') %] - [% relationships.push({ id = constants.REL_QA, + [% relationships.push({ id = constants.REL_QA, description = "QA Contact" }) %] [% END %] @@ -188,18 +188,18 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </th> [% END %] </tr> - - [% FOREACH event = events %] + + [% FOREACH event = events %] [% count = loop.count() %] <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]"> [% FOREACH relationship = relationships %] <td align="center"> - <input type="checkbox" + <input type="checkbox" name="email-[% relationship.id %]-[% event.id %]" value="1" [%# The combinations don't always make sense; disable a couple %] - [% IF event.id == constants.EVT_ADDED_REMOVED AND - no_added_removed.contains(relationship.id) + [% IF event.id == constants.EVT_ADDED_REMOVED AND + no_added_removed.contains(relationship.id) %] disabled [% ELSIF user.mail_settings.${relationship.id}.${event.id} %] @@ -212,9 +212,9 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </td> </tr> [% END %] - + <tr> - <td colspan="[% num_columns FILTER html %]" + <td colspan="[% num_columns FILTER html %]" align="center" width="50%"> </td> @@ -223,12 +223,12 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </td> </tr> - [% FOREACH event = neg_events %] + [% FOREACH event = neg_events %] [% count = loop.count() %] <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]"> [% FOREACH relationship = relationships %] <td align="center"> - <input type="checkbox" + <input type="checkbox" name="neg-email-[% relationship.id %]-[% event.id %]" value="1" [% " checked" IF NOT user.mail_settings.${relationship.id}.${event.id} %]> @@ -239,16 +239,16 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </td> </tr> [% END %] - + </table> <hr> <b>User Watching</b> <p> -If you watch a user, it is as if you are standing in their shoes for the +If you watch a user, it is as if you are standing in their shoes for the purposes of getting email. Email is sent or not according to <u>your</u> -preferences for <u>their</u> relationship to the [% terms.bug %] +preferences for <u>their</u> relationship to the [% terms.bug %] (e.g. Assignee). </p> @@ -277,7 +277,7 @@ You are currently not watching any users. size => 60 multiple => 5 %] -</p> +</p> <p id="watching_you">Users watching you:<br> [% IF watchers.size %] @@ -294,7 +294,7 @@ You are currently not watching any users. <p> You can specify a list of [% terms.bugs %] from which you never want to get any email notification of any kind by adding their ID(s) as a comma-separated - list. Removing [% terms.abug %] by selecting it from the current ignored list + list. Removing [% terms.abug %] by selecting it from the current ignored list will re-enable email notifications for the [% terms.bug %]. </p> [% IF user.bugs_ignored.size %] @@ -324,5 +324,5 @@ You are currently not watching any users. [% END %] <p>Add [% terms.bugs %]:<br> - <input type="text" id="add_ignored_bugs" + <input type="text" id="add_ignored_bugs" name="add_ignored_bugs" size="60"></p> diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index d3c787b07..a4597205c 100644 --- a/template/en/default/account/prefs/permissions.html.tmpl +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -85,7 +85,7 @@ [% IF user.in_group('bz_sudoers') %] <br> - You are a member of the <b>bz_sudoers</b> group, so you can + You are a member of the <b>bz_sudoers</b> group, so you can <a href="relogin.cgi?action=prepare-sudo">impersonate someone else</a>. [% END %] </td> diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index ec24eb100..631b08a10 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -25,11 +25,11 @@ # description: string. Description of the tab (used in tab title). # saveable: boolean. True if tab has a form which can be submitted. # True if user is not receiving self-generated mail. - # Note: For each tab name, a template "prefs/${tab.name}.tmpl" must exist, + # Note: For each tab name, a template "prefs/${tab.name}.tmpl" must exist, # and its interface must be fulfilled. # current_tab: A direct reference to one of the hashes in the tabs list. # This tab will be displayed. - # changes_saved: boolean/string. True if the CGI processed form data before + # changes_saved: boolean/string. True if the CGI processed form data before # displaying anything, and can contain an optional custom # message if required (which Perl still evaluates as True). # dont_show_button: boolean. Prevent the display of the "Submit Changes" button. @@ -134,7 +134,7 @@ <input type="hidden" name="token" value="[% token FILTER html %]"> [% END %] -[% PROCESS "account/prefs/${current_tab.name}.html.tmpl" +[% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %] [% IF current_tab.saveable %] diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 426b593dc..e611aa682 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -43,7 +43,7 @@ <p>Your saved searches are as follows:</p> <blockquote> - <table border="1" cellpadding="3"> + <table border="1" cellpadding="3"> <tr> <th> Search @@ -82,7 +82,7 @@ </td> <td align="center"> - <input type="checkbox" + <input type="checkbox" name="showmybugslink" value="1" [% " checked" IF user.showmybugslink %]> @@ -114,7 +114,7 @@ [% END %] </td> <td align="center"> - <input type="checkbox" + <input type="checkbox" name="link_in_footer_[% q.id FILTER html %]" value="1" alt="[% q.name FILTER html %]" @@ -127,7 +127,7 @@ <option value="">Don't share</option> [% FOREACH group = queryshare_groups %] <option value="[% group.id %]" - [% ' selected="selected"' + [% ' selected="selected"' IF q.shared_with_group.id == group.id %] >[% group.name FILTER html %]</option> [% END %] @@ -160,7 +160,7 @@ [% IF user.queries_available.size %] <p>You may use these searches saved and shared by others:</p> - <table border="1" cellpadding="3"> + <table border="1" cellpadding="3"> <tr> <th> Search @@ -197,7 +197,7 @@ [% q.name FILTER uri %]">Edit</a> </td> <td align="center"> - <input type="checkbox" + <input type="checkbox" name="link_in_footer_[% q.id FILTER html %]" value="1" alt="[% q.name FILTER html %]" diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl index aa6a63e85..64a950e86 100644 --- a/template/en/default/account/profile-activity.html.tmpl +++ b/template/en/default/account/profile-activity.html.tmpl @@ -26,7 +26,7 @@ # listselectionvalues: selection values to recreate the current user list. # # profile_changes: An array of hashes containing the following fields: - # + # # who: string; login name of who made the change # activity_when: string; when the change was made # what: string; the description of the field which was changed @@ -83,4 +83,4 @@ [% END %] </p> -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] 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 } ] diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 2727a225c..95336ed8e 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -39,7 +39,6 @@ doc_section = "attachments.html" %] -[%# BMO hook for displaying MozReview message %] [% Hook.process('before_form') %] <form name="entryform" method="post" action="attachment.cgi" enctype="multipart/form-data"> diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl index d510b5a5e..7bd04160a 100644 --- a/template/en/default/attachment/diff-file.html.tmpl +++ b/template/en/default/attachment/diff-file.html.tmpl @@ -68,7 +68,7 @@ incremental_restore() <a href="[% bonsai_prefix %]#[% section.old_start %]"> [% END %] [% IF section.old_lines > 1 %] - Lines [% section.old_start %]-[% section.old_start + + Lines [% section.old_start %]-[% section.old_start + section.old_lines - 1 %] [% ELSE %] Line [% section.old_start %] @@ -77,7 +77,7 @@ incremental_restore() </a> [% END %] [% section.func_info FILTER html IF section.func_info %] - [% END %] + [% END %] </th><th> <a href="#[% file.filename FILTER html %]_sec[% section_num %]">Link Here</a> </th></tr></table> diff --git a/template/en/default/attachment/diff-footer.html.tmpl b/template/en/default/attachment/diff-footer.html.tmpl index e9965a9a8..fe98162e2 100644 --- a/template/en/default/attachment/diff-footer.html.tmpl +++ b/template/en/default/attachment/diff-footer.html.tmpl @@ -34,7 +34,7 @@ <span>Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]</span> [% PROCESS global/footer.html.tmpl %] - + [% ELSE %] </body> </html> diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index d06d4ad56..44d388ec1 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -62,8 +62,8 @@ <div id="attachment_attributes"> <div id="attachment_information_read_only" class="[% "bz_private" IF attachment.isprivate %]"> <div class="title"> - [% "[patch]" IF attachment.ispatch%] - <span class="[% "bz_obsolete" IF attachment.isobsolete %]" title="[% "obsolete" IF attachment.isobsolete %]"> + [% "[patch]" IF attachment.ispatch%] + <span class="[% "bz_obsolete" IF attachment.isobsolete %]" title="[% "obsolete" IF attachment.isobsolete %]"> [% attachment.description FILTER html %] </span> [% IF can_edit %] @@ -96,28 +96,28 @@ wrap = 'soft' classes = 'block' _ editable_or_hide defaultcontent = attachment.description - %] + %] </div> <div id="attachment_filename"> <label for="filename">Filename:</label> <input type="text" size="20" class="text block[% editable_or_hide %]" id="filename" name="filename" - value="[% attachment.filename FILTER html %]"> + value="[% attachment.filename FILTER html %]"> </div> <div id="attachment_mimetype"> <label for="contenttypeentry">MIME Type:</label> <input type="text" size="20" class="text block[% editable_or_hide %]" id="contenttypeentry" name="contenttypeentry" - value="[% attachment.contenttype FILTER html %]"> + value="[% attachment.contenttype FILTER html %]"> </div> - + <div id="attachment_creator"> <span class="label">Creator:</span> [%+ INCLUDE global/user.html.tmpl who = attachment.attacher %] </div> - + <div id="attachment_size"> <span class="label">Size:</span> [% IF attachment.datasize %] @@ -136,7 +136,7 @@ <div class="readonly"> <div class="checkboxes"> <div id="attachment_isobsolete"> - <input type="checkbox" id="isobsolete" name="isobsolete" value="1" + <input type="checkbox" id="isobsolete" name="isobsolete" value="1" [%+ 'checked="checked"' IF attachment.isobsolete %]> <label for="isobsolete">obsolete</label> </div> @@ -156,7 +156,7 @@ </div> [% END %] </div> - </div> + </div> </div> <div id="attachment_view_window"> @@ -249,8 +249,8 @@ [% ELSE %] <div id="noview"> <p><b> - Attachment is not viewable in your browser because its MIME type - ([% attachment.contenttype FILTER html %]) is not one that your browser is + Attachment is not viewable in your browser because its MIME type + ([% attachment.contenttype FILTER html %]) is not one that your browser is able to display. </b></p> <p><b> @@ -285,12 +285,12 @@ [% Hook.process('form_before_submit') %] - [% IF user.id %] + [% IF user.id %] <div id="update_container"> <input type="submit" value="Submit" id="update"> </div> - [% END %] - </div> + [% END %] + </div> </div> </div> </form> diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl index 67748e594..3e9f84027 100644 --- a/template/en/default/bug/create/comment-guided.txt.tmpl +++ b/template/en/default/bug/create/comment-guided.txt.tmpl @@ -24,11 +24,10 @@ # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to # pull out various custom fields and format an initial Description entry # from them. - #%] + #%] [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] User-Agent: [%+ cgi.user_agent() %] -Build Identifier: [%+ cgi.param("buildid") %] [%+ cgi.param("comment") IF cgi.param("comment") %] @@ -42,12 +41,12 @@ Steps to Reproduce: [% END %] [% IF cgi.param("actual_results") %] -Actual Results: +Actual Results: [%+ cgi.param("actual_results") %] [% END %] [% IF cgi.param("expected_results") %] -Expected Results: +Expected Results: [%+ cgi.param("expected_results") %] [% END %] diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index a1c2c2e08..cfdb0ba4e 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -62,7 +62,7 @@ function PutDescription() { <h3 id="step1">Step 1 of 3 - has your [% terms.bug %] already been reported?</h3> <p> - <font color="red">Please don't skip this step - half of all + <font color="red">Please don't skip this step - half of all [% terms.bugs %] filed are reported already.</font> Check the two lists of frequently-reported [% terms.bugs %]: @@ -79,7 +79,7 @@ function PutDescription() { <p> <a href="duplicates.cgi?[% productstring %]&format=simple" target="somebugs">All-time Top 20</a> (loaded initially) | - <a href="duplicates.cgi?[% productstring %]&format=simple&sortby=delta&reverse=1&maxrows=100&changedsince=14" target="somebugs">Hot in the last two weeks</a> + <a href="duplicates.cgi?[% productstring %]&format=simple&sortby=delta&reverse=1&maxrows=100&changedsince=14" target="somebugs">Hot in the last two weeks</a> </p> <iframe name="somebugs" id="somebugs" @@ -100,8 +100,8 @@ function PutDescription() { <input type="hidden" name="order" value="relevance desc"> <input type="hidden" name="bug_status" value="__all__"> <input type="hidden" name="product" value="[% product.name FILTER html %]"> - [% IF product.name == "Firefox" OR - product.name == "Thunderbird" OR + [% IF product.name == "Firefox" OR + product.name == "Thunderbird" OR product.name == "SeaMonkey" OR product.name == "Camino" %] <input type="hidden" name="product" value="Core"> @@ -130,7 +130,7 @@ function PutDescription() { <h3 id="step2">Step 2 of 3 - give information</h3> <p> - If you've tried a few searches and your [% terms.bug %] really isn't in + If you've tried a few searches and your [% terms.bug %] really isn't in there, tell us all about it. </p> @@ -191,7 +191,7 @@ function PutDescription() { </td> </tr> </table> - + <p> The area where the problem occurs. To pick the right component, you could use the same one as @@ -228,33 +228,6 @@ function PutDescription() { </td> </tr> - [% IF product.name.match("Firefox|Camino|SeaMonkey") %] - [% matches = cgi.user_agent('Gecko/(\d+)') %] - [% buildid = cgi.user_agent() IF matches %] - [% END %] - - [%# Accept URL parameter build ID for non-browser products %] - [% IF cgi.param("buildid") %] - [% buildid = cgi.param("buildid") %] - [% END %] - - <tr bgcolor="[% tablecolour %]"> - <td align="right" valign="top"> - <b>Build Identifier</b> - </td> - <td valign="top"> - <input type="text" size="80" name="buildid" value="[% buildid FILTER html %]"> - <p> - This should identify the exact version of the product you were using. - If the above field is blank or you know it is incorrect, copy the - user agent text from the product's Help | Troubleshooting Information menu - (for browsers this will begin with "Mozilla/5.0..."). - If the product won't start, instead paste the complete URL you downloaded - it from. - </p> - </td> - </tr> - <tr> <td align="right" valign="top"> <b>URL</b> @@ -275,7 +248,7 @@ function PutDescription() { <b>Summary</b> </td> <td valign="top"> - <input type="text" size="80" name="short_desc" id="short_desc" + <input type="text" size="80" name="short_desc" id="short_desc" maxlength="255" spellcheck="true"> <p> A sentence which summarises the problem. @@ -317,7 +290,7 @@ function PutDescription() { <tt> <font color="#009900">Good example</font>: After a crash which happened when I was sorting in the Bookmark Manager,<br> all of my - top-level bookmark folders beginning with the letters Q to Z are + top-level bookmark folders beginning with the letters Q to Z are no longer present. </tt> </p> @@ -423,7 +396,7 @@ function PutDescription() { </p> </td> </tr> - + <tr> <td valign="top" align="right"> <b>Severity</b> @@ -452,7 +425,7 @@ function PutDescription() { </option> </select> <p> - Say how serious the problem is, or if your [% terms.bug %] is a + Say how serious the problem is, or if your [% terms.bug %] is a request for a new feature. </p> </td> @@ -474,12 +447,12 @@ function PutDescription() { <p> That's it! Thanks very much. You'll be notified by email about any - progress that is made on fixing your [% terms.bug %]. + progress that is made on fixing your [% terms.bug %]. -<p> +<p> Please be warned - that we get a lot of [% terms.bug %] reports filed - it may take quite a - while to get around to yours. You can help the process by making sure your + that we get a lot of [% terms.bug %] reports filed - it may take quite a + while to get around to yours. You can help the process by making sure your [%+ terms.bug %] is complete and easy to understand, and by quickly replying to any questions which may arrive by email. diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index 51e787870..4d13da96d 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -29,8 +29,8 @@ [% PROCESS global/variables.none.tmpl %] -Before reporting [% terms.abug %], please read the -<a href="[% terms.BugWritingGuidelinesURL %]"> +Before reporting [% terms.abug %], please read the +<a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines"> [% terms.bug %] writing guidelines</a>, please look at the list of <a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, and please <a href="query.cgi">search</a> for the [% terms.bug %]. diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index 17f00803f..6e1478be0 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -26,7 +26,7 @@ [% filtered_desc = blocked_tree.$bugid.short_desc FILTER html %] [% PROCESS global/header.html.tmpl title = "Dependency tree for $terms.Bug $bugid" - header = "Dependency tree for + header = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>" javascript_urls = ["js/expanding-tree.js"] style_urls = ["skins/standard/dependency-tree.css"] @@ -35,10 +35,10 @@ %] [% PROCESS depthControlToolbar %] - + [% INCLUDE tree_section ids=dependson_ids type=1 %] - -[% INCLUDE tree_section ids=blocked_ids type=2 %] + +[% INCLUDE tree_section ids=blocked_ids type=2 %] [% PROCESS depthControlToolbar %] @@ -58,18 +58,18 @@ [% global.seen = {} %] [%# Display the tree of bugs that this bug depends on. %] <h3> - <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] [%+ bugid %]</a> + <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] [%+ bugid %]</a> [% IF type == 1 %] [% tree_name = "dependson_tree" %] [% IF ids.size %] - depends on + depends on [% ELSE %] does not depend on any [% 'open ' IF hide_resolved %][% terms.bugs %]. [% END %] [% ELSIF type == 2 %] [% tree_name = "blocked_tree" %] - [% IF ids.size %] - blocks + [% IF ids.size %] + blocks [% ELSE %] does not block any [% 'open ' IF hide_resolved %][% terms.bugs %]. [% END %] @@ -78,7 +78,7 @@ [%+ (ids.size == 1) ? "one" : ids.size %] [%+ IF hide_resolved %]open[% END %] [%+ (ids.size == 1) ? terms.bug : terms.bugs %]: - [% END %] + [% END %] </h3> [% IF ids.size %] [%# 27 chars is the length of buglist.cgi?tweak=&bug_id=" %] @@ -117,8 +117,8 @@ [% bug = tree.$bugid %] <li> [%- INCLUDE bullet bugid=bugid tree=tree -%] - <span class="summ[% "_deep" IF tree.dependencies.$bugid.size %]" - id="[% bugid FILTER html %]" + <span class="summ[% "_deep" IF tree.dependencies.$bugid.size %]" + id="[% bugid FILTER html %]" [% IF global.seen.$bugid %] onMouseover="duplicatedover('[% bugid FILTER html %]')" onMouseout="duplicatedout('[% bugid FILTER html %]')" @@ -143,9 +143,9 @@ [% BLOCK bullet %] [% IF tree.dependencies.$bugid.size && ! global.seen.$bugid %] [% extra_class = " b_open" %] - [% extra_args = 'onclick="return doToggle(this, event)"' %] + [% extra_args = 'onclick="return doToggle(this, event)"' %] [% END %] - <a id="b[% bugid %]" + <a id="b[% bugid %]" class="b [%+ extra_class FILTER none %]" title="Click to expand or contract this portion of the tree. Hold down the Ctrl key while clicking to expand or contract all subtrees." [% extra_args FILTER none %]> </a> @@ -209,7 +209,7 @@ style="display: inline; margin: 0px;"> [%# set to one form %] <input type="submit" id="change_maxdepth" - value=" 1 " + value=" 1 " [% "disabled" IF realdepth < 2 || maxdepth == 1 %]> <input name="id" type="hidden" value="[% bugid %]"> <input name="maxdepth" type="hidden" value="1"> @@ -260,7 +260,7 @@ <input name="maxdepth" type="hidden" value="[% maxdepth + 1 %]"> [% END %] <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> - <input type="submit" id="increase_depth" value=" > " + <input type="submit" id="increase_depth" value=" > " [% "disabled" IF realdepth < 2 || !maxdepth || maxdepth >= realdepth %]> </form> </td> diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 445e5fe0d..6a1edc163 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -110,27 +110,27 @@ <table class="edit_form"> <tr> [%# 1st Column %] - <td id="bz_show_bug_column_1" class="bz_show_bug_column"> + <td id="bz_show_bug_column_1" class="bz_show_bug_column"> <table> [%# *** ID, product, component, status, resolution, Hardware, and OS *** %] [% PROCESS section_status %] - + [% PROCESS section_spacer %] - + [% PROCESS section_details1 %] - + [% PROCESS section_spacer %] - + [%# *** severity, priority, version and milestone *** %] - [% PROCESS section_details2 %] - + [% PROCESS section_details2 %] + [%# *** assigned to and qa contact *** %] [% PROCESS section_people %] - + [% PROCESS section_spacer %] - + [% PROCESS section_url_keyword_whiteboard %] - + [% PROCESS section_spacer %] [%# *** Dependencies and duplicates *** %] @@ -138,7 +138,7 @@ [% PROCESS section_dependson_blocks %] - [% IF user.id %] + [% IF user.id %] <tr> <td colspan="2"> <span style="float:left"> @@ -187,7 +187,6 @@ <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr> <td> - [%# BMO hook for adding MozReview table %] [% Hook.process("after_bug_data") %] [% IF user.is_timetracker %] @@ -230,7 +229,7 @@ [% ELSE %] [% PROCESS summon_comment_box %] [% END %] - + </form> @@ -242,35 +241,35 @@ [%# That's the main table, which contains all editable fields. %] <div class="bz_alias_short_desc_container edit_form"> <span class="last_comment_link"> - <a href="#c[% bug.comments.size - 1 %]" + <a href="#c[% bug.comments.size - 1 %]" accesskey="l"><b>L</b>ast Comment</a> - </span> + </span> <a href="show_bug.cgi?id=[% bug.bug_id %]"> [%-# %]<b>[% terms.Bug %] [% bug.bug_id FILTER html %]</b> - [%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden"> + [%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden"> [% IF Param("usebugaliases") %] [% IF bug.alias != "" %] - (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>) + (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>) [% END %] [% END %] <span role="heading" aria-level="1" id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) FILTER wbr %]</span> - [% IF bug.check_can_change_field('short_desc', 0, 1) || + [% IF bug.check_can_change_field('short_desc', 0, 1) || bug.check_can_change_field('alias', 0, 1) %] <small class="editme">(<a href="#" id="editme_action">edit</a>)</small> [% END %] </span> - - + + <div id="summary_alias_input"> - <table id="summary"> + <table id="summary"> [% IF Param("usebugaliases") %] <tr> - [% IF bug.check_can_change_field('alias', 0, 1) %] + [% IF bug.check_can_change_field('alias', 0, 1) %] <td> - <label - for="alias" - title="a name for the - [% terms.bug %] that can be used in place of its ID number, + <label + for="alias" + title="a name for the + [% terms.bug %] that can be used in place of its ID number, [%%] e.g. when adding it to a list of dependencies" >Alias</label>:</td><td> [% ELSIF bug.alias %] @@ -281,12 +280,12 @@ [% INCLUDE input inputname => "alias" size => "40" maxlength => "40" - no_td => 1 - %][% ")" IF NOT bug.check_can_change_field('alias', 0, 1) + no_td => 1 + %][% ")" IF NOT bug.check_can_change_field('alias', 0, 1) && bug.alias %] </td> </tr> - [% END %] + [% END %] [%# *** Summary *** %] <tr> <td> @@ -334,7 +333,7 @@ value = bug.classification editable = bug.check_can_change_field('product', 0, 1) %] </tr> - [%###############%] + [%###############%] [%# Component #%] [%###############%] <tr> @@ -352,9 +351,9 @@ [% PROCESS select selname => "version" %] </tr> - [%############%] + [%############%] [%# PLATFORM #%] - [%############%] + [%############%] <tr> <th class="field_label"> <label for="rep_platform" accesskey="h">Platform</label>: @@ -364,8 +363,8 @@ bug = bug, field = bug_fields.rep_platform, no_tds = 1, value = bug.rep_platform editable = bug.check_can_change_field('rep_platform', 0, 1) %] - [%+ INCLUDE bug/field.html.tmpl - bug = bug, field = bug_fields.op_sys, + [%+ INCLUDE bug/field.html.tmpl + bug = bug, field = bug_fields.op_sys, no_tds = 1, value = bug.op_sys editable = bug.check_can_change_field('op_sys', 0, 1) %] [%# BMO - hook for hw/os detection from reporter %] @@ -396,7 +395,7 @@ [% END %] [% END %] [% IF bug.user.canedit || bug.user.isreporter %] - (<a href="#add_comment" + (<a href="#add_comment" onclick="window.setTimeout(function() { document.getElementById('bug_status').focus(); }, 10)">edit</a>) [% END %] </span> @@ -413,7 +412,7 @@ [% INCLUDE input inputname => "status_whiteboard" size => "40" colspan => 2 %] </tr> [% END %] - + [% IF use_keywords %] <tr> <th class="field_label"> @@ -468,7 +467,7 @@ [% PROCESS select selname = "target_milestone" %] </tr> [% END %] - + [% END %] [%############################################################################%] @@ -488,7 +487,7 @@ [% INCLUDE global/user.html.tmpl who = bug.assigned_to %] (<a href="#" id="bz_assignee_edit_action">edit</a>) [% IF bug.assigned_to.id != user.id %] - (<a title="Reassign to yourself" + (<a title="Reassign to yourself" href="#" id="bz_assignee_take_action">take</a>) [% END %] </span> @@ -506,10 +505,10 @@ <label id="set_default_assignee_label" for="set_default_assignee">Reset Assignee to default</label> </div> <script> - hideEditableField('bz_assignee_edit_container', - 'bz_assignee_input', - 'bz_assignee_edit_action', - 'assigned_to', + hideEditableField('bz_assignee_edit_container', + 'bz_assignee_input', + 'bz_assignee_edit_action', + 'assigned_to', '[% bug.assigned_to.login FILTER js %]' ); hideEditableField('bz_assignee_edit_container', 'bz_assignee_input', @@ -517,7 +516,7 @@ 'assigned_to', '[% bug.assigned_to.login FILTER js %]', '[% user.login FILTER js %]' ); - initDefaultCheckbox('assignee'); + initDefaultCheckbox('assignee'); </script> [% ELSE %] [% INCLUDE global/user.html.tmpl who = bug.assigned_to %] @@ -537,7 +536,7 @@ [% INCLUDE global/user.html.tmpl who = bug.qa_contact %] (<a href="#" id="bz_qa_contact_edit_action">edit</a>) [% IF bug.qa_contact.id != user.id %] - (<a title="Change QA contact to yourself" + (<a title="Change QA contact to yourself" href="#" id="bz_qa_contact_take_action">take</a>) [% END %] </span> @@ -556,15 +555,15 @@ <label for="set_default_qa_contact" id="set_default_qa_contact_label">Reset QA Contact to default</label> </div> <script> - hideEditableField('bz_qa_contact_edit_container', - 'bz_qa_contact_input', - 'bz_qa_contact_edit_action', - 'qa_contact', + hideEditableField('bz_qa_contact_edit_container', + 'bz_qa_contact_input', + 'bz_qa_contact_edit_action', + 'qa_contact', '[% bug.qa_contact.login FILTER js %]'); - hideEditableField('bz_qa_contact_edit_container', - 'bz_qa_contact_input', - 'bz_qa_contact_take_action', - 'qa_contact', + hideEditableField('bz_qa_contact_edit_container', + 'bz_qa_contact_input', + 'bz_qa_contact_take_action', + 'qa_contact', '[% bug.qa_contact.login FILTER js %]', '[% user.login FILTER js %]'); initDefaultCheckbox('qa_contact'); @@ -610,7 +609,7 @@ %] <td> [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %] - <span id="bz_url_edit_container" class="bz_default_hidden"> + <span id="bz_url_edit_container" class="bz_default_hidden"> <a href="[% bug.bug_file_loc FILTER html %]" target="_blank" rel="noreferrer" title="[% bug.bug_file_loc FILTER html %]" [% IF NOT is_safe_url(bug.bug_file_loc) %] @@ -639,10 +638,10 @@ </span> [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %] <script> - hideEditableField('bz_url_edit_container', - 'bz_url_input_area', - 'bz_url_edit_action', - 'bug_file_loc', + hideEditableField('bz_url_edit_container', + 'bz_url_input_area', + 'bz_url_edit_action', + 'bug_file_loc', "[% bug.bug_file_loc FILTER js %]"); </script> [% END %] @@ -678,20 +677,20 @@ [% BLOCK section_dependson_blocks %] <tr> - [% INCLUDE dependencies + [% INCLUDE dependencies field = bug_fields.dependson deps = bug.depends_on_obj %] </tr> - + <tr> - [% INCLUDE dependencies + [% INCLUDE dependencies field = bug_fields.blocked deps = bug.blocks_obj %] - + <tr> <th> </th> - + <td colspan="2" align="left" id="show_dependency_tree_or_graph"> Show dependency <a href="showdependencytree.cgi?id=[% bug.bug_id %]&hide_resolved=1">tree</a> - + [% IF Param('webdotbase') %] / <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">graph</a> [% END %] @@ -721,7 +720,7 @@ [% IF NOT emitted_description %] [% emitted_description = 1 %] <div id="bz_restrict_group_visibility_help"> - <b>Only users in all of the selected groups can view this + <b>Only users in all of the selected groups can view this [%+ terms.bug %]:</b> <p class="instructions"> Unchecking all boxes makes this a more public [% terms.bug %]. @@ -730,7 +729,7 @@ [% END %] [% IF group.ingroup %] - <input type="hidden" name="defined_groups" + <input type="hidden" name="defined_groups" value="[% group.name FILTER html %]"> [% END %] @@ -745,20 +744,20 @@ [% IF emitted_description %] [% IF NOT inallgroups %] - <p class="instructions">Only members of a group can change the + <p class="instructions">Only members of a group can change the visibility of [% terms.abug %] for that group.</p> [% END %] [% END %] [% IF inagroup %] <div id="bz_enable_role_visibility_help"> - <b>Users in the roles selected below can always view + <b>Users in the roles selected below can always view this [% terms.bug %]:</b> </div> <div id="bz_enable_role_visibility"> <div> - [% user_can_edit_accessible = - bug.check_can_change_field("reporter_accessible", 0, 1) + [% user_can_edit_accessible = + bug.check_can_change_field("reporter_accessible", 0, 1) %] [% IF user_can_edit_accessible %] <input type="hidden" name="defined_reporter_accessible" value="1"> @@ -770,8 +769,8 @@ <label for="reporter_accessible">Reporter</label> </div> <div> - [% user_can_edit_accessible = - bug.check_can_change_field("cclist_accessible", 0, 1) + [% user_can_edit_accessible = + bug.check_can_change_field("cclist_accessible", 0, 1) %] [% IF user_can_edit_accessible %] <input type="hidden" name="defined_cclist_accessible" value="1"> @@ -809,7 +808,7 @@ [% bug.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %] </td> </tr> - + <tr> <th class="field_label"> Modified: @@ -818,7 +817,7 @@ [% bug.delta_ts FILTER time("%Y-%m-%d %H:%M %Z") %] (<a href="show_activity.cgi?id=[% bug.bug_id %]">[%# terms.Bug %]History</a>) </td> - + </tr> [% END %] @@ -844,10 +843,10 @@ || (!has_role && user.settings.state_addselfcc.value == 'cc_unless_role') %]> <label for="addselfcc">Add me to CC list</label> - <br> + <br> [% END %] [% END %] - [% bug.cc.size || 0 FILTER html %] + [% bug.cc.size || 0 FILTER html %] [% IF bug.cc.size == 1 %] user [% ELSE %] @@ -863,7 +862,7 @@ (<a href="#" id="cc_edit_area_showhide">[% IF user.id %]edit[% ELSE %]show[% END %]</a>) [% IF user.id && bug.cc.size %] <br> - <ul class="cc_list_display"> + <ul class="cc_list_display"> [% FOREACH c = bug.cc %] <li>[% c FILTER email FILTER html %]</li> [% END %] @@ -912,11 +911,11 @@ </div> [% IF user.id || bug.cc.size %] <script> - hideEditableField( 'cc_edit_area_showhide_container', - 'cc_edit_area', - 'cc_edit_area_showhide', - '', - ''); + hideEditableField( 'cc_edit_area_showhide_container', + 'cc_edit_area', + 'cc_edit_area_showhide', + '', + ''); </script> [% END %] </td> @@ -952,7 +951,7 @@ [% BLOCK section_see_also %] [% IF Param('use_see_also') || bug.see_also.size %] <tr> - [% INCLUDE bug/field.html.tmpl + [% INCLUDE bug/field.html.tmpl field = bug_fields.see_also value = bug.see_also editable = bug.check_can_change_field('see_also', 0, 1) @@ -1011,7 +1010,7 @@ YAHOO.util.Dom.removeClass(rows[i], 'bz_default_hidden'); } YAHOO.util.Event.preventDefault(e); - }); + }); </script> [% END %] </td> @@ -1070,31 +1069,31 @@ <td> <span id="[% field.name FILTER html %]_input_area"> [% IF bug.check_can_change_field(field.name, 0, 1) %] - <input name="[% field.name FILTER html %]" + <input name="[% field.name FILTER html %]" id="[% field.name FILTER html %]" class="text_input" value="[% bug.${field.name}.join(', ') FILTER html %]"> [% END %] </span> - + [% FOREACH dep_bug = deps %] [% dep_bug.id FILTER bug_link(dep_bug, use_alias => 1) FILTER none %][% " " %] [% END %] [% IF bug.check_can_change_field(field.name, 0, 1) %] - <span id="[% field.name FILTER html %]_edit_container" + <span id="[% field.name FILTER html %]_edit_container" class="edit_me bz_default_hidden"> (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>) </span> <script> - hideEditableField('[% field.name FILTER js %]_edit_container', - '[% field.name FILTER js %]_input_area', - '[% field.name FILTER js %]_edit_action', - '[% field.name FILTER js %]', + hideEditableField('[% field.name FILTER js %]_edit_container', + '[% field.name FILTER js %]_input_area', + '[% field.name FILTER js %]_edit_action', + '[% field.name FILTER js %]', '[% bug.${field.name}.join(', ') FILTER js %]'); </script> [% END %] </td> - + [% END %] [%############################################################################%] @@ -1160,7 +1159,7 @@ [% INCLUDE bug/field.html.tmpl field = bug_fields.deadline, value = bug.deadline, no_tds = 1 editable = bug.check_can_change_field('deadline', 0, 1) %] - </td> + </td> </tr> <tr> <td colspan="7" class="bz_summarize_time"> @@ -1169,7 +1168,7 @@ blocking this [% terms.bug %])</a> </td> </tr> - </table> + </table> [% END %] [%############################################################################%] @@ -1179,7 +1178,7 @@ [% BLOCK comment_box %] <div id="add_comment" class="bz_section_additional_comments"> [% IF user.id %] - <label for="comment" accesskey="c"><b>Additional + <label for="comment" accesskey="c"><b>Additional <u>C</u>omments</b></label>: [% IF user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %] @@ -1240,7 +1239,7 @@ before you can comment on or make changes to this [% terms.bug %]. </fieldset> </td> - </tr> + </tr> </table> [% END %] </div> @@ -1267,7 +1266,7 @@ [% BLOCK select %] <td> - [% IF bug.check_can_change_field(selname, 0, 1) + [% IF bug.check_can_change_field(selname, 0, 1) AND bug.choices.${selname}.size > 1 %] <input type="hidden" id="[% selname %]_dirty"> <select id="[% selname %]" name="[% selname %]"> @@ -1307,7 +1306,7 @@ [% val FILTER html %] [% END %] [% END %] - [% IF no_td != 1 %] + [% IF no_td != 1 %] </td> [% END %] [% END %] @@ -1315,7 +1314,7 @@ [% BLOCK commit_button %] [% IF user.id %] <div class="knob-buttons"> - <input type="submit" value="Save Changes" + <input type="submit" value="Save Changes" id="commit[% id FILTER css_class_quote %]"> </div> [% END %] diff --git a/template/en/default/bug/field-events.js.tmpl b/template/en/default/bug/field-events.js.tmpl index 3133c159b..64dbc3b7d 100644 --- a/template/en/default/bug/field-events.js.tmpl +++ b/template/en/default/bug/field-events.js.tmpl @@ -10,7 +10,7 @@ # # The Original Code is the Bugzilla Bug Tracking System. # - # The Initial Developer of the Original Code is the San Jose State + # The Initial Developer of the Original Code is the San Jose State # University Foundation. Portions created by the Initial Developer # are Copyright (C) 2008 the Initial Developer. All Rights Reserved. # diff --git a/template/en/default/bug/field-help.none.tmpl b/template/en/default/bug/field-help.none.tmpl index d52d598eb..782318c8f 100644 --- a/template/en/default/bug/field-help.none.tmpl +++ b/template/en/default/bug/field-help.none.tmpl @@ -63,11 +63,11 @@ cc => "Users who may not have a direct role to play on this $terms.bug, but who are interested in its progress.", -classification => +classification => "$terms.Bugs are categorised into Classifications, Products and" - _ " Components. classifications is the top-level categorisation.", + _ " Components. classifications is the top-level categorisation.", -component => +component => "Components are second-level categories; each belongs to a" _ " particular Product. Select a Product to narrow down this list.", @@ -123,10 +123,10 @@ qa_contact => remaining_time => "The number of hours of work left on this $terms.bug, calculated by - subtracting the $vars.field_descs.work_time from the + subtracting the $vars.field_descs.work_time from the ${vars.field_descs.estimated_time}.", -rep_platform => +rep_platform => "The hardware platform the $terms.bug was observed on.", reporter => @@ -144,7 +144,7 @@ see_also => <p>You should normally use this field to refer to $terms.bugs in <em>other</em> installations. For $terms.bugs in this - installation, it is better to use the $vars.field_descs.dependson and + installation, it is better to use the $vars.field_descs.dependson and $vars.field_descs.blocked fields.</p>", short_desc => @@ -217,7 +217,7 @@ email1 => [% END %] [% IF Param('useclassification') %] - [% vars.help_html.product = vars.help_html.product + [% vars.help_html.product = vars.help_html.product _ " Select a Classification to narrow down this list." %] [% END %] @@ -229,14 +229,14 @@ email1 => [% field_type_desc = BLOCK -%] [% field_types.$field_type FILTER html %] [%- END %] - [% vars.help_html.${help_field} = + [% vars.help_html.${help_field} = "A custom $field_type_desc field in this installation" _ " of ${terms.Bugzilla}." %] [% END %] [%# Add help for the search types, for query.cgi. %] [% type_desc = BLOCK %] - The type of [% vars.field_descs.${help_field} FILTER html %] search you + The type of [% vars.field_descs.${help_field} FILTER html %] search you would like. [% END %] [% SET type_name = help_field _ '_type' %] diff --git a/template/en/default/bug/field-label.html.tmpl b/template/en/default/bug/field-label.html.tmpl index 94180fabc..851935283 100644 --- a/template/en/default/bug/field-label.html.tmpl +++ b/template/en/default/bug/field-label.html.tmpl @@ -37,7 +37,7 @@ <label for="[% field.name FILTER html %]"[% IF accesskey %] accesskey="[% accesskey FILTER html %]"[% END %]> [% END %] - <a + <a [% IF help_html.${field.name}.defined %] title="[% help_html.${field.name} FILTER txt FILTER collapse FILTER html %]" class="field_help_link" diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 1d6048cdd..d15a6ea60 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -31,9 +31,9 @@ # allow_dont_change: display the --do_not_change-- option for select fields. # value_span: A colspan for the table cell containing # the field value. - # no_tds: boolean; if true, don't display the label <th> or the + # no_tds: boolean; if true, don't display the label <th> or the # wrapping <td> for the field. - # bug (optional): The current Bugzilla::Bug being displayed, or a hash + # bug (optional): The current Bugzilla::Bug being displayed, or a hash # with default field values being displayed on a page. #%] @@ -45,7 +45,7 @@ [% IF NOT no_tds %] [% PROCESS "bug/field-label.html.tmpl" %] <td class="field_value [% ' bz_hidden_field' IF hidden %]" - id="field_container_[% field.name FILTER html %]" + id="field_container_[% field.name FILTER html %]" [% " colspan=\"$value_span\"" FILTER none IF value_span %]> [% END %] [% Hook.process('start_field_column') %] @@ -85,7 +85,7 @@ </span> - [% IF value %] + [% IF value %] [% value FILTER bug_link(value, use_alias => 1) FILTER none %] [% END %] <span id="[% field.name FILTER html %]_edit_container" class="edit_me bz_default_hidden"> @@ -98,11 +98,11 @@ '[% field.name FILTER js %]', "[% value FILTER js %]"); </script> - [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT + [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT constants.FIELD_TYPE_MULTI_SELECT ] %] <input type="hidden" id="[% field.name FILTER html %]_dirty"> - <select id="[% field.name FILTER html %]" - name="[% field.name FILTER html %]" + <select id="[% field.name FILTER html %]" + name="[% field.name FILTER html %]" [% IF field.type == constants.FIELD_TYPE_MULTI_SELECT %] [% SET field_size = 5 %] [% IF field.legal_values.size < 5 %] @@ -125,7 +125,7 @@ [% END %] [% FOREACH legal_value = legal_values %] [% NEXT IF NOT legal_value.is_active AND NOT value.contains(legal_value.name).size %] - + [%# Purpose: hide field values from those who can't change them %] [% IF field.name.match("^cf_blocking_") OR field.name.match("^cf_status_") OR @@ -135,7 +135,7 @@ [% NEXT UNLESS bug.check_can_change_field(field.name, '---', legal_value.name) OR value.contains(legal_value.name).size %] [% END %] - + [% IF field.name == "resolution" && legal_value.name != bug.resolution %] [% r = legal_value.name %] @@ -149,7 +149,7 @@ [% END %] [% NEXT IF r == "EXPIRED" %] [% END %] - + <option value="[% legal_value.name FILTER html %]" id="v[% legal_value.id FILTER html %]_ [%- field.name FILTER html %]" @@ -257,10 +257,10 @@ [% CASE constants.FIELD_TYPE_TEXTAREA %] <div class="uneditable_textarea">[% value FILTER html %]</div> [% CASE constants.FIELD_TYPE_BUG_ID %] - [% IF value %] + [% IF value %] [% value FILTER bug_link(value, use_alias => 1) FILTER none %] [% END %] - [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT + [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT constants.FIELD_TYPE_MULTI_SELECT ] %] [% FOREACH val = value %] [% display_value(field.name, val) FILTER html %] diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 156798026..9c1f1385f 100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -17,7 +17,7 @@ # Contributor(s): Marc Schumann <wurblzap@gmail.com> #%] -[%# NOTE: Everywhere you use this template, you must call +[%# NOTE: Everywhere you use this template, you must call # "FILTER remove('^X')" on the result. This is unfortunately the only way # to preserve leading whitespace in comments. #%] diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index 16aa160f6..a49739928 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -31,7 +31,7 @@ editable = bug.choices.bug_status.size > 1 %] - [% IF bug.resolution + [% IF bug.resolution OR bug.check_can_change_field('resolution', bug.resolution, 1) %] <noscript><br>resolved as </noscript> @@ -65,7 +65,7 @@ </div> [% ELSIF bug.dup_id %] <noscript><br> duplicate</noscript> - <span id="duplicate_display">of + <span id="duplicate_display">of [% "${terms.bug} ${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %]</span> [% END %] </div> diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl index dc09848da..da70d49b9 100644 --- a/template/en/default/bug/link.html.tmpl +++ b/template/en/default/bug/link.html.tmpl @@ -54,8 +54,8 @@ [% anchor = "#c$comment_num" %] [% END %] -<a class="bz_bug_link - bz_status_[% bug.bug_status FILTER css_class_quote %] +<a class="bz_bug_link + bz_status_[% bug.bug_status FILTER css_class_quote %] [% ' bz_closed' IF !bug.isopened %]" title="[% link_title FILTER collapse FILTER html %]" href="[% urlbase FILTER html IF full_url %]show_bug.cgi?id= diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl index 9e0b2c1ab..80a603944 100644 --- a/template/en/default/bug/new_bug.html.tmpl +++ b/template/en/default/bug/new_bug.html.tmpl @@ -7,7 +7,7 @@ [% PROCESS global/variables.none.tmpl %] [% title = BLOCK %]Enter [% terms.Bug %] [% END %] -[% PROCESS bug_modal/common_header.html.tmpl +[% PROCESS bug_modal/common_header.html.tmpl title = title jquery = [ "selectize" ] jquery_css = [ "js/jquery/plugins/selectize/selectize.bootstrap3.css" ] @@ -82,7 +82,7 @@ editable = 1 help = "describecomponents.cgi?product=$filtered_product" %] - + <span aria-owns="product-name product-latch"> <span role="button" aria-label="show product information" aria-expanded="false" tabindex="0" class="spin-latch" id="product-latch" data-latch="product" data-for="product">▸</span> diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index 157cb44b4..95029a438 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -79,9 +79,9 @@ You have the following choices: <ul> <li> <form method="post" action="process_bug.cgi"> - <input type="hidden" name="delta_ts" + <input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]"> - [% PROCESS "global/hidden-fields.html.tmpl" + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_login|Bugzilla_password|delta_ts$" %] <input type="submit" id="process" value="Submit my changes anyway"> This will cause all of the above changes to be overwritten 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 1d2e8689f..01494ec84 100644 --- a/template/en/default/bug/process/verify-new-product.html.tmpl +++ b/template/en/default/bug/process/verify-new-product.html.tmpl @@ -48,23 +48,23 @@ exclude = '^' _ exclude_items.join('|') _ '$' %] <input type="hidden" name="confirm_product_change" value="1"> - + [%# Verify the version, component, and target milestone fields. %] <h3>Verify Version, Component - [%- ", Target Milestone" + [%- ", Target Milestone" IF Param("usetargetmilestone") && bug.check_can_change_field('target_milestone', 0, 1) %]</h3> <p> -[% IF Param("usetargetmilestone") - && bug.check_can_change_field('target_milestone', 0, 1) +[% IF Param("usetargetmilestone") + && bug.check_can_change_field('target_milestone', 0, 1) %] - You are moving the [% terms.bug %](s) to the product + You are moving the [% terms.bug %](s) to the product <b>[% product.name FILTER html %]</b>, and the version, component, and/or target milestone fields are no longer correct. Please set the correct version, component, and target milestone now: [% ELSE %] - You are moving the [% terms.bug %](s) to the product + You are moving the [% terms.bug %](s) to the product <b>[% product.name FILTER html %]</b>, and the version and component fields are no longer correct. Please set the correct version and component now: @@ -80,7 +80,7 @@ [% ELSE %] [% SET default_version = defaults.version %] [% END %] - [% PROCESS "global/select-menu.html.tmpl" + [% PROCESS "global/select-menu.html.tmpl" name="version" options=versions default=default_version @@ -99,8 +99,8 @@ default=default_component size=10 %] </td> - [% IF Param("usetargetmilestone") - && bug.check_can_change_field('target_milestone', 0, 1) + [% IF Param("usetargetmilestone") + && bug.check_can_change_field('target_milestone', 0, 1) %] <td> <b>Target Milestone:</b><br> @@ -117,7 +117,7 @@ [% IF verify_bug_groups %] <h3>Verify [% terms.Bug %] Group</h3> - + [% IF old_groups.size %] <p>These groups are not legal for the '[% product.name FILTER html %]' product or you are not allowed to restrict [% terms.bugs %] to these groups.<br> diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index a0a4ecbf1..add29adbc 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -63,7 +63,7 @@ [% BLOCK bug_display %] <h1> - [% terms.Bug %] + [% terms.Bug %] <a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]">[% bug.bug_id FILTER html %]</a> [% IF Param("usebugaliases") AND bug.alias AND NOT bug.error %] (<a href="show_bug.cgi?id=[% bug.alias FILTER uri %]"> @@ -245,7 +245,7 @@ </td> <td> [% PROCESS formattimeunit - time_unit=bug.estimated_time - + time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] </td> </tr> @@ -299,9 +299,9 @@ </tr> [% END %] [% END %] - + [% Hook.process("last_row", "bug/show-multiple.html.tmpl") %] - + </table> @@ -357,7 +357,7 @@ [% FOREACH c = bug.cc %] [% c FILTER email FILTER html %][% ", " IF not loop.last() %] [% END %] - [% ELSIF name == "reporter" || name == "assigned_to" + [% ELSIF name == "reporter" || name == "assigned_to" || name == "qa_contact" %] <th class="rightcell">[% field_descs.${name} FILTER html %]:</th> <td>[% bug.${name}.identity FILTER email FILTER html %]</td> diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl index c0f32d69e..cc10cf95e 100644 --- a/template/en/default/bug/show.xml.tmpl +++ b/template/en/default/bug/show.xml.tmpl @@ -27,9 +27,9 @@ <bugzilla version="[% constants.BUGZILLA_VERSION %]" urlbase="[% urlbase FILTER xml %]" - [%# Note that the maintainer's email is not filtered, + [%# Note that the maintainer's email is not filtered, # intentionally. Even logged-out users should be able - # to see that, since it will be in error messages anyway. + # to see that, since it will be in error messages anyway. %] maintainer="[% Param('maintainer') FILTER xml %]" [% IF user.id %] @@ -83,7 +83,7 @@ </long_desc> [% END %] [% END %] - + [% IF displayfields.attachment %] [% FOREACH a = bug.attachments %] [% NEXT IF a.isprivate && !user.is_insider %] @@ -112,7 +112,7 @@ </attachment> [% END %] [% END %] - + [% Hook.process("bug_end") %] </bug> @@ -151,7 +151,7 @@ [% BLOCK section_flags %] [% RETURN UNLESS displayfields.flag %] - + [% FOREACH flag = obj.flags %] <flag name="[% flag.type.name FILTER xml %]" id="[% flag.id FILTER xml %]" diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index 9f2742694..1efc8223e 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -27,10 +27,10 @@ [% header = title %] [% END %] -[% PROCESS global/header.html.tmpl - title = title +[% PROCESS global/header.html.tmpl + title = title generate_api_token = 1 - header = header + header = header style_urls = ["skins/standard/summarize-time.css"] doc_section = "timetracking.html" javascript_urls = [ "js/util.js", "js/field.js" ] @@ -100,7 +100,7 @@ [% END %] [% additional = "$global.owner_count.size developers @ - $global.bug_count.size $terms.bugs" %] + $global.bug_count.size $terms.bugs" %] [% INCLUDE section_total colspan=3 additional=additional %] </table> [% END %] @@ -161,7 +161,7 @@ [% subtotal = subtotal + work_time %] [% login_name = owner.login_name %] [% global.owner_count.$login_name = 1 %] - [% IF detailed %] + [% IF detailed %] [% cid = cid + 1 %] <tr class="owner_header[% 2 FILTER none IF cid % 2 %]"> <td> </td> @@ -279,8 +279,8 @@ <table> <tr> <td align="right"> - <b><label accesskey="s" - for="start_date">Period <u>s</u>tarting</label></b>: + <b><label accesskey="s" + for="start_date">Period <u>s</u>tarting</label></b>: </td><td colspan="3"> <input type="text" id="start_date" name="start_date" size="11" autofocus align="right" value="[% start_date FILTER html %]" maxlength="10" @@ -291,7 +291,7 @@ </button> <div id="con_calendar_start_date"></div> - <b>and <label accesskey="e" for="end_date"><u>e</u>nding</label></b>: + <b>and <label accesskey="e" for="end_date"><u>e</u>nding</label></b>: <input type="text" name="end_date" size="11" id="end_date" align="right" value ="[% end_date FILTER html %]" maxlength="10" onchange="updateCalendarFromField(this)"> @@ -312,11 +312,11 @@ </td><td colspan="2"> <input type="radio" name="group_by" id="number" value="number" [%+ 'checked="checked"' IF group_by == "number" - %]><label + %]><label for="number" accesskey="n">[% terms.Bug %] <u>N</u>umber</label> <input type="radio" name="group_by" id="owner" value="owner" [%+ 'checked="checked"' IF group_by == "owner" - %]><label + %]><label for="owner" accesskey="d"><u>D</u>eveloper</label> </td><td colspan="2"> <label for="ctype"><b>Format</b></label>: <select name="ctype" id="ctype"> diff --git a/template/en/default/config.js.tmpl b/template/en/default/config.js.tmpl index 0d6358312..b794678fe 100644 --- a/template/en/default/config.js.tmpl +++ b/template/en/default/config.js.tmpl @@ -75,7 +75,7 @@ var [% cf.name FILTER js %] = [ [% FOREACH x = cf.legal_values %]'[% x.name FILT // A list of all products and their components, versions, and target milestones: - + var component = new Object(); var version = new Object(); var target_milestone = new Object(); @@ -89,7 +89,7 @@ var target_milestone = new Object(); // Product and Component Exceptions // ================================ // -// A blacklist for some commonly used words or word fragments +// A blacklist for some commonly used words or word fragments // that occur in a product or component name but should *not* // trigger product/component search in QuickSearch. @@ -112,7 +112,7 @@ var component_exceptions = new Array( [% PROCESS "global/field-descs.none.tmpl" %] var field = [ [% FOREACH x = field %] - { name: '[% x.name FILTER js %]', + { name: '[% x.name FILTER js %]', description: '[% (field_descs.${x.name} OR x.description) FILTER js %]', [%-# These values are meaningful for custom fields only. %] [% IF x.custom %] diff --git a/template/en/default/email/bugmail-common.txt.tmpl b/template/en/default/email/bugmail-common.txt.tmpl index b6cadaf11..e65378b60 100644 --- a/template/en/default/email/bugmail-common.txt.tmpl +++ b/template/en/default/email/bugmail-common.txt.tmpl @@ -16,7 +16,7 @@ # # Contributor(s): Guy Pyrzak <guy.pyrzak@gmail.com> #%] - + [% PROCESS "global/field-descs.none.tmpl" %] [% field_label = field_descs.${change.field_name} %] @@ -35,4 +35,3 @@ [% IF change.field_name == 'longdescs.isprivate' %] [% field_label = field_label.replace('^(Comment )?', "Comment #${change.num} ") %] [% END %] -
\ No newline at end of file diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl index 679e705cd..b1a440e03 100644 --- a/template/en/default/email/bugmail-header.txt.tmpl +++ b/template/en/default/email/bugmail-header.txt.tmpl @@ -19,7 +19,7 @@ # Frédéric Buclin <LpSolit@gmail.com> # Guy Pyrzak <guy.pyrzak@gmail.com> #%] - + [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS "global/reason-descs.none.tmpl" %] [% isnew = bug.lastdiffed ? 0 : 1 %] diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index 8b567b691..51a862d37 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -16,7 +16,7 @@ # # Contributor(s): Guy Pyrzak <guy.pyrzak@gmail.com> #%] - + [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS "global/reason-descs.none.tmpl" %] diff --git a/template/en/default/email/lockout.txt.tmpl b/template/en/default/email/lockout.txt.tmpl index 94e9c74cb..ff40011b3 100644 --- a/template/en/default/email/lockout.txt.tmpl +++ b/template/en/default/email/lockout.txt.tmpl @@ -27,7 +27,7 @@ X-Bugzilla-Type: admin The address [% address %] failed too many login attempts ( [%- constants.MAX_LOGIN_ATTEMPTS +%]) for -the account [% locked_user.login %]. +the account [% locked_user.login %]. The login attempts occurred at these times: diff --git a/template/en/default/email/new-api-key.txt.tmpl b/template/en/default/email/new-api-key.txt.tmpl index aed904def..9ab13d90b 100644 --- a/template/en/default/email/new-api-key.txt.tmpl +++ b/template/en/default/email/new-api-key.txt.tmpl @@ -26,10 +26,7 @@ or update the key at the following URL: [%+ urlbase %]userprefs.cgi?tab=apikey -[% IF new_key.app_id == Param('mozreview_app_id') %] -This API key was automatically created by MozReview. If you did not recently log in to -MozReview, please disable the key at the above URL, and change your password immediately. -[% ELSIF new_key.app_id == Param('phabricator_app_id') %] +[% IF new_key.app_id == Param('phabricator_app_id') %] This API key was automatically created by Mozilla's Phabricator instance. If you did not recently log in to Phabricator, please disable the key at the above URL, and change your password immediately. [% ELSE %] diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl index 74fbc4976..9e1290ac9 100644 --- a/template/en/default/email/sudo.txt.tmpl +++ b/template/en/default/email/sudo.txt.tmpl @@ -27,7 +27,7 @@ Subject: [[% terms.Bugzilla %]] Your account [% user.login -%] is being impersonated X-Bugzilla-Type: admin - [%+ sudoer.identity %] has used the 'sudo' feature to access + [%+ sudoer.identity %] has used the 'sudo' feature to access [%+ terms.Bugzilla %] using your account. [% IF reason %] @@ -38,6 +38,6 @@ X-Bugzilla-Type: admin [%+ sudoer.identity %] did not provide a reason for doing this. [% END %] - If you feel that this action was inappropriate, please contact -[%+ Param("maintainer") %]. For more information on this feature, + If you feel that this action was inappropriate, please contact +[%+ Param("maintainer") %]. For more information on this feature, visit <[% urlbase %]page.cgi?id=sudo.html>. diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl index 32d8da8a0..b29bef663 100644 --- a/template/en/default/email/whine.txt.tmpl +++ b/template/en/default/email/whine.txt.tmpl @@ -26,7 +26,7 @@ X-Bugzilla-Type: whine [This e-mail has been automatically generated.] -You have one or more [% terms.bugs %] assigned to you in the [% terms.Bugzilla %] +You have one or more [% terms.bugs %] assigned to you in the [% terms.Bugzilla %] [% terms.bug %] tracking system ([% urlbase %]) that require attention. @@ -50,7 +50,7 @@ it if you like!): [% urlbase %]buglist.cgi?bug_status=CONFIRMED&assigned_to=[% email %] -Or, you can use the general query page, at +Or, you can use the general query page, at [%+ urlbase %]query.cgi Appended below are the individual URLs to get to all of your [% display_value("bug_status", "CONFIRMED") %] [%+ terms.bugs %] diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl index ebeb73719..7f0383c67 100644 --- a/template/en/default/extensions/extension.pm.tmpl +++ b/template/en/default/extensions/extension.pm.tmpl @@ -23,7 +23,7 @@ use B[% %]ugzilla::Extension::[% name %]::Util; our $VERSION = '0.01'; -# See the documentation of B[% %]ugzilla::Hook ("perldoc B[% %]ugzilla::Hook" +# See the documentation of B[% %]ugzilla::Hook ("perldoc B[% %]ugzilla::Hook" # in the bugzilla directory) for a list of all available hooks. sub install_update_db { my ($self, $args) = @_; diff --git a/template/en/default/extensions/hook-readme.txt.tmpl b/template/en/default/extensions/hook-readme.txt.tmpl index 63e09e419..d99375cfa 100644 --- a/template/en/default/extensions/hook-readme.txt.tmpl +++ b/template/en/default/extensions/hook-readme.txt.tmpl @@ -8,6 +8,6 @@ Template hooks go in this directory. Template hooks are called in normal [%+ terms.Bugzilla %] templates like [[% '%' %] Hook.process('some-hook') %]. -More information about them can be found in the documentation of +More information about them can be found in the documentation of B[% %]ugzilla::Extension. (Do "perldoc B[% %]ugzilla::Extension" from the main [%+ terms.Bugzilla %] directory to see that documentation.) diff --git a/template/en/default/extensions/name-readme.txt.tmpl b/template/en/default/extensions/name-readme.txt.tmpl index 5403bab7f..b8d6d3c5d 100644 --- a/template/en/default/extensions/name-readme.txt.tmpl +++ b/template/en/default/extensions/name-readme.txt.tmpl @@ -18,7 +18,7 @@ That would be how to load a file called some-template.html.tmpl that was in this directory. Note that you have to be careful that the full path of your template -never conflicts with a template that exists in [% terms.Bugzilla %] or in +never conflicts with a template that exists in [% terms.Bugzilla %] or in another extension, or your template might override that template. That's why we created this directory called '[% name FILTER lower %]' for you, so you can put your templates in here to help avoid conflicts. diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl index 3493007f4..7aa9f8c6c 100644 --- a/template/en/default/extensions/util.pm.tmpl +++ b/template/en/default/extensions/util.pm.tmpl @@ -18,10 +18,10 @@ use 5.10.1; use strict; use parent qw(Exporter); our @EXPORT = qw( - + ); -# This file can be loaded by your extension via +# This file can be loaded by your extension via # "use B[% %]ugzilla::Extension::[% name %]::Util". You can put functions # used by your extension in here. (Make sure you also list them in # @EXPORT.) diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 6e411add9..bf1c8a6b3 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -131,6 +131,7 @@ title="[% type.description FILTER html %]" onchange="toggleRequesteeField(this);" class="flag_select flag_type-[% type.id %]" + data-id="[% type.id %]" data-name="[% type.name FILTER html FILTER no_break %]" [% IF !can_edit_flag %] disabled="disabled"[% END %]> [%# Only display statuses the user is allowed to set. %] [% IF !flag diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl index fbac48479..b3007a172 100644 --- a/template/en/default/global/choose-classification.html.tmpl +++ b/template/en/default/global/choose-classification.html.tmpl @@ -32,7 +32,7 @@ <tr> <th align="right"> <a href="[% target FILTER uri %]?classification=__all - [% IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] + [% IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] [%- IF format %]&format=[% format FILTER uri %][% END %]"> All</a>: </th> @@ -47,7 +47,7 @@ <tr> <th align="right"> <a href="[% target FILTER uri %]?classification=[% class.name FILTER uri -%] - [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] + [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] [%- IF format %]&format=[% format FILTER uri %][% END %]"> [% class.name FILTER html %]</a>: </th> diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index ae00bf503..8cd23a910 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -56,7 +56,7 @@ <tr> <th align="right" valign="top"> <a href="[% target %]?product=[% p.name FILTER uri -%] - [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] + [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] [%- IF format %]&format=[% format FILTER uri %][% END %]"> [% p.name FILTER html FILTER no_break %]</a>: </th> diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index b37e7ca7b..8aaf10127 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -315,7 +315,7 @@ [% ELSIF error == "jobqueue_status_error" %] An error occurred while checking the job queue status. Try again at a - later time. + later time. [% ELSIF error == "ldap_bind_failed" %] Failed to bind to the LDAP server. The error message was: @@ -514,13 +514,15 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] -[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] - [% error_message FILTER none %] - [% ELSE %] - [% error_message FILTER txt %] +[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %] + [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] + [% RETURN %] [% END %] - [% RETURN %] [% END %] [% UNLESS header_done %] diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index b74dd5ded..71d0dbacb 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -60,7 +60,7 @@ [% USE Bugzilla %] - <form method="post" + <form method="post" [% IF script -%] action="[% script %]" [%- END -%] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 9db9a1404..5db263981 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -98,7 +98,6 @@ <meta charset="UTF-8"> [% END %] [% USE Bugzilla %] - <base href="[% urlbase FILTER html %]"> [% IF Bugzilla.cgi.should_block_referrer %] <meta name="referrer" content="origin"> @@ -107,6 +106,10 @@ [% END %] [%- js_BUGZILLA = { + user => { + # TODO: Move all properties form bug_modal/header.html.tmpl + login => user.login, + }, param => { maxattachmentsize => Param('maxattachmentsize'), maxusermatches => Param('maxusermatches'), @@ -242,6 +245,40 @@ #%] <div id="wrapper"> + +<aside id="message-container" role="complementary"> + <noscript> + <div class="noscript"> + <div class="inner"> + <p>Please enable JavaScript in your browser to use all the features on this site.</p> + </div> + </div> + </noscript> + [% IF Bugzilla.request_cache.mfa_warning + AND user.mfa_required_date + AND NOT Bugzilla.request_cache.on_mfa_page %] + <div class="warning"> + <div class="inner"> + <p> + Please <a href="userprefs.cgi?tab=mfa">enable two-factor authentication</a> + [% IF Param('mfa_group_grace_period') %] + before <i>[% user.mfa_required_date FILTER time %]</i>. + [% ELSE %] + now. + [% END %] + </p> + </div> + </div> + [% END %] + [% IF Param('announcehtml') %] + <div class="announcement"> + <div class="inner"> + [% Param('announcehtml') FILTER none %] + </div> + </div> + [% END %] +</aside> + <header id="header" role="banner"> <div class="inner"> <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1> @@ -342,12 +379,10 @@ <li role="presentation"> <a href="userprefs.cgi" role="menuitem" tabindex="-1">Preferences</a> </li> - [% IF user.authorizer.can_logout %] - <li role="separator"></li> - <li role="presentation"> - <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a> - </li> - [% END %] + <li role="separator"></li> + <li role="presentation"> + <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a> + </li> [% IF sudoer %] <li role="presentation"> <a href="relogin.cgi?action=end-sudo" role="menuitem" tabindex="-1">End sudo session impersonating [% user.login FILTER html %]</a> @@ -369,19 +404,6 @@ </div> </header> [%# header %] -[% IF Bugzilla.request_cache.mfa_warning - AND user.mfa_required_date - AND NOT Bugzilla.request_cache.on_mfa_page %] - <aside id="mfa-warning"> - Please <a href="userprefs.cgi?tab=mfa">enable two-factor authentication</a> - [% IF Param('mfa_group_grace_period') %] - before <i>[% user.mfa_required_date FILTER time %]</i>. - [% ELSE %] - now. - [% END %] - </aside> -[% END %] - <main id="bugzilla-body" tabindex="-1"> <div id="main-inner"> @@ -392,10 +414,6 @@ <h2>[% header FILTER none %]</h2> [% END %] -[% IF Param('announcehtml') %] -[% Param('announcehtml') FILTER none %] -[% END %] - [% IF message %] <div id="message">[% message %]</div> [% END %] diff --git a/template/en/default/global/reason-descs.none.tmpl b/template/en/default/global/reason-descs.none.tmpl index 426085f0d..b79a5bbb4 100644 --- a/template/en/default/global/reason-descs.none.tmpl +++ b/template/en/default/global/reason-descs.none.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/template/en/default/global/select-menu.html.tmpl b/template/en/default/global/select-menu.html.tmpl index f8d4d68e2..64d8b9a46 100644 --- a/template/en/default/global/select-menu.html.tmpl +++ b/template/en/default/global/select-menu.html.tmpl @@ -24,25 +24,25 @@ # multiple: boolean; whether or not the menu is multi-select # # size: integer; the number of items to display at once - # + # # options: array or hash; the items with which to populate the array. # If a hash is passed, the hash keys become the names displayed # to the user while the hash values become the value of the item. - # + # # default: string; the item selected in the menu by default. - # + # # onchange: code; JavaScript to be run when the user changes the value # selected in the menu. #%] - -[%# Get the scalar representation of the options reference, + +[%# Get the scalar representation of the options reference, # which looks like "ARRAY(0xA352BA3F)" or "HASH(0xA352BA3F)", # so we can figure out whether it is a reference to an array # or a hash. #%] [% options_type = BLOCK %][% options %][% END %] -<select name="[% name FILTER html %]" +<select name="[% name FILTER html %]" [% IF onchange %]onchange="[% onchange FILTER html %]"[% END %] [% IF multiple %] multiple [% END %] [% IF size %] size="[% size %]" [% END %]> @@ -55,7 +55,7 @@ [% END %] [% ELSIF options_type.search("HASH") %] [% FOREACH option = options %] - <option value="[% option.value FILTER html %]" + <option value="[% option.value FILTER html %]" [% " selected" IF option.value == default %]> [% option.key FILTER html %] </option> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index c6efb5649..53de6a420 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1037,6 +1037,10 @@ [% title = "Invalid Authentication Method" %] API key authentication is required. + [% ELSIF error == "invalid_params" %] + [% title = "Invalid Params" %] + API method received invalid params: [% type_error FILTER html %] + [% ELSIF error == "bug_id_does_not_exist" %] [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] [% terms.Bug %] [%= bug_id FILTER html %] does not exist. @@ -1982,13 +1986,15 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] -[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] - [% error_message FILTER none %] - [% ELSE %] - [% error_message FILTER txt %] +[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %] + [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] + [% RETURN %] [% END %] - [% RETURN %] [% END %] [% UNLESS header_done %] diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl index 876d12805..2750ce8f7 100644 --- a/template/en/default/global/user.html.tmpl +++ b/template/en/default/global/user.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2007 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Daniel Brooks <db48x@db48x.net> # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/template/en/default/global/value-descs.js.tmpl b/template/en/default/global/value-descs.js.tmpl index b0fb1d4d2..e0e40da04 100644 --- a/template/en/default/global/value-descs.js.tmpl +++ b/template/en/default/global/value-descs.js.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/template/en/default/global/value-descs.none.tmpl b/template/en/default/global/value-descs.none.tmpl index 56c90ac35..5bcfc3f15 100644 --- a/template/en/default/global/value-descs.none.tmpl +++ b/template/en/default/global/value-descs.none.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is BugzillaSource, Inc. - # Portions created by the Initial Developer are Copyright (C) 2011 + # Portions created by the Initial Developer are Copyright (C) 2011 # the Initial Developer. All Rights Reserved. # # Contributor(s): diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index 93002efa3..c57dac890 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -18,13 +18,13 @@ # Contributor(s): #%] -[%# This is a list of terms that may be changed to "brand" the Bugzilla +[%# This is a list of terms that may be changed to "brand" the Bugzilla # instance (for example, referring to "bugs" as "issues".) When used, these - # strings are used in several different types of content, and are not - # protected with Template-Toolkit FILTERs. Consequently, no special + # strings are used in several different types of content, and are not + # protected with Template-Toolkit FILTERs. Consequently, no special # characters are allowed. # - # Remember to PROCESS rather than INCLUDE this template. + # Remember to PROCESS rather than INCLUDE this template. #%] [% terms = { diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 2aff68615..6dbdabc0c 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -27,7 +27,7 @@ [% USE Bugzilla %] [% PROCESS global/header.html.tmpl title = "$terms.Bugzilla Main Page" - header = "Main Page" + header = "Main Page" style_urls = [ 'skins/standard/index.css' ] no_yui = 1 og_image = "extensions/OpenGraph/web/moz-social-bw-rgb-1200x1200.png" @@ -39,21 +39,50 @@ <td> <h1 id="welcome"> Welcome to [% terms.Bugzilla %]</h1> <div class="intro">[% Hook.process('intro') %]</div> - <a id="enter_bug" class="bz_common_actions" - href="enter_bug.cgi"><span>File [% terms.aBug %]</span></a> - <a id="query" class="bz_common_actions" - href="query.cgi"><span>Search</span></a> - <a id="account" class="bz_common_actions" - [% IF user.id %] - href="userprefs.cgi"><span>User Preferences</span></a> - [% ELSIF Param('createemailregexp') - && user.authorizer.user_can_create_account - %] - href="createaccount.cgi"><span>Open a New Account</span></a> - [% ELSE %] - href="?GoAheadAndLogIn=1"><span>Log In</span></a> - [% END %] - + <ul id="tiles"> + [% IF Param('docs_urlbase') %] + <li id="tile-docs"> + <a href="[% docs_urlbase FILTER html %]"> + <span class="icon" aria-hidden="true"></span> + <span class="label">Documentation</span> + </a> + </li> + [% END %] + <li id="tile-search"> + <a href="query.cgi"> + <span class="icon" aria-hidden="true"></span> + <span class="label">Advanced Search</span> + </a> + </li> + <li id="tile-new-bug"> + <a href="enter_bug.cgi"> + <span class="icon" aria-hidden="true"></span> + <span class="label">New [% terms.Bug %]</span> + </a> + </li> + [% IF user.id %] + <li id="tile-prefs"> + <a href="userprefs.cgi"> + <span class="icon" aria-hidden="true"></span> + <span class="label">Preferences</span> + </a> + </li> + [% ELSIF Param('createemailregexp') && user.authorizer.user_can_create_account %] + <li id="tile-new-account"> + <a href="createaccount.cgi"> + <span class="icon" aria-hidden="true"></span> + <span class="label">New Account</span> + </a> + </li> + [% ELSE %] + <li id="tile-login"> + <a href="?GoAheadAndLogIn=1"> + <span class="icon" aria-hidden="true"></span> + <span class="label">Log In</span> + </a> + </li> + [% END %] + </ul> <form id="quicksearchForm" name="quicksearchForm" action="buglist.cgi" data-no-csrf> <div> <input id="quicksearch_main" type="text" name="quicksearch" autofocus diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl index d1aada24c..418bf09c8 100644 --- a/template/en/default/list/change-columns.html.tmpl +++ b/template/en/default/list/change-columns.html.tmpl @@ -61,9 +61,9 @@ </tr> <tr> <td> - <select name="available_columns" id="available_columns" + <select name="available_columns" id="available_columns" size="15" multiple="multiple" onchange="updateView();" - class="bz_default_hidden"> + class="bz_default_hidden"> </select> </td> <td> @@ -76,7 +76,7 @@ onclick="move_deselect()">←</button> </td> <td> - <select name="selected_columns" id="selected_columns" + <select name="selected_columns" id="selected_columns" size="15" multiple="multiple" onchange="updateView();"> [% FOREACH column = collist %] <option value="[% column FILTER html %]" selected="selected"> @@ -126,9 +126,9 @@ value="[% saved_search.id FILTER html%]"> <input type="hidden" name="token" value="[% issue_hash_token([saved_search.id, saved_search.name]) FILTER html %]"> - <input type="checkbox" id="save_columns_for_search" checked="checked" + <input type="checkbox" id="save_columns_for_search" checked="checked" name="save_columns_for_search" value="1"> - <label for="save_columns_for_search">Save this column list only + <label for="save_columns_for_search">Save this column list only for search '[% saved_search.name FILTER html %]'</label> </p> [% ELSE %] @@ -140,7 +140,7 @@ <input type="submit" id="change" value="Change Columns"> </p> - <input type="submit" id="resetit" name="resetit" + <input type="submit" id="resetit" name="resetit" value="Reset to [% terms.Bugzilla %] default"> </form> diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index ead3ff54c..ae1dade52 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -136,7 +136,7 @@ </td> [% END %] </tr> - + <tr> <th><label for="bug_status">Status:</label></th> <td colspan="3">[% PROCESS status_section %]</td> @@ -150,7 +150,7 @@ value="[% dontchange FILTER html %]" size="6"> </td> - [% PROCESS bug/field.html.tmpl + [% PROCESS bug/field.html.tmpl field = bug_fields.deadline, value = dontchange editable = 1, allow_dont_change = 1 %] </tr> @@ -274,7 +274,7 @@ <b>Status Whiteboard:</b> </td> <td colspan="7"> - <input name="status_whiteboard" + <input name="status_whiteboard" value="[% dontchange FILTER html %]" size="60"> </td> </tr> @@ -348,14 +348,14 @@ [% FOREACH group = groups %] <tr> <td align="center"> - <input type="checkbox" name="defined_groups" + <input type="checkbox" name="defined_groups" id="defined_group_[% group.id %]" value="[% group.name FILTER html %]" onchange="turn_off(this, 'group_[% group.id %]')"> </td> [% IF group.is_active %] <td align="center"> - <input type="checkbox" name="groups" + <input type="checkbox" name="groups" id="group_[% group.id FILTER html %]" value="[% group.name FILTER html %]" onchange="turn_off(this, 'defined_group_[% group.id %]')"> @@ -410,10 +410,10 @@ [% all_open_bugs = !current_bug_statuses.containsany(closedstates) %] [% all_closed_bugs = !current_bug_statuses.containsany(openstates) %] [% closed_status_array = [] %] - - <select name="bug_status" id="bug_status"> + + <select name="bug_status" id="bug_status"> <option value="[% dontchange FILTER html %]" selected="selected">[% dontchange FILTER html %]</option> - + [% FOREACH bug_status = new_bug_statuses %] <option value="[% bug_status.name FILTER html %]"> [% display_value("bug_status", bug_status.name) FILTER html %] @@ -423,14 +423,14 @@ [% closed_status_array.push( filtered_status ) %] [% END %] [% END %] - + [%# If all the bugs being changed are closed, allow the user to change their resolution. %] [% IF all_closed_bugs %] [% filtered_status = dontchange FILTER js %] [% closed_status_array.push( filtered_status ) %] [% END %] </select> - + <span id="resolution_settings"> <select id="resolution" name="resolution"> <option value="[% dontchange FILTER html %]" selected >[% dontchange FILTER html %]</option> diff --git a/template/en/default/list/list.atom.tmpl b/template/en/default/list/list.atom.tmpl index ed0c660af..5568b7bff 100644 --- a/template/en/default/list/list.atom.tmpl +++ b/template/en/default/list/list.atom.tmpl @@ -20,7 +20,7 @@ # Jason Remillard <jremillardshop@letterboxes.org> # Phil Ringnalda <bugzilla@philringnalda.com> # - # This is a template for generating an Atom representation of a buglist. + # This is a template for generating an Atom representation of a buglist. #%] [% PROCESS "global/field-descs.none.tmpl" %] diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 09a6c3601..fe4354a61 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -30,11 +30,11 @@ [% PROCESS "global/field-descs.none.tmpl" %] -[% title = "$terms.Bug List" %] -[% IF searchname || defaultsavename %] - [% title = title _ ": " _ (searchname OR defaultsavename) FILTER html %] -[% ELSIF quicksearch %] - [% title = title _ ": " _ quicksearch FILTER html %] +[% DEFAULT title = "$terms.Bug List" %] +[% IF searchname || defaultsavename || quicksearch %] + [% title = title _ ": " _ (searchname || defaultsavename || quicksearch) FILTER html %] +[% ELSE %] + [% title = title FILTER html %] [% END %] [% qorder = order FILTER uri IF order %] @@ -49,7 +49,7 @@ title = title generate_api_token = dotweak style = style - atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom" + atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom" javascript_urls = [ "js/util.js", "js/field.js" ] style_urls = [ "skins/standard/buglist.css" ] doc_section = "query.html#list" @@ -90,8 +90,8 @@ [% END %] [% SET shown_types = [ - 'notequals', 'regexp', 'notregexp', 'lessthan', 'lessthaneq', - 'greaterthan', 'greaterthaneq', 'changedbefore', 'changedafter', + 'notequals', 'regexp', 'notregexp', 'lessthan', 'lessthaneq', + 'greaterthan', 'greaterthaneq', 'changedbefore', 'changedafter', 'changedfrom', 'changedto', 'changedby', 'notsubstring', 'nowords', 'nowordssubstr', 'notmatches', 'isempty', 'isnotempty' ] %] @@ -144,7 +144,7 @@ [% PROCESS num_results %] [% IF bugs.size == 0 %] - <p>We couldn't find any [% terms.bugs %] matching your search terms. + <p>We couldn't find any [% terms.bugs %] matching your search terms. You could try searching with fewer or different terms.</p> <ul class="zero_result_links"> <li>[% PROCESS enter_bug_link %]</li> @@ -208,7 +208,7 @@ [% END %] [% END %] </td> - + <td> </td> [% END %] @@ -242,7 +242,7 @@ <td valign="middle" class="bz_query_edit"> <a href="[% PROCESS edit_search_url %]">Edit Search</a> </td> - + [% IF searchtype == "saved" %] <td valign="middle" nowrap="nowrap" class="bz_query_forget"> | @@ -253,20 +253,20 @@ </td> [% ELSE %] <td> </td> - + <td valign="middle" class="bz_query_remember"> <form method="get" action="buglist.cgi"> - <input type="submit" id="remember" value="Remember search"> as - <input type="hidden" name="newquery" + <input type="submit" id="remember" value="Remember search"> as + <input type="hidden" name="newquery" value="[% urlquerypart FILTER html %][% "&order=$qorder" FILTER html IF order %]"> <input type="hidden" name="cmdtype" value="doit"> <input type="hidden" name="remtype" value="asnamed"> <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]"> <input type="text" id="save_newqueryname" name="newqueryname" size="20" - title="New query name" value="[% defaultsavename FILTER html %]"> - </form> + title="New query name" value="[% defaultsavename FILTER html %]"> + </form> </td> - [% END %] + [% END %] </tr> </table> diff --git a/template/en/default/list/list.rdf.tmpl b/template/en/default/list/list.rdf.tmpl index d7879a694..195e0883d 100644 --- a/template/en/default/list/list.rdf.tmpl +++ b/template/en/default/list/list.rdf.tmpl @@ -32,17 +32,17 @@ <Seq> [% FOREACH bug = bugs %] <li> - + <bz:bug rdf:about="[% urlbase FILTER xml %]show_bug.cgi?id=[% bug.bug_id %]"> - + <bz:id nc:parseType="Integer">[% bug.bug_id %]</bz:id> - + [% FOREACH column = displaycolumns %] <bz:[% column %]>[% bug.$column FILTER html %]</bz:[% column %]> [% END %] - + </bz:bug> - + </li> [% END %] diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl index 8714fec7d..2f9cac9b8 100644 --- a/template/en/default/list/quips.html.tmpl +++ b/template/en/default/list/quips.html.tmpl @@ -58,7 +58,7 @@ <p> - [% terms.Bugzilla %] will pick a random quip for the headline on each + [% terms.Bugzilla %] will pick a random quip for the headline on each [% terms.bug %] list. </p> @@ -100,7 +100,7 @@ <h2>Edit existing quips:</h2> <p> <strong>Note:</strong> Only approved quips will be shown. - If the parameter 'quip_list_entry_control' is set to <q>open</q>, + If the parameter 'quip_list_entry_control' is set to <q>open</q>, entered quips are automatically approved. </p> <form name="editform" method="post" action="quips.cgi"> diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 486f3a00a..66ce442b9 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -23,7 +23,7 @@ [%# Initialization #%] [%############################################################################%] -[%# Don't display the table or do any processing if there are no bugs +[%# Don't display the table or do any processing if there are no bugs # to display %] [% RETURN IF !bugs.size %] @@ -43,34 +43,34 @@ [% field_descs.qa_contact_realname = field_descs.qa_contact %] [%# Setting maxlength => 0 means no limit. We set it for performance reasons. %] -[% abbrev = +[% abbrev = { - "bug_severity" => { maxlength => 3 , title => "Sev" } , - "priority" => { maxlength => 7 , title => "Pri" } , - "rep_platform" => { maxlength => 3 , title => "Plt" } , - "bug_status" => { maxlength => 4 } , - "assigned_to" => { maxlength => 30 , ellipsis => "..." } , - "assigned_to_realname" => { maxlength => 20 , ellipsis => "..." } , - "reporter" => { maxlength => 30 , ellipsis => "..." } , - "reporter_realname" => { maxlength => 20 , ellipsis => "..." } , - "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , - "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "QAContact" } , - "resolution" => { maxlength => 4 } , + "bug_severity" => { maxlength => 3 , title => "Sev" } , + "priority" => { maxlength => 7 , title => "Pri" } , + "rep_platform" => { maxlength => 3 , title => "Plt" } , + "bug_status" => { maxlength => 4 } , + "assigned_to" => { maxlength => 30 , ellipsis => "..." } , + "assigned_to_realname" => { maxlength => 20 , ellipsis => "..." } , + "reporter" => { maxlength => 30 , ellipsis => "..." } , + "reporter_realname" => { maxlength => 20 , ellipsis => "..." } , + "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , + "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "QAContact" } , + "resolution" => { maxlength => 4 } , "short_desc" => { maxlength => 0, wrap => 1 } , "short_short_desc" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , - "status_whiteboard" => { maxlength => 0, title => "Whiteboard" , wrap => 1 } , + "status_whiteboard" => { maxlength => 0, title => "Whiteboard" , wrap => 1 } , "keywords" => { maxlength => 0, wrap => 1 } , "dependson" => { maxlength => 0, wrap => 1 } , "blocked" => { maxlength => 0, wrap => 1 } , "flagtypes.name" => { maxlength => 0, wrap => 1 } , - "component" => { maxlength => 8 , title => "Comp" } , - "product" => { maxlength => 8 } , - "version" => { maxlength => 5 , title => "Vers" } , - "op_sys" => { maxlength => 4 } , - "bug_file_loc" => { maxlength => 30 } , - "target_milestone" => { maxlength => 0, title => "TargetM" } , + "component" => { maxlength => 8 , title => "Comp" } , + "product" => { maxlength => 8 } , + "version" => { maxlength => 5 , title => "Vers" } , + "op_sys" => { maxlength => 4 } , + "bug_file_loc" => { maxlength => 30 } , + "target_milestone" => { maxlength => 0, title => "TargetM" } , "longdescs.count" => { maxlength => 0, title => "# Comments" }, - "percentage_complete" => { maxlength => 0, format_value => "%d %%" } , + "percentage_complete" => { maxlength => 0, format_value => "%d %%" } , } %] @@ -84,7 +84,7 @@ [% tableheader = BLOCK %] <table class="bz_buglist sortable" cellspacing="0" cellpadding="4" width="100%"> - <thead> + <thead> <tr class="bz_buglist_header bz_first_buglist_header"> [% IF dotweak %] <th class="sorttable_nosort"> </th> @@ -221,16 +221,16 @@ [% IF col_abbrev.maxlength %] <span title="[%- display_value(column, bug.$column) FILTER html %]"> [% END %] - [% IF col_abbrev.format_value %] - [%- bug.$column FILTER format(col_abbrev.format_value) FILTER html -%] + [% IF col_abbrev.format_value %] + [%- bug.$column FILTER format(col_abbrev.format_value) FILTER html -%] [% ELSIF column == 'actual_time' || column == 'remaining_time' || column == 'estimated_time' %] - [% PROCESS formattimeunit time_unit=bug.$column %] + [% PROCESS formattimeunit time_unit=bug.$column %] [%# Display the login name of the user if their real name is empty. %] [% ELSIF column.match('_realname$') && bug.$column == '' %] [% SET login_column = column.remove('_realname$') %] - [% bug.${login_column}.truncate(col_abbrev.maxlength, + [% bug.${login_column}.truncate(col_abbrev.maxlength, col_abbrev.ellipsis) FILTER html %] [% ELSIF column == 'short_desc' || column == "short_short_desc" %] <a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]"> diff --git a/template/en/default/pages/bug-writing.html.tmpl b/template/en/default/pages/bug-writing.html.tmpl index ec997be0a..e422f4bb1 100644 --- a/template/en/default/pages/bug-writing.html.tmpl +++ b/template/en/default/pages/bug-writing.html.tmpl @@ -29,7 +29,7 @@ [% INCLUDE global/header.html.tmpl title = "$terms.Bug Writing Guidelines" %] - <p>Effective [% terms.bug %] reports are the most likely to be fixed. + <p>Effective [% terms.bug %] reports are the most likely to be fixed. These guidelines explain how to write such reports. <h3>Principles</h3> @@ -38,7 +38,7 @@ <li>Be precise</li> <li>Be clear - explain it so others can reproduce the [% terms.bug %]</li> <li>One [% terms.bug %] per report</li> - <li>No [% terms.bug %] is too trivial to report - + <li>No [% terms.bug %] is too trivial to report - small [% terms.bugs %] may hide big [% terms.bugs %]</li> <li>Clearly separate fact from speculation</li> </ul> @@ -50,48 +50,48 @@ software, to see whether it has already been fixed. </li> - <li><a href="query.cgi?format=specific">Search</a> + <li><a href="query.cgi?format=specific">Search</a> [% terms.Bugzilla %], to see whether your [% terms.bug %] has already been reported.</li> </ol> <h3>Reporting a New [% terms.Bug %]</h3> -<p>If you have reproduced the [% terms.bug %] in a recent build and +<p>If you have reproduced the [% terms.bug %] in a recent build and no-one else appears to have reported it, then:</p> <ol> - <li>Choose + <li>Choose "<a href="enter_bug.cgi">Enter a new [% terms.bug %]</a>"</li> <li>Select the product in which you've found the [% terms.bug %]</li> <li>Fill out the form. Here is some help understanding it:</li> </ol> <blockquote> - <p><b>Component:</b> In which sub-part of the software does it + <p><b>Component:</b> In which sub-part of the software does it exist?<br> This field is required. - Click the word "Component" to see a description of each + Click the word "Component" to see a description of each component. If none seems appropriate, look for a "General" component.</p> - <p><b>OS:</b> On which operating system (OS) did you find + <p><b>OS:</b> On which operating system (OS) did you find it? (e.g. Linux, Windows XP, Mac OS X.)<br> - If you know the [% terms.bug %] happens on more than one type of - operating system, choose <em>[% display_value("op_sys", "All") FILTER html %]</em>. + If you know the [% terms.bug %] happens on more than one type of + operating system, choose <em>[% display_value("op_sys", "All") FILTER html %]</em>. If your OS isn't listed, choose <em>[% display_value("op_sys", "Other") FILTER html %]</em>.</p> - <p><b>Summary:</b> How would you describe the [% terms.bug %], in + <p><b>Summary:</b> How would you describe the [% terms.bug %], in approximately 60 or fewer characters?<br> A good summary should <b>quickly and uniquely identify [% terms.abug %] report</b>. It should explain the problem, not your suggested solution.<br> <ul> - <li>Good: "<tt>Cancelling a File Copy dialog crashes + <li>Good: "<tt>Cancelling a File Copy dialog crashes File Manager</tt>"</li> <li>Bad: "<tt>Software crashes</tt>"</li> <li>Bad: "<tt>Browser should work with my web site</tt>"</li> </ul> - + <b>Description:</b> The details of your problem report, including:</p> @@ -110,12 +110,12 @@ Drag-selecting any page crashes Mac builds in the NSGetFactory function. <blockquote> <pre> -1) View any web page. (I used the default sample page, +1) View any web page. (I used the default sample page, resource:/res/samples/test0.html) -2) Drag-select the page. (Specifically, while holding down -the mouse button, drag the mouse pointer downwards from any -point in the browser's content region to the bottom of the +2) Drag-select the page. (Specifically, while holding down +the mouse button, drag the mouse pointer downwards from any +point in the browser's content region to the bottom of the browser's content region.) </pre> </blockquote> @@ -134,7 +134,7 @@ The application crashed. <blockquote> <pre> -The window should scroll downwards. Scrolled content should be selected. +The window should scroll downwards. Scrolled content should be selected. (Or, at least, the application should not crash.) </pre> </blockquote> @@ -148,8 +148,8 @@ Build 2006-08-10 on Mac OS 10.4.3 </pre> </blockquote> - <p><b>Additional Builds and Platforms:</b> Whether or not - the [% terms.bug %] takes place on other platforms (or browsers, + <p><b>Additional Builds and Platforms:</b> Whether or not + the [% terms.bug %] takes place on other platforms (or browsers, if applicable).</p> <blockquote> @@ -167,13 +167,13 @@ Doesn't Occur On Build 2006-08-10 on Windows XP Home (Service Pack 2) <li><b>Mac OS X:</b> Attach the "Crash Reporter" log that appears upon crash. - Only include the section directly below the crashing thread, usually + Only include the section directly below the crashing thread, usually titled "Thread 0 Crashed". Please do not paste the entire log!</li> </ul> </blockquote> <p>Double-check your report for errors and omissions, then press "Commit". - Your [% terms.bug %] report will now be in + Your [% terms.bug %] report will now be in the [% terms.Bugzilla %] database.<br> </p> </blockquote> diff --git a/template/en/default/pages/bugzilla.dtd.tmpl b/template/en/default/pages/bugzilla.dtd.tmpl index f7fc1b4ad..09d83fb7f 100644 --- a/template/en/default/pages/bugzilla.dtd.tmpl +++ b/template/en/default/pages/bugzilla.dtd.tmpl @@ -29,56 +29,56 @@ #%] [% USE Bugzilla %] <!ELEMENT [% "bugzilla" %] (bug+)> -<!ATTLIST [% "bugzilla" %] +<!ATTLIST [% "bugzilla" %] version CDATA #REQUIRED urlbase CDATA #REQUIRED maintainer CDATA #REQUIRED exporter CDATA #IMPLIED > -<!ELEMENT [% "bug" %] (bug_id, - (alias?, - creation_ts, - short_desc, - delta_ts, - reporter_accessible, - cclist_accessible, - classification_id, - classification, - product, - component, - version, - rep_platform, - op_sys, - bug_status, - resolution?, - dup_id?, - see_also*, - bug_file_loc?, - status_whiteboard?, - keywords*, - priority, - bug_severity, - target_milestone?, - dependson*, - blocked*, - everconfirmed, - reporter, - assigned_to, - cc*, - (estimated_time, - remaining_time, - actual_time, - deadline?)?, +<!ELEMENT [% "bug" %] (bug_id, + (alias?, + creation_ts, + short_desc, + delta_ts, + reporter_accessible, + cclist_accessible, + classification_id, + classification, + product, + component, + version, + rep_platform, + op_sys, + bug_status, + resolution?, + dup_id?, + see_also*, + bug_file_loc?, + status_whiteboard?, + keywords*, + priority, + bug_severity, + target_milestone?, + dependson*, + blocked*, + everconfirmed, + reporter, + assigned_to, + cc*, + (estimated_time, + remaining_time, + actual_time, + deadline?)?, qa_contact?, [% FOREACH field = Bugzilla.active_custom_fields %] [%+ field.name FILTER xml -%] - [%- IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]*[% ELSE %]?[% END %], + [%- IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]*[% ELSE %]?[% END %], [% END %] - votes?, - token?, - group*, - flag*, - long_desc*, + votes?, + token?, + group*, + flag*, + long_desc*, attachment*)?)> <!ATTLIST [% "bug" %] error (NotFound | NotPermitted | InvalidBugId) #IMPLIED @@ -97,7 +97,7 @@ <!ELEMENT version (#PCDATA)> <!ELEMENT rep_platform (#PCDATA)> <!ELEMENT assigned_to (#PCDATA)> -<!ATTLIST assigned_to +<!ATTLIST assigned_to name CDATA #REQUIRED > <!ELEMENT delta_ts (#PCDATA)> @@ -172,7 +172,7 @@ <!ATTLIST flag name CDATA #REQUIRED id CDATA #REQUIRED - type_id CDATA #REQUIRED + type_id CDATA #REQUIRED status CDATA #REQUIRED setter CDATA #REQUIRED requestee CDATA #IMPLIED diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl index b5d850627..1fa9f9cba 100644 --- a/template/en/default/pages/linked.html.tmpl +++ b/template/en/default/pages/linked.html.tmpl @@ -38,7 +38,7 @@ <hr> <p> - If you place it in <tt><pre></tt> tags, + If you place it in <tt><pre></tt> tags, the text will end up looking like this: </p> diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl index 28062b535..a954da9f3 100644 --- a/template/en/default/pages/quicksearch.html.tmpl +++ b/template/en/default/pages/quicksearch.html.tmpl @@ -22,7 +22,7 @@ [% INCLUDE global/header.html.tmpl title = "$terms.Bugzilla QuickSearch", - style_urls = ['skins/standard/page.css'] + style_urls = ['skins/standard/page.css'] onload = 'document.forms[\'f\'].quicksearch.focus()' %] @@ -48,18 +48,18 @@ <h2 id="basics">The Basics</h2> <ul class="qs_help"> - <li>If you just put a word or series of words in the search box, - [%+ terms.Bugzilla %] will search the + <li>If you just put a word or series of words in the search box, + [%+ terms.Bugzilla %] will search the [%+ field_descs.product FILTER html %], - [%+ field_descs.component FILTER html %], + [%+ field_descs.component FILTER html %], [%+ IF use_keywords %][%+ field_descs.keywords FILTER html %],[% END %] [%+ IF Param('usebugaliases') %][% field_descs.alias FILTER html %],[% END %] - [%+ field_descs.short_desc FILTER html %], + [%+ field_descs.short_desc FILTER html %], [%+ IF Param('usestatuswhiteboard') %][% field_descs.status_whiteboard FILTER html %],[% END %] and [% field_descs.longdesc FILTER html %] fields for your word or words.</li> <li>Typing just a <strong>number</strong> in the search box will take - you directly to the [% terms.bug %] with that ID. + you directly to the [% terms.bug %] with that ID. [% IF Param('usebugaliases') %] Also, just typing the <strong>alias</strong> of [% terms.abug %] will take you to that [% terms.bug %]. @@ -67,7 +67,7 @@ </li> <li>Adding more terms <strong>narrows down</strong> the search, it does not - expand it. (In other words, [% terms.Bugzilla %] searches for + expand it. (In other words, [% terms.Bugzilla %] searches for [%+ terms.bugs %] that match <em>all</em> your criteria, not [%+ terms.bugs %] that match <em>any</em> of your criteria.)</li> @@ -88,7 +88,7 @@ see the <a href="#shortcuts">Advanced Shortcuts</a> section.</li> <li>If you want to search <strong>specific fields</strong>, you do it like - <kbd>field:value</kbd>, where <kbd>field</kbd> is one of the + <kbd>field:value</kbd>, where <kbd>field</kbd> is one of the <a href="#fields">field names</a> lower down in this document and <kbd>value</kbd> is the value you want to search for in that field. If you put commas in the <kbd>value</kbd>, then it is @@ -137,9 +137,9 @@ <p>For custom fields, they can be used and abbreviated based on the part of their name <em>after</em> the <kbd>cf_</kbd> if you'd like, in addition to their standard name starting with - <kbd>cf_</kbd>. So for example, + <kbd>cf_</kbd>. So for example, <kbd>[% first_field.name FILTER html %]</kbd> can be - referred to as + referred to as <kbd>[% first_field.name.replace('^cf_') FILTER html %]</kbd>, also. However, if this causes a conflict between the standard [%+ terms.Bugzilla %] field names and the custom field names, the @@ -188,7 +188,7 @@ <kbd>"NOT field:value"</kbd>.</li> <li>You can use <strong>AND</strong>, <strong>NOT</strong>, - and <strong>OR</strong> in searches. + and <strong>OR</strong> in searches. You can also use <kbd>-</kbd> to mean "NOT", and <kbd>|</kbd> to mean "OR". There is no special character for "AND", because by default any search @@ -197,7 +197,7 @@ <ul> <li> <strong>NOT</strong>:<br> - Use <kbd><strong>-</strong><em>summary:foo</em></kbd> to exclude + Use <kbd><strong>-</strong><em>summary:foo</em></kbd> to exclude [%+ terms.bugs %] with <kbd>foo</kbd> in the summary.<br> <kbd><em>NOT summary:foo</em></kbd> would have the same effect. </li> @@ -224,7 +224,7 @@ <p>OR has higher precedence than AND; AND is the top level operation. For example:</p> <p>Searching for <em><kbd>url|location bar|field -focus</kbd></em> means - (<kbd>url</kbd> OR <kbd>location</kbd>) AND (<kbd>bar</kbd> OR + (<kbd>url</kbd> OR <kbd>location</kbd>) AND (<kbd>bar</kbd> OR <kbd>field</kbd>) AND (NOT <kbd>focus</kbd>)</p> </li> @@ -305,7 +305,7 @@ <td class="field_name">[% field_descs.resolution FILTER html %]</td> <td class="field_nickname"> Make the <strong>first word</strong> of your search the name of any - resolution, or even an abbreviation of any resolution, and + resolution, or even an abbreviation of any resolution, and [%+ terms.bugs %] with that resolution will be searched. For example, making <kbd>FIX</kbd> the first word of your search will find all [%+ terms.bugs %] with a resolution of <kbd>FIXED</kbd>. @@ -315,7 +315,7 @@ <tr> <td class="field_name">[% field_descs.priority FILTER html %]</td> <td class="field_nickname">"<strong>P1</strong>" (as a word anywhere in - the search) means "find [% terms.bugs %] with the highest priority. + the search) means "find [% terms.bugs %] with the highest priority. "P2" means the second-highest priority, and so on. <p>Searching for "<strong>P1-3</strong>" will find [% terms.bugs %] in any of the three highest priorities, and so on.</p> diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 6e639d86d..9bdc1ed8d 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -20,9 +20,9 @@ [% PROCESS global/variables.none.tmpl %] [% SET title = "$terms.Bugzilla 4.2 Release Notes" %] -[% INCLUDE global/header.html.tmpl +[% INCLUDE global/header.html.tmpl title = title - style_urls = ['skins/standard/page.css'] + style_urls = ['skins/standard/page.css'] %] <h1>[% title FILTER html %]</h1> @@ -515,9 +515,9 @@ dependencies is now much faster.</li> <li><strong>Attachments:</strong> The encoding of text files can be automatically detected when uploading them as attachments.</li> - <li><strong>Attachments:</strong> Clickjacking could possibly occur in an attachment - Details page if a user attached a specially formatted HTML file. To fix this - potential problem, the Details page always displays the HTML source instead and + <li><strong>Attachments:</strong> Clickjacking could possibly occur in an attachment + Details page if a user attached a specially formatted HTML file. To fix this + potential problem, the Details page always displays the HTML source instead and users can see rendered page by clicking on View.</li> <li><strong>Flags:</strong> Changing the requestee of a flag no longer changes the requester.</li> @@ -683,7 +683,7 @@ <li><a href="#v40_feat">New Features and Improvements</a></li> <li><a href="#v40_issues">Outstanding Issues</a></li> <li><a href="#v40_upgrading">Notes On Upgrading From a Previous Version</a></li> - <li><a href="#v40_code_changes">Code Changes Which May Affect + <li><a href="#v40_code_changes">Code Changes Which May Affect Customizations and Extensions</a></li> <li><a href="#v40_previous">Release Notes for Previous Versions</a></li> </ul> @@ -708,7 +708,7 @@ <p>If you're upgrading, make sure to read <a href="#v40_upgrading">Notes On Upgrading From a Previous Version</a>. If you are upgrading from a release - before 3.6, make sure to read the release notes for all the + before 3.6, make sure to read the release notes for all the <a href="#v40_previous">previous versions</a> in between your version and this one, <strong>particularly the Upgrading section of each version's release notes</strong>.</p> @@ -778,7 +778,7 @@ <p>(<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=646578">[% terms.Bug %] 646578</a>)</p></li> <li>The "Remember values as bookmarkable template" button on the [%+ terms.bug %] entry page will now work even when some required fields - are empty. + are empty. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=640719">[% terms.Bug %] 640719</a>)</li> <li>Email notifications about dependencies and flags had the wrong timestamp. @@ -787,7 +787,7 @@ <li>You can now select "UTC" as a valid timezone in General Preferences. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=646209">[% terms.Bug %] 646209</a>)</li> <li>Automatic duplicate detection now works on PostgreSQL (although - it is not as high-quality as on other DB platforms). + it is not as high-quality as on other DB platforms). (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=634144">[% terms.Bug %] 634144</a>)</li> <li>Autcomplete for users now works even if you are using the "emailsuffix" option. @@ -797,7 +797,7 @@ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=644285">[% terms.Bug %] 644285</a>)</li> <li>The "Show Votes" page now works, for installations using the Voting extension. - (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=652381">[% terms.Bug %] 652381</a>)</li> + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=652381">[% terms.Bug %] 652381</a>)</li> </ul> <h2 id="v40_req">Minimum Requirements</h2> @@ -1183,7 +1183,7 @@ another domain, inside of a web browser, thanks to support for <a href="https://bob.ippoli.to/archives/2005/12/05/remote-json-jsonp/">JSONP</a>. This will allow for web "mash-ups" to use [% terms.Bugzilla %] data. - When using JSONP, you may only call functions that <em>get</em> data, + When using JSONP, you may only call functions that <em>get</em> data, you may not call functions that <em>change</em> data.</p> <p>For more details, see the @@ -1222,7 +1222,7 @@ <h3 id="v40_feat_js_css_update">Users Get New CSS and Javascript Automatically</h3> - + <p>In past versions of [% terms.Bugzilla %], if you changed [%+ terms.Bugzilla %]'s CSS or Javascript files, then every user of [%+ terms.Bugzilla %] would have to clear their cache in order to get @@ -1245,8 +1245,8 @@ <h3 id="v40_feat_apache_config">New Apache Configuration</h3> <p>If you run [% terms.Bugzilla %] under Apache (as most people do), - you most likely require a <strong>new Apache configuration</strong> - for this version of [% terms.Bugzilla %]. See the + you most likely require a <strong>new Apache configuration</strong> + for this version of [% terms.Bugzilla %]. See the <a href="#v40_upgrading">Notes On Upgrading From a Previous Version</a> section for details.</p> @@ -1280,7 +1280,7 @@ <li><strong>[% terms.Bugs %]:</strong> The box to "Add [% terms.Bug %] URLs" in the See Also field is now hidden behind an "(add)" link that you have to click to see the box.</li> - + <li><strong>Searches:</strong> You can now properly search for field values that have commas in their name, when using the Advanced Search form.</li> <li><strong>Searches:</strong> The "URL" field can now be shown as a column @@ -1306,7 +1306,7 @@ <li><strong>Searches:</strong> When using the Boolean Charts (now called "Custom Search"), you can search for values "greater than or equal to" or "less than or equal to" some value.</li> - + <li><strong>Flags:</strong> If you hover your mouse over the name of a flag setter when viewing [% terms.abug %], you can see that flag setter's full name and complete username.</li> @@ -1317,7 +1317,7 @@ that are restricted to certain groups now properly have the "padlock" icon shown next to them to indicate that they may contain confidential information.</li> - + <li>When using the Reports interface, you can now choose many more fields as the X, Y, or Z axis of a report, including custom fields.</li> <li>[% terms.Bugzilla %] now prevents @@ -1420,14 +1420,14 @@ <a href="https://developer.mozilla.org/docs/Web/HTTP/Headers/X-Frame-Options"><code>X-Frame-Options: SAMEORIGIN</code></a> header with every page request in order to prevent "clickjacking" attacks. Note that this prevents other domains from displaying [% terms.Bugzilla %] - in an HTML frame.</li> + in an HTML frame.</li> </ul> <h4 id="v40_feat_ws_changes">WebService Changes</h4> <ul> <li>You can now call some JSON-RPC methods using HTTP GET, in addition to - using HTTP POST. See the + using HTTP POST. See the <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Server/JSONRPC.html#Connecting_via_GET">JSON-RPC documentation</a> for details.</li> <li>You can now update existing [% terms.bugs %] using the @@ -1483,15 +1483,15 @@ [%- terms.Bug %] 423439</a>: Tabs in comments will be converted to four spaces, due to a b<!-- -->ug in Perl as of Perl 5.8.8.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=89822"> - [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at + [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at the same time, there is no "mid-air collision" protection.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=276230"> - [%- terms.Bug %] 276230</a>: The support for restricting access to - particular Categories of New Charts is not complete. You should treat + [%- terms.Bug %] 276230</a>: The support for restricting access to + particular Categories of New Charts is not complete. You should treat the 'chartgroup' Param as the only access mechanism available.<br> - However, charts migrated from Old Charts will be restricted to + However, charts migrated from Old Charts will be restricted to the groups that are marked MANDATORY for the corresponding Product. - There is currently no way to change this restriction, and the + There is currently no way to change this restriction, and the groupings will not be updated if the group configuration for the Product changes.</li> </ul> @@ -1504,7 +1504,7 @@ <p>If you run [% terms.Bugzilla %] under mod_cgi (this is the most common configuration, involving a <Directory> block in your Apache config - file), you will need to update the configuration of Apache for + file), you will need to update the configuration of Apache for [%+ terms.Bugzilla %]. In particular, this line in the [% terms.Bugzilla %] <kbd><Directory></kbd> block:</p> @@ -1513,7 +1513,7 @@ <p>needs to become:</p> <blockquote><code>AllowOverride Limit FileInfo Indexes</code></blockquote> - + <p>For full details on how to configure Apache for [% terms.Bugzilla %], see the <a href="[% docs_urlbase FILTER html %]configuration.html#http-apache">Configuration</a> @@ -1524,7 +1524,7 @@ <p>If your [% terms.Bugzilla %] runs under mod_perl, the required Apache configuration is now simpler. The line that used to look like:</p> -<blockquote><code>PerlSwitches -w -T -I/var/www/html/bugzilla +<blockquote><code>PerlSwitches -w -T -I/var/www/html/bugzilla -I/var/www/html/bugzilla/lib</code></blockquote> <p>Now should be only:</p> @@ -1631,7 +1631,7 @@ [% '</span>' IF db_new %] </li> <li><strong>perl module:</strong> - [%+ m.dbd.module FILTER html %] + [%+ m.dbd.module FILTER html %] [% '<span class="req_new">' IF dbd_new %]v[% m.dbd.version FILTER html %] [% '</span>' IF dbd_new %]</li> </ul> @@ -1649,8 +1649,8 @@ [% FOREACH req = reqs %] <tr> <td [% ' class="req_new"' IF new.contains(req.package) %]> - [%- req.module FILTER html %]</td> - <td [% ' class="req_new"' IF updated.contains(req.package) + [%- req.module FILTER html %]</td> + <td [% ' class="req_new"' IF updated.contains(req.package) OR new.contains(req.package) %]> [%- IF req.version == 0 %] (Any) @@ -1658,7 +1658,7 @@ [%- req.version FILTER html %] [% END %] </td> - [% IF include_feature %] + [% IF include_feature %] <td>[% req.feature.join(', ') FILTER html %]</td> [% END %] </tr> diff --git a/template/en/default/pages/release-notes3.html.tmpl b/template/en/default/pages/release-notes3.html.tmpl index 2f37f8017..ae0ed36e8 100644 --- a/template/en/default/pages/release-notes3.html.tmpl +++ b/template/en/default/pages/release-notes3.html.tmpl @@ -19,9 +19,9 @@ [% PROCESS global/variables.none.tmpl %] [% SET title = "$terms.Bugzilla 3.6 Release Notes" %] -[% INCLUDE global/header.html.tmpl +[% INCLUDE global/header.html.tmpl title = title - style_urls = ['skins/standard/page.css'] + style_urls = ['skins/standard/page.css'] %] <h3>Release Notes For Newer Versions</h3> @@ -38,7 +38,7 @@ <li><a href="#v36_feat">New Features and Improvements</a></li> <li><a href="#v36_issues">Outstanding Issues</a></li> <li><a href="#v36_upgrading">Notes On Upgrading From a Previous Version</a></li> - <li><a href="#v36_code_changes">Code Changes Which May Affect + <li><a href="#v36_code_changes">Code Changes Which May Affect Customizations</a></li> <li><a href="#v36_previous">Release Notes for Previous Versions</a></li> </ul> @@ -52,7 +52,7 @@ <p>If you're upgrading, make sure to read <a href="#v36_upgrading">Notes On Upgrading From a Previous Version</a>. If you are upgrading from a release - before 3.4, make sure to read the release notes for all the + before 3.4, make sure to read the release notes for all the <a href="#v36_previous">previous versions</a> in between your version and this one, <strong>particularly the Upgrading section of each version's release notes</strong>.</p> @@ -60,7 +60,7 @@ <p>We would like to thank <a href="https://www.canonical.com/">Canonical Ltd.</a>, <a href="https://www.itasoftware.com/">ITA Software</a>, the <a href="https://www.ibm.com/linux/ltc/">IBM Linux Technology Center</a>, - <a href="https://www.redhat.com/">Red Hat</a>, and + <a href="https://www.redhat.com/">Red Hat</a>, and <a href="https://www.novell.com/">Novell</a> for funding the development of various features and improvements in this release of [%+ terms.Bugzilla %].</p> @@ -115,7 +115,7 @@ editing a product's components. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=576911">[% terms.Bug %] 576911</a>) </li> - <li>The updating of bugs_fulltext that happens during + <li>The updating of bugs_fulltext that happens during <kbd>checksetup.pl</kbd> for upgrades to 3.6 should now be MUCH faster. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=577754">[% terms.Bug %] 577754</a>) </li> @@ -180,274 +180,274 @@ <li><a href="#v36_req_optional_mod">Optional Perl Modules</a></li> </ul> -<h3 id="v36_req_perl">Perl</h3> - +<h3 id="v36_req_perl">Perl</h3> + <p>Perl v5.8.1</p> -<h3 id="v36_req_mysql">For MySQL Users</h3> - - <ul> +<h3 id="v36_req_mysql">For MySQL Users</h3> + + <ul> <li>MySQL v4.1.2 - </li> - <li><strong>perl module:</strong> - DBD::mysql v4.00</li> + </li> + <li><strong>perl module:</strong> + DBD::mysql v4.00</li> </ul> - -<h3 id="v36_req_pg">For PostgreSQL Users</h3> - - <ul> + +<h3 id="v36_req_pg">For PostgreSQL Users</h3> + + <ul> <li>PostgreSQL v8.00.0000 - </li> - <li><strong>perl module:</strong> - DBD::Pg v1.45</li> - </ul> -<h3 id="v36_req_oracle">For Oracle Users</h3> - - <ul> + </li> + <li><strong>perl module:</strong> + DBD::Pg v1.45</li> + </ul> +<h3 id="v36_req_oracle">For Oracle Users</h3> + + <ul> <li>Oracle v10.02.0 - </li> - <li><strong>perl module:</strong> - DBD::Oracle v1.19</li> - </ul> - + </li> + <li><strong>perl module:</strong> + DBD::Oracle v1.19</li> + </ul> + <h3 id="v36_req_modules">Required Perl Modules</h3> -<table class="req_table" border="0" cellspacing="0" cellpadding="0"> - <tr> - <th>Module</th> <th>Version</th> - </tr> - <tr> - <td >CGI</td> +<table class="req_table" border="0" cellspacing="0" cellpadding="0"> + <tr> + <th>Module</th> <th>Version</th> + </tr> + <tr> + <td >CGI</td> <td >3.21 - </td> - </tr> - <tr> - <td >Digest::SHA</td> - <td > + </td> + </tr> + <tr> + <td >Digest::SHA</td> + <td > (Any) - </td> - </tr> - <tr> - <td >Date::Format</td> + </td> + </tr> + <tr> + <td >Date::Format</td> <td >2.21 - </td> - </tr> - <tr> - <td >DateTime</td> + </td> + </tr> + <tr> + <td >DateTime</td> <td >0.28 - </td> - </tr> - <tr> - <td >DateTime::TimeZone</td> + </td> + </tr> + <tr> + <td >DateTime::TimeZone</td> <td >0.71 - </td> - </tr> - <tr> - <td >DBI</td> + </td> + </tr> + <tr> + <td >DBI</td> <td >1.41 - </td> - </tr> - <tr> - <td >Template</td> + </td> + </tr> + <tr> + <td >Template</td> <td >2.22 - </td> - </tr> - <tr> - <td >Email::Send</td> + </td> + </tr> + <tr> + <td >Email::Send</td> <td >2.00 - </td> - </tr> - <tr> - <td >Email::MIME</td> + </td> + </tr> + <tr> + <td >Email::MIME</td> <td >1.861 - </td> - </tr> - <tr> - <td >Email::MIME::Encodings</td> + </td> + </tr> + <tr> + <td >Email::MIME::Encodings</td> <td >1.313 - </td> - </tr> - <tr> - <td >Email::MIME::Modifier</td> + </td> + </tr> + <tr> + <td >Email::MIME::Modifier</td> <td >1.442 - </td> - </tr> - <tr> - <td >URI</td> - <td > + </td> + </tr> + <tr> + <td >URI</td> + <td > (Any) - </td> - </tr> -</table> - -<h3 id="v36_req_optional_mod">Optional Perl Modules</h3> - + </td> + </tr> +</table> + +<h3 id="v36_req_optional_mod">Optional Perl Modules</h3> + <p>The following perl modules, if installed, enable various features of [% terms.Bugzilla %]:</p> -<table class="req_table" border="0" cellspacing="0" cellpadding="0"> - <tr> - <th>Module</th> <th>Version</th> - <th>Enables Feature</th> - </tr> - <tr> - <td >GD</td> +<table class="req_table" border="0" cellspacing="0" cellpadding="0"> + <tr> + <th>Module</th> <th>Version</th> + <th>Enables Feature</th> + </tr> + <tr> + <td >GD</td> <td >1.20 - </td> - <td>Graphical Reports, New Charts, Old Charts</td> - </tr> - <tr> - <td >Chart::Lines</td> + </td> + <td>Graphical Reports, New Charts, Old Charts</td> + </tr> + <tr> + <td >Chart::Lines</td> <td class="req_new">2.1 - </td> - <td>New Charts, Old Charts</td> - </tr> - <tr> - <td >Template::Plugin::GD::Image</td> - <td > + </td> + <td>New Charts, Old Charts</td> + </tr> + <tr> + <td >Template::Plugin::GD::Image</td> + <td > (Any) - </td> - <td>Graphical Reports</td> - </tr> - <tr> - <td >GD::Text</td> - <td > + </td> + <td>Graphical Reports</td> + </tr> + <tr> + <td >GD::Text</td> + <td > (Any) - </td> - <td>Graphical Reports</td> - </tr> - <tr> - <td >GD::Graph</td> - <td > + </td> + <td>Graphical Reports</td> + </tr> + <tr> + <td >GD::Graph</td> + <td > (Any) - </td> - <td>Graphical Reports</td> - </tr> - <tr> - <td >XML::Twig</td> - <td > + </td> + <td>Graphical Reports</td> + </tr> + <tr> + <td >XML::Twig</td> + <td > (Any) - </td> + </td> <td>Move [% terms.Bugs %] Between Installations, - Automatic Update Notifications</td> - </tr> - <tr> - <td >MIME::Parser</td> + Automatic Update Notifications</td> + </tr> + <tr> + <td >MIME::Parser</td> <td >5.406 - </td> - <td>Move [% terms.Bugs %] Between Installations</td> - </tr> - <tr> - <td >LWP::UserAgent</td> - <td > + </td> + <td>Move [% terms.Bugs %] Between Installations</td> + </tr> + <tr> + <td >LWP::UserAgent</td> + <td > (Any) - </td> - <td>Automatic Update Notifications</td> - </tr> - <tr> - <td >PatchReader</td> + </td> + <td>Automatic Update Notifications</td> + </tr> + <tr> + <td >PatchReader</td> <td >0.9.4 - </td> - <td>Patch Viewer</td> - </tr> - <tr> - <td >Net::LDAP</td> - <td > + </td> + <td>Patch Viewer</td> + </tr> + <tr> + <td >Net::LDAP</td> + <td > (Any) - </td> - <td>LDAP Authentication</td> - </tr> - <tr> - <td >Authen::SASL</td> - <td > + </td> + <td>LDAP Authentication</td> + </tr> + <tr> + <td >Authen::SASL</td> + <td > (Any) - </td> - <td>SMTP Authentication</td> - </tr> - <tr> - <td >Authen::Radius</td> - <td > + </td> + <td>SMTP Authentication</td> + </tr> + <tr> + <td >Authen::Radius</td> + <td > (Any) - </td> - <td>RADIUS Authentication</td> - </tr> - <tr> - <td >SOAP::Lite</td> + </td> + <td>RADIUS Authentication</td> + </tr> + <tr> + <td >SOAP::Lite</td> <td >0.710.06 - </td> - <td>XML-RPC Interface</td> - </tr> - <tr> - <td class="req_new">JSON::RPC</td> - <td class="req_new"> + </td> + <td>XML-RPC Interface</td> + </tr> + <tr> + <td class="req_new">JSON::RPC</td> + <td class="req_new"> (Any) - </td> - <td>JSON-RPC Interface</td> - </tr> - <tr> - <td class="req_new">Test::Taint</td> - <td class="req_new"> + </td> + <td>JSON-RPC Interface</td> + </tr> + <tr> + <td class="req_new">Test::Taint</td> + <td class="req_new"> (Any) - </td> - <td>JSON-RPC Interface, XML-RPC Interface</td> - </tr> - <tr> - <td >HTML::Parser</td> + </td> + <td>JSON-RPC Interface, XML-RPC Interface</td> + </tr> + <tr> + <td >HTML::Parser</td> <td >3.40 - </td> - <td>More HTML in Product/Group Descriptions</td> - </tr> - <tr> - <td >HTML::Scrubber</td> - <td > + </td> + <td>More HTML in Product/Group Descriptions</td> + </tr> + <tr> + <td >HTML::Scrubber</td> + <td > (Any) - </td> - <td>More HTML in Product/Group Descriptions</td> - </tr> - <tr> - <td >Email::MIME::Attachment::Stripper</td> - <td > + </td> + <td>More HTML in Product/Group Descriptions</td> + </tr> + <tr> + <td >Email::MIME::Attachment::Stripper</td> + <td > (Any) - </td> - <td>Inbound Email</td> - </tr> - <tr> - <td >Email::Reply</td> - <td > + </td> + <td>Inbound Email</td> + </tr> + <tr> + <td >Email::Reply</td> + <td > (Any) - </td> - <td>Inbound Email</td> - </tr> - <tr> - <td >TheSchwartz</td> - <td > + </td> + <td>Inbound Email</td> + </tr> + <tr> + <td >TheSchwartz</td> + <td > (Any) - </td> - <td>Mail Queueing</td> - </tr> - <tr> - <td >Daemon::Generic</td> - <td > + </td> + <td>Mail Queueing</td> + </tr> + <tr> + <td >Daemon::Generic</td> + <td > (Any) - </td> - <td>Mail Queueing</td> - </tr> - <tr> - <td >mod_perl2</td> + </td> + <td>Mail Queueing</td> + </tr> + <tr> + <td >mod_perl2</td> <td >1.999022 - </td> - <td>mod_perl</td> - </tr> -</table> + </td> + <td>mod_perl</td> + </tr> +</table> <h2 id="v36_feat">New Features and Improvements</h2> <ul> <li><a href="#v36_feat_usability">General Usability Improvements</a></li> - <li><a href="#v36_feat_extensions">New Extensions System</a></li> + <li><a href="#v36_feat_extensions">New Extensions System</a></li> <li><a href="#v36_feat_qs">Improved Quicksearch</a></li> <li><a href="#v36_feat_browse">Simple "Browse" Interface</a></li> <li><a href="#v36_feat_suexec">SUExec Support</a></li> @@ -608,7 +608,7 @@ mandatory.</li> <li><b>[% terms.Bug %] Filing:</b> "Bookmarkable templates" now support the "alias" and "estimated hours" fields.</li> - + <li><b>[% terms.Bug %] Editing:</b> In previous versions of [%+ terms.Bugzilla %], if you added a private comment to [% terms.abug %], then <em>none</em> of the changes that you made at that time were @@ -639,10 +639,10 @@ <li><b>Attachments:</b> When you click on an "attachment 12345" link in a comment, if the attachment is a patch, you will now see the formatted "Diff" view instead of the raw patch.</li> - <li><b>Attachments</b>: For text attachments, we now let the browser + <li><b>Attachments</b>: For text attachments, we now let the browser auto-detect the character encoding, instead of forcing the browser to always assume the attachment is in UTF-8.</li> - + <li><b>Search:</b> You can now display [% terms.bug %] flags as a column in search results.</li> <li><b>Search:</b> When viewing search results, you can see which columns are @@ -662,7 +662,7 @@ <kbd>buglist.cgi</kbd> now accepts nearly every valid field in [%+ terms.Bugzilla %] as a direct URL parameter, like <kbd>&field=value</kbd>.</li> - + <li><b>Requests:</b> When viewing the "My Requests" page, you can now see the lists as a normal search result by clicking a link at the bottom of each table.</li> @@ -694,7 +694,7 @@ if there are no [% terms.bugs %] that match your searches.</li> <li>The arrows in dependency graphs now point the other way, so that [%+ terms.bugs %] point at their dependencies.</li> - + <li><b>New Charts:</b> You can now convert an existing Saved Search into a data series for New Charts.</li> <li><b>New Charts:</b> There is now an interface that allows you to @@ -743,7 +743,7 @@ the <kbd>lib/</kbd> dir. If you would rather use the CGI.pm from your global Perl installation, you can delete <kbd>CGI.pm</kbd> and the <kbd>CGI</kbd> directory from the <kbd>lib/</kbd> directory.</li> - + <li>When editing a group, you can now specify that members of a group are allowed to grant others membership in that group itself.</li> <li>The ability to compress BMP attachments to PNGs is now an Extension. @@ -760,7 +760,7 @@ the numeric id of each comment, whether an attachment is a URL, the modification time of an attachment, the numeric id of a flag, and the numeric id of a flag's type.</li> - + <li><b>Parameters:</b> Parameters that aren't actually required are no longer in the "Required" section of the Parameters page. Instead, some are in the new "General" section, and some are in the new "Advanced" section.</li> @@ -778,7 +778,7 @@ header sent from that proxy, and correctly use the X-Forwarded-For as the end user's IP, instead of believing that all traffic is coming from the proxy.</li> - + <li><b>Removed Parameter:</b> The <kbd>loginnetmask</kbd> parameter has been removed. Since [% terms.Bugzilla %] sends secure cookies, it's no longer necessary to always restrict logins to a specific IP or block @@ -845,19 +845,19 @@ <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=69621"> [%- terms.Bug %] 69621</a>: If you rename or remove a keyword that is in use on [% terms.bugs %], you will need to rebuild the "keyword cache" - by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing - the option to rebuild the cache when it asks. Otherwise keywords may + by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing + the option to rebuild the cache when it asks. Otherwise keywords may not show up properly in search results.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=89822"> - [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at + [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at the same time, there is no "mid-air collision" protection.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=276230"> - [%- terms.Bug %] 276230</a>: The support for restricting access to - particular Categories of New Charts is not complete. You should treat + [%- terms.Bug %] 276230</a>: The support for restricting access to + particular Categories of New Charts is not complete. You should treat the 'chartgroup' Param as the only access mechanism available.<br> - However, charts migrated from Old Charts will be restricted to + However, charts migrated from Old Charts will be restricted to the groups that are marked MANDATORY for the corresponding Product. - There is currently no way to change this restriction, and the + There is currently no way to change this restriction, and the groupings will not be updated if the group configuration for the Product changes.</li> </ul> @@ -872,10 +872,10 @@ you can always delete the database records which contain the bad values by logging in to your database and running the following command:</p> -<p><code>DELETE FROM <var>table</var> WHERE <var>column</var> IN +<p><code>DELETE FROM <var>table</var> WHERE <var>column</var> IN (<var>1, 2, 3, 4</var>)</code></p> -<p>Just replace "table" and "column" with the name of the table +<p>Just replace "table" and "column" with the name of the table and column that <kbd>checksetup.pl</kbd> mentions, and "1, 2, 3, 4" with the invalid values that <kbd>checksetup.pl</kbd> prints out.</p> @@ -916,7 +916,7 @@ <li><a href="#v34_feat">New Features and Improvements</a></li> <li><a href="#v34_issues">Outstanding Issues</a></li> <li><a href="#v34_upgrading">Notes On Upgrading From a Previous Version</a></li> - <li><a href="#v34_code_changes">Code Changes Which May Affect + <li><a href="#v34_code_changes">Code Changes Which May Affect Customizations</a></li> <li><a href="#v34_previous">Release Notes for Previous Versions</a></li> </ul> @@ -930,7 +930,7 @@ <p>If you're upgrading, make sure to read <a href="#v34_upgrading">Notes On Upgrading From a Previous Version</a>. If you are upgrading from a release - before 3.2, make sure to read the release notes for all the + before 3.2, make sure to read the release notes for all the <a href="#v34_previous">previous versions</a> in between your version and this one, <strong>particularly the Upgrading section of each version's release notes</strong>.</p> @@ -975,7 +975,7 @@ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=533018">[% terms.Bug %] 533018</a>) </li> <li>If you tried to do a search with too many terms (resulting in a URL - that was longer than about 7000 characters), Apache would return a + that was longer than about 7000 characters), Apache would return a 500 error instead of your search results. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=513989">[% terms.Bug %] 513989</a>) </li> @@ -1005,7 +1005,7 @@ <li>The Assignee field was empty in Whine mails. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=511216">[% terms.Bug %] 511216</a>) </li> - <li>Administrators can now successfully create user accounts using + <li>Administrators can now successfully create user accounts using editusers.cgi when using the "Env" authentication method. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=483987">[% terms.Bug %] 483987</a>) </li> @@ -1040,12 +1040,12 @@ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=517793">[% terms.Bug %] 517793</a>) </li> <li>Attachments with Unicode characters in their names were being downloaded - with mangled names. + with mangled names. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=328628">[% terms.Bug %] 328628</a>) </li> <li>Creating custom fields with Unicode in their database column name is now no longer allowed, as it would break [% terms.Bugzilla %]. If you - created such a custom field, you should delete it by first marking it + created such a custom field, you should delete it by first marking it obsolete and then clicking "Delete" in the custom field list, using <a href="editfields.cgi">editfields.cgi</a>. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=525025">[% terms.Bug %] 525025</a>) @@ -1059,7 +1059,7 @@ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=509152">[% terms.Bug %] 509152</a>) </li> <li>You can now do <kbd>./install-module.pl --shell</kbd> to get a CPAN - shell using the configuration of + shell using the configuration of <a href="[% docs_urlbase FILTER html %]api/install-module.html">install-module.pl</a>, which allows you to do more advanced Perl module installation tasks. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=445875">[% terms.Bug %] 445875</a>) @@ -1069,7 +1069,7 @@ <h3>3.4.2</h3> <p>This release contains fixes for multiple security issues, one of which - is highly critical. See the + is highly critical. See the <a href="https://www.bugzilla.org/security/3.0.8/">Security Advisory</a> for details.</p> @@ -1077,8 +1077,8 @@ this release:</p> <ul> - <li>Upgrades from older releases were sometimes failing during UTF-8 - conversion with a foreign key error. + <li>Upgrades from older releases were sometimes failing during UTF-8 + conversion with a foreign key error. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=508181">[% terms.Bug %] 508181</a>) </li> <li>Sorting [% terms.bug %] lists on certain fields would result in an error. @@ -1099,7 +1099,7 @@ </li> <li>For users of RHEL, CentOS, Fedora, etc. jobqueue.pl can now automatically be installed as a daemon by running <kbd>./jobqueue.pl install</kbd> - as root. + as root. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=475403">[% terms.Bug %] 475403</a>) </li> <li>XML-RPC interface responses had an incorrect Content-Length header @@ -1142,207 +1142,207 @@ <p>Perl v5.8.1</p> -<h3 id="v34_req_mysql">For MySQL Users</h3> - -<ul> - <li>MySQL v4.1.2</li> - <li><strong>perl module:</strong> DBD::mysql v4.00</li> +<h3 id="v34_req_mysql">For MySQL Users</h3> + +<ul> + <li>MySQL v4.1.2</li> + <li><strong>perl module:</strong> DBD::mysql v4.00</li> </ul> -<h3 id="v34_req_pg">For PostgreSQL Users</h3> - -<ul> +<h3 id="v34_req_pg">For PostgreSQL Users</h3> + +<ul> <li>PostgreSQL v8.00.0000</li> <li><strong>perl module:</strong> DBD::Pg v1.45</li> </ul> <h3 id="v34_req_oracle">For Oracle Users</h3> - -<ul> + +<ul> <li>Oracle v10.02.0</li> <li><strong>perl module:</strong> DBD::Oracle v1.19</li> -</ul> - +</ul> + <h3 id="v34_req_modules">Required Perl Modules</h3> -<table class="req_table" border="0" cellspacing="0" cellpadding="0"> - <tr> - <th>Module</th> <th>Version</th> - </tr> - <tr> - <td>CGI</td> - <td>3.21</td> - </tr> - <tr> - <td class="req_new">Digest::SHA</td> - <td class="req_new"> (Any)</td> - </tr> - <tr> - <td>Date::Format</td> - <td>2.21</td> - </tr> - <tr> - <td class="req_new">DateTime</td> - <td class="req_new">0.28</td> - </tr> - <tr> - <td class="req_new">DateTime::TimeZone</td> - <td class="req_new">0.71</td> - </tr> - <tr> - <td>DBI</td> - <td>1.41</td> - </tr> - <tr> - <td>Template</td> - <td class="req_new">2.22</td> +<table class="req_table" border="0" cellspacing="0" cellpadding="0"> + <tr> + <th>Module</th> <th>Version</th> + </tr> + <tr> + <td>CGI</td> + <td>3.21</td> + </tr> + <tr> + <td class="req_new">Digest::SHA</td> + <td class="req_new"> (Any)</td> + </tr> + <tr> + <td>Date::Format</td> + <td>2.21</td> + </tr> + <tr> + <td class="req_new">DateTime</td> + <td class="req_new">0.28</td> + </tr> + <tr> + <td class="req_new">DateTime::TimeZone</td> + <td class="req_new">0.71</td> + </tr> + <tr> + <td>DBI</td> + <td>1.41</td> + </tr> + <tr> + <td>Template</td> + <td class="req_new">2.22</td> + </tr> + <tr> + <td>Email::Send</td> + <td>2.00</td> + </tr> + <tr> + <td>Email::MIME</td> + <td>1.861</td> + </tr> + <tr> + <td>Email::MIME::Encodings</td> + <td>1.313</td> </tr> <tr> - <td>Email::Send</td> - <td>2.00</td> - </tr> - <tr> - <td>Email::MIME</td> - <td>1.861</td> - </tr> - <tr> - <td>Email::MIME::Encodings</td> - <td>1.313</td> - </tr> - <tr> - <td>Email::MIME::Modifier</td> - <td>1.442</td> - </tr> - <tr> - <td class="req_new">URI</td> - <td class="req_new">(Any)</td> - </tr> -</table> - -<h3 id="v34_req_optional_mod">Optional Perl Modules</h3> - + <td>Email::MIME::Modifier</td> + <td>1.442</td> + </tr> + <tr> + <td class="req_new">URI</td> + <td class="req_new">(Any)</td> + </tr> +</table> + +<h3 id="v34_req_optional_mod">Optional Perl Modules</h3> + <p>The following perl modules, if installed, enable various features of [% terms.Bugzilla %]:</p> -<table class="req_table" border="0" cellspacing="0" cellpadding="0"> - <tr> +<table class="req_table" border="0" cellspacing="0" cellpadding="0"> + <tr> <th>Module</th> - <th>Version</th> - <th>Enables Feature</th> - </tr> - <tr> - <td>LWP::UserAgent</td> - <td>(Any)</td> - <td>Automatic Update Notifications</td> - </tr> - <tr> - <td>Template::Plugin::GD::Image</td> - <td>(Any)</td> - <td>Graphical Reports</td> - </tr> - <tr> - <td>GD::Text</td> - <td>(Any)</td> - <td>Graphical Reports</td> - </tr> - <tr> - <td>GD::Graph</td> - <td>(Any)</td> - <td>Graphical Reports</td> - </tr> - <tr> - <td>GD</td> - <td>1.20</td> - <td>Graphical Reports, New Charts, Old Charts</td> - </tr> - <tr> - <td>Email::MIME::Attachment::Stripper</td> - <td>(Any)</td> - <td>Inbound Email</td> - </tr> - <tr> - <td>Email::Reply</td> - <td>(Any)</td> - <td>Inbound Email</td> - </tr> - <tr> - <td>Net::LDAP</td> - <td>(Any)</td> - <td>LDAP Authentication</td> - </tr> - <tr> - <td class="req_new">TheSchwartz</td> - <td class="req_new">(Any)</td> - <td>Mail Queueing</td> - </tr> - <tr> - <td class="req_new">Daemon::Generic</td> - <td class="req_new">(Any)</td> - <td>Mail Queueing</td> - </tr> - <tr> - <td>HTML::Parser</td> - <td>3.40</td> - <td>More HTML in Product/Group Descriptions</td> - </tr> - <tr> - <td>HTML::Scrubber</td> - <td>(Any)</td> - <td>More HTML in Product/Group Descriptions</td> - </tr> - <tr> - <td>XML::Twig</td> - <td>(Any)</td> - <td>Move [% terms.Bugs %] Between Installations</td> - </tr> - <tr> - <td>MIME::Parser</td> - <td>5.406</td> - <td>Move [% terms.Bugs %] Between Installations</td> - </tr> - <tr> - <td>Chart::Base</td> - <td>1.0</td> - <td>New Charts, Old Charts</td> - </tr> - <tr> - <td>Image::Magick</td> - <td>(Any)</td> - <td>Optionally Convert BMP Attachments to PNGs</td> - </tr> - <tr> - <td>PatchReader</td> - <td>0.9.4</td> - <td>Patch Viewer</td> - </tr> - <tr> - <td>Authen::Radius</td> - <td>(Any)</td> - <td>RADIUS Authentication</td> - </tr> - <tr> - <td>Authen::SASL</td> - <td>(Any)</td> - <td>SMTP Authentication</td> - </tr> - <tr> - <td>SOAP::Lite</td> - <td>0.710.06</td> - <td>XML-RPC Interface</td> - </tr> - <tr> - <td>mod_perl2</td> - <td>1.999022</td> - <td>mod_perl</td> - </tr> -</table> + <th>Version</th> + <th>Enables Feature</th> + </tr> + <tr> + <td>LWP::UserAgent</td> + <td>(Any)</td> + <td>Automatic Update Notifications</td> + </tr> + <tr> + <td>Template::Plugin::GD::Image</td> + <td>(Any)</td> + <td>Graphical Reports</td> + </tr> + <tr> + <td>GD::Text</td> + <td>(Any)</td> + <td>Graphical Reports</td> + </tr> + <tr> + <td>GD::Graph</td> + <td>(Any)</td> + <td>Graphical Reports</td> + </tr> + <tr> + <td>GD</td> + <td>1.20</td> + <td>Graphical Reports, New Charts, Old Charts</td> + </tr> + <tr> + <td>Email::MIME::Attachment::Stripper</td> + <td>(Any)</td> + <td>Inbound Email</td> + </tr> + <tr> + <td>Email::Reply</td> + <td>(Any)</td> + <td>Inbound Email</td> + </tr> + <tr> + <td>Net::LDAP</td> + <td>(Any)</td> + <td>LDAP Authentication</td> + </tr> + <tr> + <td class="req_new">TheSchwartz</td> + <td class="req_new">(Any)</td> + <td>Mail Queueing</td> + </tr> + <tr> + <td class="req_new">Daemon::Generic</td> + <td class="req_new">(Any)</td> + <td>Mail Queueing</td> + </tr> + <tr> + <td>HTML::Parser</td> + <td>3.40</td> + <td>More HTML in Product/Group Descriptions</td> + </tr> + <tr> + <td>HTML::Scrubber</td> + <td>(Any)</td> + <td>More HTML in Product/Group Descriptions</td> + </tr> + <tr> + <td>XML::Twig</td> + <td>(Any)</td> + <td>Move [% terms.Bugs %] Between Installations</td> + </tr> + <tr> + <td>MIME::Parser</td> + <td>5.406</td> + <td>Move [% terms.Bugs %] Between Installations</td> + </tr> + <tr> + <td>Chart::Base</td> + <td>1.0</td> + <td>New Charts, Old Charts</td> + </tr> + <tr> + <td>Image::Magick</td> + <td>(Any)</td> + <td>Optionally Convert BMP Attachments to PNGs</td> + </tr> + <tr> + <td>PatchReader</td> + <td>0.9.4</td> + <td>Patch Viewer</td> + </tr> + <tr> + <td>Authen::Radius</td> + <td>(Any)</td> + <td>RADIUS Authentication</td> + </tr> + <tr> + <td>Authen::SASL</td> + <td>(Any)</td> + <td>SMTP Authentication</td> + </tr> + <tr> + <td>SOAP::Lite</td> + <td>0.710.06</td> + <td>XML-RPC Interface</td> + </tr> + <tr> + <td>mod_perl2</td> + <td>1.999022</td> + <td>mod_perl</td> + </tr> +</table> <h2 id="v34_feat">New Features and Improvements</h2> <ul> <li><a href="#v34_feat_enter">Simple [% terms.Bug %] Filing</a></li> <li><a href="#v34_feat_index">New Home Page</a></li> - <li><a href="#v34_feat_spam">Email Addresses Hidden From Logged-Out + <li><a href="#v34_feat_spam">Email Addresses Hidden From Logged-Out Users</a></li> <li><a href="#v34_feat_urls">Shorter Search URLs</a></li> <li><a href="#v34_feat_async">Asynchronous Email Sending</a></li> @@ -1352,7 +1352,7 @@ Another Field Has a Particular Value</a></li> <li><a href="#v34_feat_vals">Custom Fields Whose List of Values Change Depending on the Value of Another Field</a></li> - <li><a href="#v34_feat_bugid">New Custom Field Type: + <li><a href="#v34_feat_bugid">New Custom Field Type: [%+ terms.Bug %] ID</a></li> <li><a href="#v34_feat_see">"See Also" Field</a></li> <li><a href="#v34_feat_cols">Re-order Columns in Search Results</a></li> @@ -1363,7 +1363,7 @@ <h3 id="v34_feat_enter">Simple [% terms.Bug %] Filing</h3> <p>When entering a new [% terms.bug %], the vast majority of fields are - now hidden by default, which enormously simplifies the bug-filing form. + now hidden by default, which enormously simplifies the bug-filing form. You can click "Show Advanced Fields" to show all the fields, if you want them. [%+ terms.Bugzilla %] remembers whether you last used the "Advanced" or "Simple" version of the [% terms.bug %]-entry form, and will display the @@ -1447,7 +1447,7 @@ <p>Here's an example: Let's say that we create a field called "Colors", and we make the Product field "control the values" for Colors. Then we add Blue, Red, Black, and Yellow as legal values for the "Colors" field. - Now we can say that "Blue" and "Red" only appear as valid choices in + Now we can say that "Blue" and "Red" only appear as valid choices in Product A, "Yellow" only appears in Product B, but "Black" <em>always</em> appears.</p> @@ -1463,11 +1463,11 @@ <h3 id="v34_feat_see">"See Also" Field</h3> -<p>We have added a new standard field called "See Also" to - [%+ terms.Bugzilla %]. In this field, you can put URLs to multiple +<p>We have added a new standard field called "See Also" to + [%+ terms.Bugzilla %]. In this field, you can put URLs to multiple [%+ terms.bugs %] in any [% terms.Bugzilla %] installation, to indicate that those [% terms.bugs %] are related to this one. It also supports - adding URLs to [% terms.bugs %] in + adding URLs to [% terms.bugs %] in <a href="https://launchpad.net/">Launchpad</a>.</p> <p>Right now, the field just validates the URLs and then displays them, but @@ -1502,14 +1502,14 @@ hidden from the attachment list by default. You can show them by clicking "Show Obsolete" at the bottom of the attachment list.</li> <li>In the Email Preferences, you can now choose to get email when - a new [% terms.bug %] report is filed and you have a particular + a new [% terms.bug %] report is filed and you have a particular role on it.</li> <li>When resolving a mid-air collision, you can now choose to submit only your comment.</li> <li>You can now set the Blocks and Depends On field on the "Change Several [% terms.Bugs %] At Once" page.</li> <li>If your installation uses the "insidergroup" feature, you can now add - private comments on the "Change Several [% terms.Bugs %] At Once" + private comments on the "Change Several [% terms.Bugs %] At Once" page.</li> <li>When viewing a search result, you can now hover over any abbreviated field to see its full value.</li> @@ -1536,7 +1536,7 @@ what security groups the [% terms.bug %] has been restricted to.</li> <li>You can now use any custom drop-down field as an axis for a tabular or graphical report.</li> - <li>The <kbd>X-Bugzilla-Type</kbd> header in emails sent by + <li>The <kbd>X-Bugzilla-Type</kbd> header in emails sent by [%+ terms.Bugzilla %] is now "new" for [% terms.bug %]mail sent for newly-filed [% terms.bugs %], and "changed" for emails having to do with updated [% terms.bugs %].</li> @@ -1554,19 +1554,19 @@ <h4>Enhancements for Administrators and Developers</h4> <ul> - <li>[% terms.Bugzilla %] now uses the SHA-256 algorithm (a variant of + <li>[% terms.Bugzilla %] now uses the SHA-256 algorithm (a variant of SHA-2) to encrypt passwords in the database, instead of using Unix's "crypt" function. This allows passwords longer than eight characters to actually be effective. Each user's password will be converted to - SHA-256 the first time they log in after you upgrade to + SHA-256 the first time they log in after you upgrade to [%+ terms.Bugzilla %] 3.4 or later.</li> <li>If you are using database replication with [% terms.Bugzilla %], - many more scripts now take advantage of the read-only slave (the + many more scripts now take advantage of the read-only slave (the "shadowdb"). It may be safe to open up <kbd>show_bug.cgi</kbd> to search-engine indexing by editing your <kbd>robots.txt</kbd> file, now, if your [% terms.Bugzilla %] is on fast-enough hardware.</li> <li>The database now uses foreign keys to enforce the validity of - relationships between tables. Not every single table has all its + relationships between tables. Not every single table has all its foreign keys yet, but most do.</li> <li>Various parameters have been removed, in an effort to de-clutter the parameter interface and simplify [% terms.Bugzilla %]'s code. @@ -1574,7 +1574,7 @@ maxpatchsize, commentonclearresolution, commentonreassignbycomponent, showallproducts. They have all been replaced with sensible default behaviors. (For example, user watching is now always enabled.)</li> - <li>When adding <code>&debug=1</code> to the end of a + <li>When adding <code>&debug=1</code> to the end of a <kbd>buglist.cgi</kbd> URL, [% terms.Bugzilla %] will now also do an EXPLAIN on the query, to help debug performance issues.</li> <li>When editing flag types in the administrative interface, you can now @@ -1593,7 +1593,7 @@ and <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Bugzilla.html#time">B[% %]ugzilla.time</a> (<kbd>B[% %]ugzilla.timezone</kbd> is now deprecated). </li> - <li>For network efficiency, you can now limit which fields are returned + <li>For network efficiency, you can now limit which fields are returned from certain WebService functions, like <kbd>User.get</kbd>.</li> <li>There is now a "permissive" argument for the <kbd>B[% %]ug.get</kbd> WebService function, which causes it not to throw an error when you @@ -1623,19 +1623,19 @@ <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=69621"> [%- terms.Bug %] 69621</a>: If you rename or remove a keyword that is in use on [% terms.bugs %], you will need to rebuild the "keyword cache" - by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing - the option to rebuild the cache when it asks. Otherwise keywords may + by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing + the option to rebuild the cache when it asks. Otherwise keywords may not show up properly in search results.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=89822"> - [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at + [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at the same time, there is no "mid-air collision" protection.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=276230"> - [%- terms.Bug %] 276230</a>: The support for restricting access to - particular Categories of New Charts is not complete. You should treat + [%- terms.Bug %] 276230</a>: The support for restricting access to + particular Categories of New Charts is not complete. You should treat the 'chartgroup' Param as the only access mechanism available.<br> - However, charts migrated from Old Charts will be restricted to + However, charts migrated from Old Charts will be restricted to the groups that are marked MANDATORY for the corresponding Product. - There is currently no way to change this restriction, and the + There is currently no way to change this restriction, and the groupings will not be updated if the group configuration for the Product changes.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=370370"> @@ -1653,10 +1653,10 @@ you can always delete the database records which contain the bad values by logging in to your database and running the following command:</p> -<p><code>DELETE FROM <var>table</var> WHERE <var>column</var> IN +<p><code>DELETE FROM <var>table</var> WHERE <var>column</var> IN (<var>1, 2, 3, 4</var>)</code></p> -<p>Just replace "table" and "column" with the name of the table +<p>Just replace "table" and "column" with the name of the table and column that <kbd>checksetup.pl</kbd> mentions, and "1, 2, 3, 4" with the invalid values that <kbd>checksetup.pl</kbd> prints out.</p> @@ -1671,7 +1671,7 @@ are any), but moving any unexpected variables into a file called <kbd>localconfig.old</kbd>. If you want to continue having custom varibles in <kbd>localconfig</kbd>, you will have to add them to - the <code>LOCALCONFIG_VARS</code> constant in + the <code>LOCALCONFIG_VARS</code> constant in <kbd>Bugzilla::Install::Localconfig</kbd>.</li> <li><kbd>Bugzilla::Object->update()</kbd> now returns something different in list context than it does in scalar context.</li> @@ -1682,21 +1682,21 @@ search results are now defined in a subroutine called <code>COLUMNS</code> in <kbd>Bugzilla::Search</kbd>. The data now mostly comes from the <kbd>fielddefs</kbd> table in the database. Search.pm now takes a list - of column names from fielddefs for its <kbd>fields</kbd> argument instead + of column names from fielddefs for its <kbd>fields</kbd> argument instead of literal SQL columns.</li> <li><kbd>Bugzilla::Field->legal_values</kbd> now returns an array of <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Field/Choice.html">Bugzilla::Field::Choice</a> objects instead of an array of strings. Bugzilla::Field::Choice will be used in more places, in the future.</li> - <li>We now use <kbd>Bugzilla::Bug->check()</kbd> instead of + <li>We now use <kbd>Bugzilla::Bug->check()</kbd> instead of <kbd>ValidateBugId</kbd>.</li> - <li>The <kbd>groups</kbd> and <kbd>bless_groups</kbd> methods in - <kbd>Bugzilla::User</kbd> now return an arrayref of + <li>The <kbd>groups</kbd> and <kbd>bless_groups</kbd> methods in + <kbd>Bugzilla::User</kbd> now return an arrayref of <kbd>Bugzilla::Group</kbd> objects instead of a hashref with group ids and group names.</li> <li>Standard [% terms.Bugzilla %] drop-down fields now have their type set to <kbd>FIELD_TYPE_SINGLE_SELECT</kbd> in the fielddefs table.</li> - <li><kbd>Bugzilla->usage_mode</kbd> now defaults to + <li><kbd>Bugzilla->usage_mode</kbd> now defaults to <kbd>USAGE_MODE_CMDLINE</kbd> if we are not running inside a web server.</li> <li>We no longer delete environment variables like <kbd>$ENV{PATH}</kbd> @@ -1725,7 +1725,7 @@ <li><a href="#v32_feat">New Features and Improvements</a></li> <li><a href="#v32_issues">Outstanding Issues</a></li> <li><a href="#v32_upgrading">How to Upgrade From An Older Version</a></li> - <li><a href="#v32_code_changes">Code Changes Which May Affect + <li><a href="#v32_code_changes">Code Changes Which May Affect Customizations</a></li> <li><a href="#v32_previous">Release Notes for Previous Versions</a></li> </ul> @@ -1738,7 +1738,7 @@ <p>If you're upgrading, make sure to read <a href="#v32_upgrading">How to Upgrade From An Older Version</a>. If you are upgrading from a release - before 3.0, make sure to read the release notes for all the + before 3.0, make sure to read the release notes for all the <a href="#v32_previous">previous versions</a> in between your version and this one, <strong>particularly the "Notes For Upgraders" section of each version's release notes</strong>.</p> @@ -1749,7 +1749,7 @@ releases of [% terms.Bugzilla %] after 3.2. We only list the most important fixes in each release. If you want a detailed list of <em>everything</em> that's changed in each version, you should use our - <a href="https://www.bugzilla.org/status/changes.html">Change Log + <a href="https://www.bugzilla.org/status/changes.html">Change Log Page</a>.</p> <h3>3.2.3</h3> @@ -1758,7 +1758,7 @@ <li>[% terms.Bugzilla %] is now compatible with MySQL 5.1.x versions 5.1.31 and greater. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=480001">[% terms.Bug %] 480001</a>)</li> - <li>On Windows, [% terms.Bugzilla %] sometimes would send mangled emails + <li>On Windows, [% terms.Bugzilla %] sometimes would send mangled emails (that would often fail to send). (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=467920">[% terms.Bug %] 467920</a>)</li> <li><code>recode.pl</code> would sometimes crash when trying to convert @@ -1771,7 +1771,7 @@ again (the [% terms.bug %] XML format now contains a "token" element that can be used when updating [% terms.abug %]). (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=476678">[% terms.Bug %] 476678</a>)</li> - <li>For installations using the <code>shadowdb</code> parameter, + <li>For installations using the <code>shadowdb</code> parameter, [%+ terms.Bugzilla %] was accidentally writing to the "tokens" table in the shadow database (instead of the master database) when using the "Change Several [% terms.Bugs %] at Once" page. @@ -1784,7 +1784,7 @@ <h3>3.2.2</h3> <p>This release fixes one security issue that is critical for installations - running 3.2.1 under mod_perl. See the + running 3.2.1 under mod_perl. See the <a href="https://www.bugzilla.org/security/3.0.7/">Security Advisory</a> for details.</p> @@ -1808,12 +1808,12 @@ <li>If you were using the <code>PROJECT</code> environment variable to have multiple [% terms.Bugzilla %] installations using one codebase, - project-specific templates were being ignored. + project-specific templates were being ignored. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=467324">[% terms.Bug %] 467324</a>)</li> <li>Some versions of the SOAP::Lite Perl module had a b[% %]ug that caused - [%+ terms.Bugzilla %]'s XML-RPC service to break. - <kbd>checksetup.pl</kbd> now checks for these bad versions and + [%+ terms.Bugzilla %]'s XML-RPC service to break. + <kbd>checksetup.pl</kbd> now checks for these bad versions and will reject them. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=468009">[% terms.Bug %] 468009</a>)</li> @@ -1833,15 +1833,15 @@ <h3>3.2.2</h3> <p>This release fixes one security issue that is critical for installations - running 3.2.1 under mod_perl. See the - <a href="https://www.bugzilla.org/security/3.0.7/">Security Advisory</a> + running 3.2.1 under mod_perl. See the + <a href="https://www.bugzilla.org/security/3.0.7/">Security Advisory</a> for details.</p> <h3>3.2.1</h3> <p>This release contains several security fixes. One fix may break any automated scripts you have that are loading <kbd>process_bug.cgi</kbd> - directly. We recommend that you read the entire + directly. We recommend that you read the entire <a href="https://www.bugzilla.org/security/2.22.6/">Security Advisory</a> for this release.</p> @@ -1891,7 +1891,7 @@ <table class="req_table" border="0" cellpadding="0" cellspacing="0"> <tr> <th>Module</th> <th>Version</th> </tr> -<tr> <td>CGI</td> <td class="req_new">3.21 (on Perl 5.8.x) +<tr> <td>CGI</td> <td class="req_new">3.21 (on Perl 5.8.x) or 3.33 (on Perl 5.10.x)</td> </tr> <tr> <td>Date::Format</td> <td>2.21</td> </tr> <tr> <td>File::Spec</td> <td>0.84</td> </tr> @@ -1899,12 +1899,12 @@ <tr> <td>Template</td> <td class="req_new">2.15</td> </tr> <tr> <td>Email::Send</td> <td>2.00</td> </tr> <tr> <td>Email::MIME</td> <td class="req_new">1.861</td> </tr> -<tr> - <td class="req_new">Email::MIME::Encodings</td> +<tr> + <td class="req_new">Email::MIME::Encodings</td> <td class="req_new">1.313</td> </tr> <tr> - <td>Email::MIME::Modifier</td> + <td>Email::MIME::Modifier</td> <td class="req_new">1.442</td> </tr> </table> @@ -1915,7 +1915,7 @@ features of [% terms.Bugzilla %]:</p> <table class="req_table" border="0" cellpadding="0" cellspacing="0"> -<tr> +<tr> <th>Module</th> <th>Version</th> <th>Enables Feature</th> @@ -1926,93 +1926,93 @@ <td>Automatic Update Notifications</td> </tr> <tr> - <td>Template::Plugin::GD::Image</td> - <td>(Any)</td> + <td>Template::Plugin::GD::Image</td> + <td>(Any)</td> <td>Graphical Reports</td> </tr> <tr> - <td>GD::Text</td> - <td>(Any)</td> + <td>GD::Text</td> + <td>(Any)</td> <td>Graphical Reports</td> </tr> <tr> - <td>GD::Graph</td> - <td>(Any)</td> + <td>GD::Graph</td> + <td>(Any)</td> <td>Graphical Reports</td> </tr> <tr> - <td>GD</td> - <td>1.20</td> + <td>GD</td> + <td>1.20</td> <td>Graphical Reports, New Charts, Old Charts</td> </tr> <tr> - <td>Email::MIME::Attachment::Stripper</td> - <td>(Any)</td> + <td>Email::MIME::Attachment::Stripper</td> + <td>(Any)</td> <td>Inbound Email</td> </tr> <tr> - <td>Email::Reply</td> - <td>(Any)</td> + <td>Email::Reply</td> + <td>(Any)</td> <td>Inbound Email</td> </tr> <tr> - <td>Net::LDAP</td> - <td>(Any)</td> + <td>Net::LDAP</td> + <td>(Any)</td> <td>LDAP Authentication</td> </tr> <tr> - <td>HTML::Parser</td> - <td>3.40</td> + <td>HTML::Parser</td> + <td>3.40</td> <td>More HTML in Product/Group Descriptions</td> </tr> <tr> - <td>HTML::Scrubber</td> - <td>(Any)</td> + <td>HTML::Scrubber</td> + <td>(Any)</td> <td>More HTML in Product/Group Descriptions</td> </tr> <tr> - <td>XML::Twig</td> - <td>(Any)</td> + <td>XML::Twig</td> + <td>(Any)</td> <td>Move [% terms.Bugs %] Between Installations</td> </tr> <tr> - <td>MIME::Parser</td> - <td>5.406</td> + <td>MIME::Parser</td> + <td>5.406</td> <td>Move [% terms.Bugs %] Between Installations</td> </tr> <tr> - <td>Chart::Base</td> - <td>1.0</td> + <td>Chart::Base</td> + <td>1.0</td> <td>New Charts, Old Charts</td> </tr> <tr> - <td>Image::Magick</td> - <td>(Any)</td> + <td>Image::Magick</td> + <td>(Any)</td> <td>Optionally Convert BMP Attachments to PNGs</td> </tr> <tr> - <td>PatchReader</td> - <td>0.9.4</td> + <td>PatchReader</td> + <td>0.9.4</td> <td>Patch Viewer</td> </tr> <tr> - <td class="req_new">Authen::Radius</td> - <td class="req_new">(Any)</td> + <td class="req_new">Authen::Radius</td> + <td class="req_new">(Any)</td> <td>RADIUS Authentication</td> </tr> <tr> - <td class="req_new">Authen::SASL</td> - <td class="req_new">(Any)</td> + <td class="req_new">Authen::SASL</td> + <td class="req_new">(Any)</td> <td>SMTP Authentication</td> </tr> <tr> - <td>SOAP::Lite</td> - <td>(Any)</td> + <td>SOAP::Lite</td> + <td>(Any)</td> <td>XML-RPC Interface</td> </tr> <tr> - <td>mod_perl2</td> - <td>1.999022</td> + <td>mod_perl2</td> + <td>1.999022</td> <td>mod_perl</td> </tr> </table> @@ -2034,7 +2034,7 @@ <h3 id="v32_feat_ui">Major UI Improvements</h3> <p>[% terms.Bugzilla %] 3.2 has had some UI assistance from the NASA - Human-Computer Interaction department and the new + Human-Computer Interaction department and the new <a href="https://wiki.mozilla.org/Bugzilla:UE">[% terms.Bugzilla %] User Interface Team</a>.</p> @@ -2046,7 +2046,7 @@ <p>[% terms.Bugzilla %] 3.2 now ships with a skin called "Dusk" that is a bit more colorful than old default "Classic" skin.</p> -<p>Upgrading installations will still default to the "Classic" +<p>Upgrading installations will still default to the "Classic" skin--administrators can change the default in the Default Preferences control panel. Users can also choose to use the old skin in their Preferences (or using the View :: Page Style menu in Firefox).</p> @@ -2078,7 +2078,7 @@ <h3 id="v32_feat_install">Easier Installation</h3> -<p>[% terms.Bugzilla %] now comes with a script called +<p>[% terms.Bugzilla %] now comes with a script called <kbd>install-module.pl</kbd> that can automatically download and install all of the required Perl modules for [% terms.Bugzilla %]. It stores them in a directory inside your [% terms.Bugzilla %] @@ -2091,8 +2091,8 @@ <h3 id="v32_feat_oracle">Experimental Oracle Support</h3> -<p>[% terms.Bugzilla %] 3.2 contains experimental support for using - Oracle as its database. Some features of [% terms.Bugzilla %] are known +<p>[% terms.Bugzilla %] 3.2 contains experimental support for using + Oracle as its database. Some features of [% terms.Bugzilla %] are known to be broken on Oracle, but hopefully will be working by our next major release.</p> @@ -2102,7 +2102,7 @@ you to use [% terms.Bugzilla %]!</p> <p>The [% terms.Bugzilla %] Project thanks Oracle Corp. for their extensive - development contributions to [% terms.Bugzilla %] which allowed this to + development contributions to [% terms.Bugzilla %] which allowed this to happen!</p> <h3 id="v32_feat_utf8">Improved UTF-8 Support</h3> @@ -2118,7 +2118,7 @@ <p>Administrators can now specify that users who are in certain groups should have an icon appear next to their name whenever they comment. - This is particularly useful for distinguishing developers from + This is particularly useful for distinguishing developers from [%+ terms.bug %] reporters.</p> <h3 id="v32_feat_other">Other Enhancements and Changes</h3> @@ -2131,35 +2131,35 @@ <ul> <li><strong>[% terms.Bugs %]</strong>: You can now reassign [%+ terms.abug %] at the same time as you are changing its status.</li> - <li><strong>[% terms.Bugs %]</strong>: When entering [% terms.abug %], + <li><strong>[% terms.Bugs %]</strong>: When entering [% terms.abug %], you will now see the description of a component when you select it.</li> - <li><strong>[% terms.Bugs %]</strong>: The [% terms.bug %] view now + <li><strong>[% terms.Bugs %]</strong>: The [% terms.bug %] view now contains some <a href="http://microformats.org/about/">Microformats</a>, most notably for users' names and email addresses.</li> <li><strong>[% terms.Bugs %]</strong>: You can now remove a QA Contact from [% terms.abug %] simply by clearing the QA Contact field.</li> - <li><strong>[% terms.Bugs %]</strong>: There is now a user preference - that will allow you to exclude the quoted text when replying + <li><strong>[% terms.Bugs %]</strong>: There is now a user preference + that will allow you to exclude the quoted text when replying to comments.</li> <li><strong>[% terms.Bugs %]</strong>: You can now expand or collapse individual comments in the [% terms.bug %] view.</li> - <li><strong>Attachments</strong>: There is now "mid-air collision" + <li><strong>Attachments</strong>: There is now "mid-air collision" protection when editing attachments.</li> - <li><strong>Attachments</strong>: Patches in the Diff Viewer now show + <li><strong>Attachments</strong>: Patches in the Diff Viewer now show line numbers (<a href="https://bugzilla.mozilla.org/attachment.cgi?id=327546">Example</a>).</li> <li><strong>Attachments</strong>: After creating or updating an attachment, you will be immediately shown the [% terms.bug %] that the attachment is on.</li> - <li><strong>Search</strong>: You can now reverse the sort of + <li><strong>Search</strong>: You can now reverse the sort of [%+ terms.abug %] list by clicking on a column header again.</li> <li><strong>Search</strong>: Atom feeds of [% terms.bug %] lists now contain more fields.</li> <li><strong>Search</strong>: QuickSearch now supports searching flags and groups. It also now includes the OS field in the list of fields it searches by default.</li> - <li><strong>Search</strong>: "Help" text can now appear on query.cgi + <li><strong>Search</strong>: "Help" text can now appear on query.cgi for Internet Explorer and other non-Firefox browsers. (It always could appear for Firefox.)</li> @@ -2167,19 +2167,19 @@ up next to the URL in most browsers. If you want to replace it, it's in <kbd>images/favicon.ico</kbd>.</li> - <li>You can now set the Deadline when using "Change Several + <li>You can now set the Deadline when using "Change Several [%+ terms.Bugs %] At Once"</li> - <li><strong>Saved Searches</strong> now save their column list, so if - you customize the list of columns and save your search, it will + <li><strong>Saved Searches</strong> now save their column list, so if + you customize the list of columns and save your search, it will always contain those columns.</li> <li><strong>Saved Searches</strong>: When you share a search, you can - now see how many users have subscribed to it, on + now see how many users have subscribed to it, on <kbd>userprefs.cgi</kbd>.</li> - <li><strong>Saved Searches</strong>: You can now see what group a + <li><strong>Saved Searches</strong>: You can now see what group a shared search was shared to, on the list of available shared searches in <kbd>userprefs.cgi</kbd>.</li> - <li><strong>Flags</strong>: If your installation uses drop-down user - lists, the flag requestee box will now contain only users who are + <li><strong>Flags</strong>: If your installation uses drop-down user + lists, the flag requestee box will now contain only users who are actually allowed to take requests.</li> <li><strong>Flags</strong>: If somebody makes a request to you, and you change the requestee to somebody else, the requester is no longer set @@ -2190,7 +2190,7 @@ <li>When using <kbd>email_in.pl</kbd>, you can now add users to the CC list by just using <kbd>@cc</kbd> as the field name.</li> <li>Many pages (particularly administrative pages) now contain links to - the relevant section of the [% terms.Bugzilla %] Guide, so you can read + the relevant section of the [% terms.Bugzilla %] Guide, so you can read the documentation for that page.</li> <li>Dependency Graphs should render more quickly, as they now (by default) only include the same [% terms.bugs %] that you'd see in the dependency @@ -2200,39 +2200,39 @@ <h4>Enhancements For Administrators</h4> <ul> - <li><strong>Admin UI</strong>: Instead of having the Administration - Control Panel links in the footer, there is now just one link called + <li><strong>Admin UI</strong>: Instead of having the Administration + Control Panel links in the footer, there is now just one link called "Administration" that takes you to a page that links to all the administrative controls for [% terms.Bugzilla %].</li> <li><strong>Admin UI</strong>: Administrative pages no longer display - confirmation pages, instead they redirect you to some useful page + confirmation pages, instead they redirect you to some useful page and display a message about what changed.</li> - <li><strong>Admin UI</strong>: The interface for editing group + <li><strong>Admin UI</strong>: The interface for editing group inheritance in <kbd>editgroups.cgi</kbd> is much clearer now.</li> - <li><strong>Admin UI</strong>: When editing a user, you can now see + <li><strong>Admin UI</strong>: When editing a user, you can now see all the components where that user is the Default Assignee or Default QA Contact.</li> - <li><strong>Email</strong>: For installations that use SMTP to send + <li><strong>Email</strong>: For installations that use SMTP to send mail (as opposed to Sendmail), [%+ terms.Bugzilla %] now supports - SMTP Authentication, so that it can log in to your mail server + SMTP Authentication, so that it can log in to your mail server before sending messages.</li> <li><strong>Email</strong>: Using the "Test" mail delivery method now creates a valid mbox file to make testing easier.</li> - <li><strong>Authentication</strong>: [% terms.Bugzilla %] now correctly + <li><strong>Authentication</strong>: [% terms.Bugzilla %] now correctly handles LDAP records which contain multiple email addresses. (The first - email address in the list that is a valid [% terms.Bugzilla %] account - will be used, or if this is a new user, the first email address in + email address in the list that is a valid [% terms.Bugzilla %] account + will be used, or if this is a new user, the first email address in the list will be used.)</li> - <li><strong>Authentication</strong>: [% terms.Bugzilla %] can now take + <li><strong>Authentication</strong>: [% terms.Bugzilla %] can now take a list of LDAP servers to try in order until it gets a successful connection.</li> - <li><strong>Authentication</strong>: [% terms.Bugzilla %] now supports + <li><strong>Authentication</strong>: [% terms.Bugzilla %] now supports RADIUS authentication.</li> - <li><strong>Security</strong>: The login cookie is now created as - "HTTPOnly" so that it can't be read by possibly malicious scripts. + <li><strong>Security</strong>: The login cookie is now created as + "HTTPOnly" so that it can't be read by possibly malicious scripts. Also, if SSL is enabled on your installation, the login cookie is now only sent over SSL connections.</li> <li><strong>Security</strong>: The <code>ssl</code> parameter now protects @@ -2240,12 +2240,12 @@ Also, SSL is now enforced appropriately in the WebServices interface when the parameter is set.</li> - <li><strong>Database</strong>: [% terms.Bugzilla %] now uses transactions in + <li><strong>Database</strong>: [% terms.Bugzilla %] now uses transactions in the database instead of table locks. This should generally improve performance with many concurrent users. It also means if there is an unexpected error in the middle of a page, all database changes made during that page will be rolled back.</li> - <li><strong>Database</strong>: You no longer have to set + <li><strong>Database</strong>: You no longer have to set <code>max_packet_size</code> in MySQL to add large attachments. However, you may need to set it manually if you restore a mysqldump into your database.</li> @@ -2256,7 +2256,7 @@ <li>You can now delete custom fields, but only if they have never been set on any [% terms.bug %].</li> - <li>There is now a <kbd>--reset-password</kbd> argument to + <li>There is now a <kbd>--reset-password</kbd> argument to <kbd>checksetup.pl</kbd> that allows you to reset a user's password from the command line.</li> <li>There is now a script called <kbd>sanitycheck.pl</kbd> that you can @@ -2280,7 +2280,7 @@ <li>The voting system is off by default in new installs. This is to prepare for the fact that it will be moved into an extension at some point in the future.</li> - <li>The <code>shutdownhtml</code> parameter now works even when + <li>The <code>shutdownhtml</code> parameter now works even when [%+ terms.Bugzilla %]'s database server is down.</li> </ul> @@ -2307,19 +2307,19 @@ <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=69621"> [%- terms.Bug %] 69621</a>: If you rename or remove a keyword that is in use on [% terms.bugs %], you will need to rebuild the "keyword cache" - by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing - the option to rebuild the cache when it asks. Otherwise keywords may + by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing + the option to rebuild the cache when it asks. Otherwise keywords may not show up properly in search results.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=89822"> - [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at + [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at the same time, there is no "mid-air collision" protection.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=276230"> - [%- terms.Bug %] 276230</a>: The support for restricting access to - particular Categories of New Charts is not complete. You should treat + [%- terms.Bug %] 276230</a>: The support for restricting access to + particular Categories of New Charts is not complete. You should treat the 'chartgroup' Param as the only access mechanism available.<br> - However, charts migrated from Old Charts will be restricted to + However, charts migrated from Old Charts will be restricted to the groups that are marked MANDATORY for the corresponding Product. - There is currently no way to change this restriction, and the + There is currently no way to change this restriction, and the groupings will not be updated if the group configuration for the Product changes.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=370370"> @@ -2332,7 +2332,7 @@ <h3 id="v32_upgrading_notes">Notes For Upgraders</h3> <ul> - <li>If you upgrade by CVS, the <kbd>extensions</kbd> and + <li>If you upgrade by CVS, the <kbd>extensions</kbd> and <kbd>skins/contrib</kbd> directories are now in CVS instead of being created by <kbd>checksetup.pl</kbd> If you do a <kbd>cvs update</kbd> from 3.0, you will be told that your directories are "in the way" and @@ -2347,9 +2347,9 @@ the upgrade will not be able to complete (and <kbd>checksetup.pl</kbd> will tell you so).</li> - <li><strong>You should also read the + <li><strong>You should also read the <a href="#v30_upgrading_notes">[% terms.Bugzilla %] 3.0 Notes For Upgraders - section</a> of the + section</a> of the <a href="#v32_previous">previous release notes</a> if you are upgrading from a version before 3.0.</strong></li> </ul> @@ -2357,7 +2357,7 @@ <h3>Steps For Upgrading</h3> <p>Once you have read the notes above, see the - <a href="[% docs_urlbase FILTER html %]upgrade.html">Upgrading + <a href="[% docs_urlbase FILTER html %]upgrade.html">Upgrading documentation</a> for instructions on how to upgrade.</p> <h2 id="v32_code_changes">Code Changes Which May Affect Customizations</h2> @@ -2411,7 +2411,7 @@ <li><a href="#v30_issues">Outstanding Issues</a></li> <li><a href="#v30_security">Security Fixes In This Release</a></li> <li><a href="#v30_upgrading">How to Upgrade From An Older Version</a></li> - <li><a href="#v30_code_changes">Code Changes Which May Affect + <li><a href="#v30_code_changes">Code Changes Which May Affect Customizations</a></li> <li><a href="#v30_previous">Release Notes for Previous Versions</a></li> </ul> @@ -2426,8 +2426,8 @@ <p>If you're upgrading, make sure to read <a href="#v30_upgrading">How to Upgrade From An Older Version</a>. If you are upgrading from a release - before 2.22, make sure to read the release notes for all the - <a href="#v30_previous">previous versions</a> in between your version + before 2.22, make sure to read the release notes for all the + <a href="#v30_previous">previous versions</a> in between your version and this one.</p> <h2 id="v30_point">Updates in this 3.0.x Release</h2> @@ -2462,9 +2462,9 @@ closing its connections to the database since 3.0.3, and so sometimes the DB would run out of connections. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=441592">[% terms.Bug %] 441592</a>)</li> - <li>The installation script is now clear about exactly which + <li>The installation script is now clear about exactly which <code>Email::</code> modules are required in Perl, thus avoiding the - problem where emails show up with a body like + problem where emails show up with a body like <samp>SCALAR(0xBF126795)</samp>. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=441541">[% terms.Bug %] 441541</a>)</li> <li><a href="[% docs_urlbase FILTER html %]api/email_in.html">email_in.pl</a> @@ -2493,7 +2493,7 @@ <li>Better threading of [% terms.bug %]mail in some email clients. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=376453">[% terms.Bug %] 376453</a>)</li> - <li>There were many fixes to the Inbound Email Interface + <li>There were many fixes to the Inbound Email Interface (<kbd>email_in.pl</kbd>). (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=92274">[% terms.Bug %] 92274</a>, <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=377025">[% terms.Bug %] 377025</a>, @@ -2528,14 +2528,14 @@ <ul> <li>mod_perl no longer compiles [% terms.Bugzilla %]'s code for each Apache process individually. It now compiles code only once and shares it among - each Apache process. This greatly improves performance and highly + each Apache process. This greatly improves performance and highly decreases the memory footprint. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=398241">[% terms.Bug %] 398241</a>)</li> <li>You can now search for '---' (without quotes) in versions and milestones. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=362436">[% terms.Bug %] 362436</a>)</li> - <li>[% terms.Bugzilla %] should no longer break lines unnecessarily in + <li>[% terms.Bugzilla %] should no longer break lines unnecessarily in email subjects. This was causing trouble with some email clients. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=374424">[% terms.Bug %] 374424</a>)</li> @@ -2545,7 +2545,7 @@ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=394796">[% terms.Bug %] 394796</a>)</li> <li>Deleting a user account no longer deletes whines from another user who - has the deleted account as addressee. The schedule is simply removed, + has the deleted account as addressee. The schedule is simply removed, but the whine itself is left intact. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=395924">[% terms.Bug %] 395924</a>)</li> @@ -2553,7 +2553,7 @@ fields when merging two user accounts. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=400160">[% terms.Bug %] 400160</a>)</li> - <li>[% terms.Bugzilla %] no longer requires Apache::DBI to run under + <li>[% terms.Bugzilla %] no longer requires Apache::DBI to run under mod_perl. It caused troubles such as lost connections with the DB and didn't give any important performance gain. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=408766">[% terms.Bug %] 408766</a>)</li> @@ -2587,7 +2587,7 @@ <code>specific_search_allow_empty_words</code>. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=385910">[% terms.Bug %] 385910</a>)</li> <li>If you attach a file that has a MIME-type of <code>text/x-patch</code> - or <code>text/x-diff</code>, it will automatically be treated as a + or <code>text/x-diff</code>, it will automatically be treated as a patch by [% terms.Bugzilla %]. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=365756">[% terms.Bug %] 365756</a>)</li> <li>Dependency Graphs now work correctly on all mod_perl installations. @@ -2608,19 +2608,19 @@ <li>PostgreSQL users: New Charts were failing to collect data over time. They will now start collecting data correctly. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=257351">[% terms.Bug %] 257351</a>)</li> - <li>Some flag mails didn't specify who the requestee was. + <li>Some flag mails didn't specify who the requestee was. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=379787">[% terms.Bug %] 379787</a>)</li> <li>Instead of throwing real errors, <kbd>collectstats.pl</kbd> would just say that it couldn't find <code>ThrowUserError</code>. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=380709">[% terms.Bug %] 380709</a>)</li> <li>Logging into [% terms.Bugzilla %] from the home page works again - with IIS5. + with IIS5. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=364008">[% terms.Bug %] 364008</a>)</li> <li>If you were using SMTP for sending email, sometimes emails would be missing the <code>Date</code> header. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=304999">[% terms.Bug %] 304999</a>).</li> <li>In the XML-RPC WebService, <code>B<!-- -->ug.legal_values</code> now - correctly returns values for custom fields if you request values + correctly returns values for custom fields if you request values for custom fields. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=381737">[% terms.Bug %] 381737</a>)</li> <li>The "[% terms.Bug %]-Writing Guidelines" page has been shortened @@ -2634,7 +2634,7 @@ every SMTP session to your web server's error log, to help with debugging issues with SMTP. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=384497">[% terms.Bug %] 384497</a>)</li> - <li>If you are a "global watcher" (you get all mails from every + <li>If you are a "global watcher" (you get all mails from every [%+ terms.bug %]), you can now see that in your Email Preferences. (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=365302">[% terms.Bug %] 365302</a>)</li> <li>The Status and Resolution of [% terms.bugs %] are now correctly @@ -2666,7 +2666,7 @@ <h3 id="v30_req_perl">Perl</h3> <ul> - <li>Perl <span class="req_new">v<strong>5.8.0</strong></span> (non-Windows + <li>Perl <span class="req_new">v<strong>5.8.0</strong></span> (non-Windows platforms)</li> <li>Perl v<strong>5.8.1</strong> (Windows platforms)</li> </ul> @@ -2697,7 +2697,7 @@ <td>Date::Format</td> <td>2.21</td> </tr> <tr> - <td>DBI</td> + <td>DBI</td> <td class="req_new">1.41</td> </tr> <tr> @@ -2707,15 +2707,15 @@ <td>Template</td> <td>2.12</td> </tr> <tr> - <td class="req_new">Email::Send</td> + <td class="req_new">Email::Send</td> <td class="req_new">2.00</td> </tr> <tr> - <td>Email::MIME</td> + <td>Email::MIME</td> <td>1.861</td> </tr> <tr> - <td class="req_new">Email::MIME::Modifier</td> + <td class="req_new">Email::MIME::Modifier</td> <td class="req_new">1.442</td> </tr> </table> @@ -2731,93 +2731,93 @@ <th>Enables Feature</th> </tr> <tr> - <td class="req_new">LWP::UserAgent</td> - <td class="req_new">(Any)</td> + <td class="req_new">LWP::UserAgent</td> + <td class="req_new">(Any)</td> <td>Automatic Update Notifications</td> </tr> <tr> - <td>Template::Plugin::GD::Image</td> - <td>(Any)</td> + <td>Template::Plugin::GD::Image</td> + <td>(Any)</td> <td>Graphical Reports</td> </tr> <tr> - <td>GD::Graph</td> - <td>(Any)</td> + <td>GD::Graph</td> + <td>(Any)</td> <td>Graphical Reports</td> </tr> <tr> - <td>GD::Text</td> - <td>(Any)</td> + <td>GD::Text</td> + <td>(Any)</td> <td>Graphical Reports</td> </tr> <tr> - <td>GD</td> - <td>1.20</td> + <td>GD</td> + <td>1.20</td> <td>Graphical Reports, New Charts, Old Charts</td> </tr> <tr> - <td class="req_new">Email::MIME::Attachment::Stripper</td> - <td class="req_new">(Any)</td> + <td class="req_new">Email::MIME::Attachment::Stripper</td> + <td class="req_new">(Any)</td> <td>Inbound Email</td> </tr> <tr> - <td class="req_new">Email::Reply</td> - <td class="req_new">(Any)</td> + <td class="req_new">Email::Reply</td> + <td class="req_new">(Any)</td> <td>Inbound Email</td> </tr> <tr> - <td>Net::LDAP</td> - <td>(Any)</td> + <td>Net::LDAP</td> + <td>(Any)</td> <td>LDAP Authentication</td> </tr> <tr> - <td>HTML::Parser</td> - <td>3.40</td> + <td>HTML::Parser</td> + <td>3.40</td> <td>More HTML in Product/Group Descriptions</td> </tr> <tr> - <td>HTML::Scrubber</td> - <td>(Any)</td> + <td>HTML::Scrubber</td> + <td>(Any)</td> <td>More HTML in Product/Group Descriptions</td> </tr> <tr> - <td>XML::Twig</td> - <td>(Any)</td> + <td>XML::Twig</td> + <td>(Any)</td> <td>Move [% terms.Bugs %] Between Installations</td> </tr> <tr> - <td>MIME::Parser</td> - <td>5.406</td> + <td>MIME::Parser</td> + <td>5.406</td> <td>Move [% terms.Bugs %] Between Installations</td> </tr> <tr> - <td>Chart::Base</td> - <td>1.0</td> + <td>Chart::Base</td> + <td>1.0</td> <td>New Charts, Old Charts</td> </tr> <tr> - <td>Image::Magick</td> - <td>(Any)</td> + <td>Image::Magick</td> + <td>(Any)</td> <td>Optionally Convert BMP Attachments to PNGs</td> </tr> <tr> - <td>PatchReader</td> - <td>0.9.4</td> + <td>PatchReader</td> + <td>0.9.4</td> <td>Patch Viewer</td> </tr> <tr> - <td class="req_new">SOAP::Lite</td> - <td class="req_new">(Any)</td> + <td class="req_new">SOAP::Lite</td> + <td class="req_new">(Any)</td> <td>XML-RPC Interface</td> </tr> <tr> - <td class="req_new">mod_perl2</td> - <td class="req_new">1.999022</td> + <td class="req_new">mod_perl2</td> + <td class="req_new">1.999022</td> <td>mod_perl</td> </tr> <tr> - <td> CGI</td> - <td>3.11</td> + <td> CGI</td> + <td>3.11</td> <td>mod_perl</td> </tr> </table> @@ -2836,13 +2836,13 @@ <li><a href="#v30_feat_ui">User Interface Improvements</a></li> <li><a href="#v30_feat_xml">XML-RPC Interface</a></li> <li><a href="#v30_feat_skin">Skins</a></li> - <li><a href="#v30_feat_sbu">Unchangeable Fields Appear + <li><a href="#v30_feat_sbu">Unchangeable Fields Appear Unchangeable</a></li> <li><a href="#v30_feat_et">All Emails in Templates</a></li> <li><a href="#v30_feat_df">No More Double-Filed [% terms.Bugs %]</a></li> <li><a href="#v30_feat_cc">Default CC List for Components</a></li> <li><a href="#v30_feat_emi">File/Modify [% terms.Bugs %] By Email</a></li> - <li><a href="#v30_feat_gw">Users Who Get All [% terms.Bug %] + <li><a href="#v30_feat_gw">Users Who Get All [% terms.Bug %] Notifications</a></li> <li><a href="#v30_feat_utf8">Improved UTF-8 Support</a></li> <li><a href="#v30_feat_upda">Automatic Update Notification</a></li> @@ -2881,7 +2881,7 @@ <h3 id="v30_feat_sq">Shared Saved Searches</h3> <p>Users can now choose to "share" their saved searches - with a certain group. That group will then be able to + with a certain group. That group will then be able to "subscribe" to those searches, and have them appear in their footer.</p> @@ -2892,7 +2892,7 @@ unsubscribe from any particular search, if they want.)</p> <p>In order to allow a user to share their queries, they also - have to be a member of the group specified in the + have to be a member of the group specified in the <code>querysharegroup</code> parameter.</p> <p>Users can control their shared and subscribed queries from @@ -2900,7 +2900,7 @@ <h3 id="v30_feat_afn">Attachments and Flags on New [% terms.Bugs %]</h3> -<p>You can now add an attachment while you are filing a new +<p>You can now add an attachment while you are filing a new [%+ terms.bug %].</p> <p>You can also set flags on the [% terms.bug %] and on attachments, while @@ -2931,9 +2931,9 @@ <ul> <li>There is now navigation and a search box a the <em>top</em> of each page, in addition to the bar at the bottom of the page.</li> - <li>A re-designed "Format for Printing" page for + <li>A re-designed "Format for Printing" page for [%+ terms.bugs %].</li> - <li>The layout of <kbd>show_bug.cgi</kbd> (the [% terms.bug %] editing + <li>The layout of <kbd>show_bug.cgi</kbd> (the [% terms.bug %] editing page) has been changed, and the attachment table has been redesigned.</li> </ul> @@ -2943,8 +2943,8 @@ protocol. It can be accessed by external applications by going to the <kbd>xmlrpc.cgi</kbd> on your installation.</p> -<p>Documentation can be found in the - <a href="[% docs_urlbase FILTER html %]api/">[% terms.Bugzilla %] +<p>Documentation can be found in the + <a href="[% docs_urlbase FILTER html %]api/">[% terms.Bugzilla %] API Docs</a>, in the various <kbd>Bugzilla::WebService</kbd> modules.</p> <h3 id="v30_feat_skin">Skins</h3> @@ -2960,8 +2960,8 @@ <h3 id="v30_feat_sbu">Unchangeable Fields Appear Unchangeable</h3> -<p>As long as you are logged in, when viewing [% terms.abug %], if you - cannot change a field, it will not look like you can change it. That +<p>As long as you are logged in, when viewing [% terms.abug %], if you + cannot change a field, it will not look like you can change it. That is, the value will just appear as plain text.</p> <h3 id="v30_feat_et">All Emails in Templates</h3> @@ -2981,14 +2981,14 @@ <h3 id="v30_feat_df">No More Double-Filed [% terms.Bugs %]</h3> -<p>Users of [% terms.Bugzilla %] will sometimes accidentally submit - [%+ terms.abug %] twice, either by going back in their web browser, - or just by refreshing a page. In the past, this could file the same - [%+ terms.bug %] twice (or even three times) in a row, irritating +<p>Users of [% terms.Bugzilla %] will sometimes accidentally submit + [%+ terms.abug %] twice, either by going back in their web browser, + or just by refreshing a page. In the past, this could file the same + [%+ terms.bug %] twice (or even three times) in a row, irritating developers and confusing users.</p> -<p>Now, if you try to submit [% terms.abug %] twice from the same screen - (by going back or by refreshing the page), [% terms.Bugzilla %] will warn +<p>Now, if you try to submit [% terms.abug %] twice from the same screen + (by going back or by refreshing the page), [% terms.Bugzilla %] will warn you about what you're doing, before it actually submits the duplicate [%+ terms.bug %].</p> @@ -3030,7 +3030,7 @@ when you log in if there is a new release of [% terms.Bugzilla %] available to download.</p> -<p>You can control these notifications by changing the +<p>You can control these notifications by changing the <kbd>upgrade_notification</kbd> parameter.</p> <p>If your [% terms.Bugzilla %] installation is on a machine that needs to go @@ -3047,7 +3047,7 @@ <p>Firefox 2 users and Internet Explorer 7 users will be presented with the option to add [% terms.Bugzilla %] to their search bar. - This uses the + This uses the <a href="page.cgi?id=quicksearch.html">QuickSearch syntax</a>.</p> <h3 id="v30_feat_other">Other Enhancements and Changes</h3> @@ -3061,48 +3061,48 @@ <li>In comments, quoted text (lines that start with <kbd>></kbd>) will be a different color from normal text.</li> <li>There is now a user preference that will add you to the CC list - of any [% terms.bug %] you modify. Note that it's <strong>on</strong> + of any [% terms.bug %] you modify. Note that it's <strong>on</strong> by default.</li> - <li>[% terms.Bugs %] can now be filed with an initial state of + <li>[% terms.Bugs %] can now be filed with an initial state of <kbd>ASSIGNED</kbd>, if you are in the <kbd>editbugs</kbd> group.</li> <li>By default, comment fields will zoom large when you are typing in them, and become small when you move out of them. You can disable this in your user preferences.</li> <li>You can hide obsolete attachments on [% terms.abug %] by clicking "Hide Obsolete" at the bottom of the attachment table.</li> - <li>If [% terms.abug %] has flags set, and you move it to a different - product that has flags with the same name, the flags will be + <li>If [% terms.abug %] has flags set, and you move it to a different + product that has flags with the same name, the flags will be preserved.</li> <li>You now can't request a flag to be set by somebody who can't set it ([% terms.Bugzilla %] will throw an error if you try).</li> <li>Many new headers have been added to outbound [% terms.Bugzilla %] [%+ terms.bug %] emails: <code>X-Bugzilla-Status</code>, <code>X-Bugzilla-Priority</code>, <code>X-Bugzilla-Assigned-To</code>, - <code>X-Bugzilla-Target-Milestone</code>, and + <code>X-Bugzilla-Target-Milestone</code>, and <code>X-Bugzilla-Changed-Fields</code>, <code>X-Bugzilla-Who</code>. You can look at an email to get an idea of what they contain.</li> <li>In addition to the old <code>X-Bugzilla-Reason</code> email header which tells you why you got an email, if you got an email because - you were watching somebody, there is now an + you were watching somebody, there is now an <code>X-Bugzilla-Watch-Reason</code> header that tells you who you were watching and what role they had.</li> - <li>If you hover your mouse over a full URL (like - <code>http://bugs.mycompany.com/show_bug.cgi?id=1212</code>) that - links to [% terms.abug %], you will see the title of the + <li>If you hover your mouse over a full URL (like + <code>http://bugs.mycompany.com/show_bug.cgi?id=1212</code>) that + links to [% terms.abug %], you will see the title of the [%+ terms.bug %]. Of course, this only works for [% terms.bugs %] in your [%+ terms.Bugzilla %] installation.</li> <li>If your installation has user watching enabled, you will now see the users that you can remove from your watch-list as a multi-select box, much like the current CC list. (Previously it was just a text box.)</li> - <li>When a user creates their own account in [% terms.Bugzilla %], the + <li>When a user creates their own account in [% terms.Bugzilla %], the account is now not actually created until they verify their email address by clicking on a link that is emailed to them.</li> <li>You can change [% terms.abug %]'s resolution without reopening it.</li> - <li>When you view the dependency tree on [% terms.abug %], resolved + <li>When you view the dependency tree on [% terms.abug %], resolved [%+ terms.bugs %] will be hidden by default. (In previous versions, resolved [% terms.bugs %] were shown by default.)</li> - <li>When viewing [% terms.bug %] activity, fields that hold [% terms.bug %] + <li>When viewing [% terms.bug %] activity, fields that hold [% terms.bug %] numbers (such as "Blocks") will have the [% terms.bug %] numbers displayed as links to those [% terms.bugs %].</li> <li>When viewing the "Keywords" field in [% terms.abug %] list, @@ -3164,22 +3164,22 @@ <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=69621"> [%- terms.Bug %] 69621</a>: If you rename or remove a keyword that is in use on [% terms.bugs %], you will need to rebuild the "keyword cache" - by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing - the option to rebuild the cache when it asks. Otherwise keywords may + by running <a href="sanitycheck.cgi">sanitycheck.cgi</a> and choosing + the option to rebuild the cache when it asks. Otherwise keywords may not show up properly in search results.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=99215"> - [%- terms.Bug %] 99215</a>: Flags are not protected by "mid-air + [%- terms.Bug %] 99215</a>: Flags are not protected by "mid-air collision" detection. Nor are any attachment changes.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=89822"> - [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at + [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at the same time, there is no "mid-air collision" protection.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=276230"> - [%- terms.Bug %] 276230</a>: The support for restricting access to - particular Categories of New Charts is not complete. You should treat + [%- terms.Bug %] 276230</a>: The support for restricting access to + particular Categories of New Charts is not complete. You should treat the 'chartgroup' Param as the only access mechanism available.<br> - However, charts migrated from Old Charts will be restricted to + However, charts migrated from Old Charts will be restricted to the groups that are marked MANDATORY for the corresponding Product. - There is currently no way to change this restriction, and the + There is currently no way to change this restriction, and the groupings will not be updated if the group configuration for the Product changes.</li> <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=370370"> @@ -3188,9 +3188,9 @@ <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=361149"> [%- terms.Bug %] 361149</a>: If you are using Perl 5.8.0, you may get a lot of warnings in your Apache error_log about "deprecated - pseudo-hashes." These are harmless--they are a b[%# fool test %]ug in + pseudo-hashes." These are harmless--they are a b[%# fool test %]ug in Perl 5.8.0. Perl 5.8.1 and later do not have this problem.</li> - <li>[% terms.Bugzilla %] 3.0rc1 allowed custom field column names in + <li>[% terms.Bugzilla %] 3.0rc1 allowed custom field column names in the database to be mixed-case. [% terms.Bugzilla %] 3.0 only allows lowercase column names. It will fix any column names that you have made mixed-case, but if you have custom fields that previously were @@ -3207,9 +3207,9 @@ <h3>3.0.5</h3> -<p>[% terms.Bugzilla %] contains one security fix for +<p>[% terms.Bugzilla %] contains one security fix for <a href="[% docs_urlbase FILTER html %]api/importxml.html">importxml.pl</a>. - For details, see the + For details, see the <a href="https://www.bugzilla.org/security/2.22.4/">Security Advisory</a>.</p> <h3>3.0.4</h3> @@ -3234,7 +3234,7 @@ <p>[% terms.Bugzilla %] 3.0 had three security issues that have been fixed in this release: one minor information leak, one hole only exploitable by an admin or using <code>email_in.pl</code>, and one in an - uncommonly-used template. For details, see the + uncommonly-used template. For details, see the <a href="https://www.bugzilla.org/security/2.20.4/">Security Advisory</a>.</p> <h2 id="v30_upgrading">How to Upgrade From An Older Version</h2> @@ -3243,7 +3243,7 @@ <ul> <li>If you upgrade by CVS, there are several .cvsignore files - that are now in CVS instead of being locally created by + that are now in CVS instead of being locally created by <kbd>checksetup.pl</kbd>. This means that you will have to delete those files when CVS tells you there's a conflict, and then run <kbd>cvs update</kbd> again.</li> @@ -3268,8 +3268,8 @@ <h3>Steps For Upgrading</h3> -<p>Once you have read the notes above, see the - <a href="[% docs_urlbase FILTER html %]upgrade.html">Upgrading +<p>Once you have read the notes above, see the + <a href="[% docs_urlbase FILTER html %]upgrade.html">Upgrading documentation</a> for instructions on how to upgrade.</p> <h2 id="v30_code_changes">Code Changes Which May Affect Customizations</h2> @@ -3304,8 +3304,8 @@ <h3 id="v30_code_hooks">Hooks!</h3> -<p>[% terms.Bugzilla %] now supports a code hook mechanism. See the - documentation for +<p>[% terms.Bugzilla %] now supports a code hook mechanism. See the + documentation for <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Hook.html">Bugzilla::Hook</a> for more details.</p> @@ -3315,7 +3315,7 @@ written! Let us know on the <a href="https://lists.bugzilla.org/cgi-bin/mj_wwwusr?func=lists-long-full&extra=developers">developers@bugzilla.org</a> mailing list if you write a plugin.</p> -<p>If you need more hooks, please +<p>If you need more hooks, please <a href="https://www.bugzilla.org/developers/reporting_bugs.html">File a b<!-- -->ug</a>!</p> <h3 id="v30_code_api">API Documentation</h3> @@ -3332,7 +3332,7 @@ Its code is now in various modules. Each function went to the module that was appropriate for it.</p> -<p>Usually we filed [% terms.abug %] in +<p>Usually we filed [% terms.abug %] in <a href="https://bugzilla.mozilla.org">bugzilla.mozilla.org</a> for each function we moved. You can search there for the old name of the function, and that should get you the information about what @@ -3354,9 +3354,9 @@ sub y { $var++ }</pre> <strong>gone</strong>. Instead, we now use DBI for all database interaction.</p> -<p>For more information about how to use - <a href="http://search.cpan.org/perldoc?DBI">DBI</a> with - [%+ terms.Bugzilla %], see the +<p>For more information about how to use + <a href="http://search.cpan.org/perldoc?DBI">DBI</a> with + [%+ terms.Bugzilla %], see the <a href="https://www.bugzilla.org/docs/developer.html#sql-sendreceive">Developer's Guide Section About DBI</a></p> @@ -3364,7 +3364,7 @@ sub y { $var++ }</pre> <p>The <kbd>Bugzilla::Auth</kbd> family of modules have been completely re-written. For details on how the new structure of authentication, - read the + read the <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Auth.html">Bugzilla::Auth API docs</a>.</p> @@ -3372,9 +3372,9 @@ sub y { $var++ }</pre> <h3 id="v30_code_obj">Bugzilla::Object</h3> -<p>There is a new base class for most of our objects, +<p>There is a new base class for most of our objects, <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Object.html">Bugzilla::Object</a>. - It makes it really easy to create new objects based on things that are + It makes it really easy to create new objects based on things that are in the database.</p> <h3 id="v30_code_req">Bugzilla->request-cache</h3> @@ -3401,7 +3401,7 @@ sub y { $var++ }</pre> <a href="[% docs_urlbase FILTER html %]api/checksetup.html">checksetup documentation</a> and <a href="https://bugzilla.mozilla.org/showdependencytree.cgi?id=277502&hide_resolved=0">[% terms.Bugzilla %] [%+ terms.bug %] 277502</a> for details.</li> - <li>Instead of <kbd>UserInGroup()</kbd>, all of [% terms.Bugzilla %] now + <li>Instead of <kbd>UserInGroup()</kbd>, all of [% terms.Bugzilla %] now uses <kbd>Bugzilla->user->in_group</kbd></li> <li>mod_perl doesn't like dependency loops in modules, so we now have a test for that detects dependency loops in modules when you run @@ -3420,7 +3420,7 @@ sub y { $var++ }</pre> <li><kbd>Bugzilla::BugMail::MessageToMTA()</kbd> has moved into its own module, along with other mail-handling code, called <kbd>Bugzilla::Mailer</kbd></li> - <li>The <kbd>CheckCanChangeField()</kbd> subroutine in + <li>The <kbd>CheckCanChangeField()</kbd> subroutine in <kbd>process_bug.cgi</kbd> has been moved to <kbd>Bugzilla::Bug</kbd>, and is now a method of [% terms.abug %] object.</li> <li>The code that used to be in the <kbd>global/banner.html.tmpl</kbd> @@ -3431,7 +3431,7 @@ sub y { $var++ }</pre> <h2 id="v30_previous">Release Notes For Previous Versions</h2> <p>Release notes for versions of [% terms.Bugzilla %] for versions - prior to 3.0 are only available in text format: + prior to 3.0 are only available in text format: <a href="[% docs_urlbase FILTER remove('html/$') FILTER html %]rel_notes.txt">Release Notes for [% terms.Bugzilla %] 2.22 and Earlier</a>.</p> @@ -3447,7 +3447,7 @@ sub y { $var++ }</pre> [% '</span>' IF db_new %] </li> <li><strong>perl module:</strong> - [%+ m.dbd.module FILTER html %] + [%+ m.dbd.module FILTER html %] [% '<span class="req_new">' IF dbd_new %]v[% m.dbd.version FILTER html %] [% '</span>' IF dbd_new %]</li> </ul> @@ -3465,8 +3465,8 @@ sub y { $var++ }</pre> [% FOREACH req = reqs %] <tr> <td [% ' class="req_new"' IF new.contains(req.package) %]> - [%- req.module FILTER html %]</td> - <td [% ' class="req_new"' IF updated.contains(req.package) + [%- req.module FILTER html %]</td> + <td [% ' class="req_new"' IF updated.contains(req.package) OR new.contains(req.package) %]> [%- IF req.version == 0 %] (Any) @@ -3474,7 +3474,7 @@ sub y { $var++ }</pre> [%- req.version FILTER html %] [% END %] </td> - [% IF include_feature %] + [% IF include_feature %] <td>[% req.feature.join(', ') FILTER html %]</td> [% END %] </tr> diff --git a/template/en/default/pages/sudo.html.tmpl b/template/en/default/pages/sudo.html.tmpl index c790ff1ab..666c30bb7 100644 --- a/template/en/default/pages/sudo.html.tmpl +++ b/template/en/default/pages/sudo.html.tmpl @@ -22,45 +22,45 @@ [% INCLUDE global/header.html.tmpl title = "sudo: User Impersonation" %] <p> - [%+ terms.Bugzilla %] includes the ability to have one user impersonate -another, in something called a <i>sudo session</i>, so long as the person + [%+ terms.Bugzilla %] includes the ability to have one user impersonate +another, in something called a <i>sudo session</i>, so long as the person doing the impersonating has the appropriate privileges. </p> <p> - While a session is in progress, [% terms.Bugzilla %] will act as if the + While a session is in progress, [% terms.Bugzilla %] will act as if the impersonated user is doing everything. This is especially useful for testing, - and for doing critical work when the impersonated user is unavailable. The - impersonated user will receive an email from [% terms.Bugzilla %] when the + and for doing critical work when the impersonated user is unavailable. The + impersonated user will receive an email from [% terms.Bugzilla %] when the session begins; they will not be told anything else. </p> <p> - To use this feature, you must be a member of the appropriate group. The group - includes all administrators by default. Other users, and members of other - groups, can be given access to this feature on a case-by-case basis. To - request access, contact the maintainer of this installation: + To use this feature, you must be a member of the appropriate group. The group + includes all administrators by default. Other users, and members of other + groups, can be given access to this feature on a case-by-case basis. To + request access, contact the maintainer of this installation: <a href="mailto:[% Param("maintainer") %]"> [%- Param("maintainer") %]</a>. </p> <p> - If you would like to be protected from impersonation, you should contact the - maintainer of this installation to see if that is possible. People with + If you would like to be protected from impersonation, you should contact the + maintainer of this installation to see if that is possible. People with access to this feature are protected automatically. </p> <p id="message"> [% IF user.in_group('bz_sudoers') %] - You are a member of the <b>bz_sudoers</b> group. You may use this + You are a member of the <b>bz_sudoers</b> group. You may use this feature to impersonate others. [% ELSE %] - You are not a member of an appropriate group. You may not use this + You are not a member of an appropriate group. You may not use this feature. [% END %] [% IF user.in_group('bz_sudo_protect') %] <br> - You are a member of the <b>bz_sudo_protect</b> group. Other people will + You are a member of the <b>bz_sudo_protect</b> group. Other people will not be able to use this feature to impersonate you. [% END %] </p> diff --git a/template/en/default/reports/chart.csv.tmpl b/template/en/default/reports/chart.csv.tmpl index f9e2f2b39..08282b3eb 100644 --- a/template/en/default/reports/chart.csv.tmpl +++ b/template/en/default/reports/chart.csv.tmpl @@ -26,7 +26,7 @@ Date\Series [% colsepchar %][% label FILTER csv %] [% END %] [%# The data, which is in the correct format for GD, is conceptually the wrong - # way round for CSV output. So, we need to invert it here, which is why + # way round for CSV output. So, we need to invert it here, which is why # these loops aren't just plain FOREACH. #%] [% i = 0 %] @@ -40,5 +40,5 @@ Date\Series [% j = j + 1 %] [% END %] [% i = i + 1 %] - -[% END %] + +[% END %] diff --git a/template/en/default/reports/chart.html.tmpl b/template/en/default/reports/chart.html.tmpl index a927c382d..256458a68 100644 --- a/template/en/default/reports/chart.html.tmpl +++ b/template/en/default/reports/chart.html.tmpl @@ -17,17 +17,17 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> #%] - + [%# INTERFACE: #%] [% DEFAULT width = 600 - height = 350 + height = 350 %] [% time = time FILTER time('%Y-%m-%d %H:%M:%S') FILTER html %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Chart" %] @@ -47,20 +47,20 @@ <a href="[% sizeurl %]&width=[% width %]&height= [% height + 100 %]">Taller</a><br> <a href="[% sizeurl %]&width=[% width - 100 %]&height= - [% height %]">Thinner</a> * + [% height %]">Thinner</a> * <a href="[% sizeurl %]&width=[% width + 100 %]&height= [% height %]">Fatter</a> <br> <a href="[% sizeurl %]&width=[% width %]&height= [% height - 100 %]">Shorter</a><br> </p> - + <p> <a href="chart.cgi? [% imagebase FILTER html %]&ctype=csv&action=plot">CSV</a> | - <a href="chart.cgi?[% imagebase FILTER html %]&action=assemble">Edit + <a href="chart.cgi?[% imagebase FILTER html %]&action=assemble">Edit this chart</a> </p> - + </div> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/reports/chart.png.tmpl b/template/en/default/reports/chart.png.tmpl index c4fa04f66..367be2066 100644 --- a/template/en/default/reports/chart.png.tmpl +++ b/template/en/default/reports/chart.png.tmpl @@ -30,10 +30,10 @@ [% FILTER null; x_label_skip = (30 * chart.data.0.size / width); - + graph.set(x_label => x_label, y_label => y_label, - y_tick_number => 8, + y_tick_number => 8, y_max_value => chart.y_max_value, x_label_position => 0.5, x_labels_vertical => 1, @@ -42,10 +42,10 @@ line_width => 2, dclrs => ["lred", "lgreen", "lblue", "lyellow", "lpurple", "lorange", "black", "green", - "blue", "dpink", "lbrown", "gray", + "blue", "dpink", "lbrown", "gray", "red", "dpurple", "gold", "marine"]); - - # Workaround for the fact that set_legend won't take chart.labels directly, + + # Workaround for the fact that set_legend won't take chart.labels directly, # because chart.labels is an array reference rather than an array. graph.set_legend(chart.labels.0, chart.labels.1, chart.labels.2, chart.labels.3, chart.labels.4, chart.labels.5, @@ -53,7 +53,7 @@ chart.labels.9, chart.labels.10, chart.labels.11, chart.labels.12, chart.labels.13, chart.labels.14, chart.labels.15); - + graph.plot(chart.data).png | stdout(1); END; -%] diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl index e20d8522f..58a69b7e0 100644 --- a/template/en/default/reports/create-chart.html.tmpl +++ b/template/en/default/reports/create-chart.html.tmpl @@ -25,12 +25,12 @@ # series. Contains details of all series the user can see. #%] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Create Chart" %] -[% PROCESS "reports/series-common.html.tmpl" - donames = 1 +[% PROCESS "reports/series-common.html.tmpl" + donames = 1 %] <script [% script_nonce FILTER none %]> @@ -39,7 +39,7 @@ function subcatSelected() { var cat = document.chartform.category.value; var subcat = document.chartform.subcategory.value; var names = series[cat][subcat]; - + var namewidget = document.chartform.name; namewidget.options.length = 0; @@ -52,7 +52,7 @@ function subcatSelected() { namewidget.disabled = false; namewidget.options[0].selected = true; - + checkNewState(); } document.addEventListener("DOMContentLoaded", function(event) { @@ -65,11 +65,11 @@ document.addEventListener("DOMContentLoaded", function(event) { }); }); </script> - + [% gttext = "Grand Total" %] -<form method="get" action="chart.cgi" name="chartform"> - +<form method="get" action="chart.cgi" name="chartform"> + <table cellpadding="2" cellspacing="2" border="0"> [% IF NOT category OR category.size == 0 %] <tr> @@ -108,7 +108,7 @@ document.addEventListener("DOMContentLoaded", function(event) { id="action-assemble2"> </noscript> </td> - + [% PROCESS series_select sel = { name => 'name', size => 5, multiple => 1, @@ -116,7 +116,7 @@ document.addEventListener("DOMContentLoaded", function(event) { # not its name. value_in_hash => 1 } %] - <td align="center" valign="middle"> + <td align="center" valign="middle"> <input type="submit" name="action-add" value="Add To List" id="action-add"><br> </td> @@ -135,15 +135,15 @@ document.addEventListener("DOMContentLoaded", function(event) { <th>Data Set</th> <th></th> </tr> - + [%# The external loop has two counters; one which keeps track of where we # are in the old labels array, and one which keeps track of the new # indexes for the form elements. They are different if chart.lines has - # empty slots in it. + # empty slots in it. #%] [% labelidx = 0 %] [% newidx = 0 %] - + [% FOREACH line = chart.lines %] [% IF NOT line %] [%# chart.lines has an empty slot, so chart.labels will too. We @@ -152,7 +152,7 @@ document.addEventListener("DOMContentLoaded", function(event) { [% labelidx = labelidx + 1 %] [% NEXT %] [% END %] - + [% FOREACH series = line %] <tr> [% IF loop.first %] @@ -161,7 +161,7 @@ document.addEventListener("DOMContentLoaded", function(event) { </td> <td rowspan="[% line.size %]"> <input type="text" size="20" name="label[% newidx %]" - value="[% (chart.labels.$labelidx OR series.name) + value="[% (chart.labels.$labelidx OR series.name) FILTER html %]"> </td> [% END %] @@ -171,10 +171,10 @@ document.addEventListener("DOMContentLoaded", function(event) { </td> <td> - [% series.category FILTER html %] / + [% series.category FILTER html %] / [%+ series.subcategory FILTER html %] / [%+ series.name FILTER html %] - <input type="hidden" name="line[% newidx %]" + <input type="hidden" name="line[% newidx %]" value="[% series.series_id %]"> </td> @@ -190,7 +190,7 @@ document.addEventListener("DOMContentLoaded", function(event) { [% series.subcategory FILTER uri %]%20/%20 [% series.name FILTER uri -%]&series_id= [% series.series_id %]&remaction=runseries">Run Search</a> - </td> + </td> </tr> [% END %] [% labelidx = labelidx + 1 %] @@ -220,7 +220,7 @@ document.addEventListener("DOMContentLoaded", function(event) { <tr> <td valign="bottom" style="text-align: center;"> - <input type="submit" name="action-sum" value="Sum" + <input type="submit" name="action-sum" value="Sum" style="width: 5em;" id="action-sum"><br> <input type="submit" name="action-remove" value="Remove" style="width: 5em;" id="action-remove"> @@ -250,7 +250,7 @@ document.addEventListener("DOMContentLoaded", function(event) { </table> [% ELSE %] <p><i>None</i></p> - [% END %] + [% END %] </form> [% IF user.in_group('editbugs') %] @@ -271,7 +271,7 @@ document.addEventListener("DOMContentLoaded", function(event) { </select> <input id="submit_create" type="submit" value="Create a new data set"> </form> -[% END %] +[% END %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/reports/duplicates-table.html.tmpl b/template/en/default/reports/duplicates-table.html.tmpl index a7abf07b8..8d27bb976 100644 --- a/template/en/default/reports/duplicates-table.html.tmpl +++ b/template/en/default/reports/duplicates-table.html.tmpl @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # - # Contributor(s): + # Contributor(s): # Gervase Markham <gerv@gerv.net> # Max Kanat-Alexander <mkanat@bugzilla.org> #%] @@ -54,7 +54,7 @@ [% SET base_args = [] %] [% FOREACH param = ['maxrows', 'openonly', 'format', 'sortvisible', - 'changedsince', 'product'] + 'changedsince', 'product'] %] [% NEXT IF NOT ${param}.defined %] [% FOREACH value = ${param} %] @@ -74,7 +74,7 @@ <tr> [% FOREACH column = columns %] [% IF column.name == sortby %] - [%# We add this to the column object so it doesn't affect future + [%# We add this to the column object so it doesn't affect future # iterations of the loop. #%] [% column.reverse_sort = reverse ? 0 : 1 %] @@ -112,7 +112,7 @@ [%- display_value('op_sys', bug.op_sys) FILTER html %] </td> <td class="target_milestone"> - [% display_value('target_milestone', + [% display_value('target_milestone', bug.target_milestone) FILTER html %] </td> <td class="short_desc">[% bug.short_desc FILTER html %]</td> diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl index ed3e7b8ac..f95fe3762 100644 --- a/template/en/default/reports/duplicates.html.tmpl +++ b/template/en/default/reports/duplicates.html.tmpl @@ -34,7 +34,7 @@ [% IF product.size %] [% title = BLOCK %] - Most Frequently Reported [% terms.Bugs %] for + Most Frequently Reported [% terms.Bugs %] for [%+ product.join(', ') FILTER html %] [% END %] [% ELSE %] @@ -95,7 +95,7 @@ <tr> <td><label for="maxrows">Max rows:</label></td> <td> - <input size="4" name="maxrows" id="maxrows" + <input size="4" name="maxrows" id="maxrows" value="[% maxrows FILTER html %]"> </td> </tr> @@ -129,7 +129,7 @@ <form method="post" action="buglist.cgi" data-no-csrf> <input type="hidden" name="bug_id" value="[% bug_ids_string FILTER html %]"> - Or just give this to me as a <input type="submit" id="list" + Or just give this to me as a <input type="submit" id="list" value="[% terms.bug %] list">. (Note: the order may not be the same.) </form> @@ -141,7 +141,7 @@ </h3> <p> - The Most Frequent [% terms.Bugs %] page lists the known open + The Most Frequent [% terms.Bugs %] page lists the known open [%+ terms.bugs %] which are reported most frequently, counting the number of direct and indirect duplicates of [% terms.bugs %]. This information is provided in order to assist in minimizing @@ -170,7 +170,7 @@ that has already been filed.</li> <li>If you find your [% terms.bug %] in [% terms.Bugzilla %], feel free to comment with any new or additional data you may have.</li> - <li>If you cannot find your problem already documented in + <li>If you cannot find your problem already documented in [%+ terms.Bugzilla %], <a href="enter_bug.cgi">file a new [% terms.bug %]</a>.</li> </ul> diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl index da7d15e0a..3169d3c93 100644 --- a/template/en/default/reports/edit-series.html.tmpl +++ b/template/en/default/reports/edit-series.html.tmpl @@ -20,7 +20,7 @@ [% title = "Edit Series" %] [% subheader = BLOCK %] - [% default.category FILTER html %] / + [% default.category FILTER html %] / [%+ default.subcategory FILTER html %] / [%+ default.name FILTER html %] [% END %] @@ -36,20 +36,20 @@ [% END %] <form method="get" action="chart.cgi" name="chartform"> - - [% PROCESS reports/series.html.tmpl + + [% PROCESS reports/series.html.tmpl button_name = "Change Data Set" %] <input type="hidden" name="action" value="alter"> <input type="hidden" name="token" value="[% issue_hash_token([default.id, default.name]) FILTER html %]"> - + [% IF default.series_id %] <input type="hidden" name="series_id" value="[% default.series_id %]"> [% END %] </form> <p> - <b>Creator</b>: + <b>Creator</b>: [% IF default.creator %] <a href="mailto:[% default.creator.email FILTER html %]"> [% default.creator.email FILTER html %]</a> @@ -63,7 +63,7 @@ set. </p> <p> - <a href="query.cgi?[% default.query FILTER html %]">View + <a href="query.cgi?[% default.query FILTER html %]">View series search parameters</a> | <a href="buglist.cgi?cmdtype=dorem&namedcmd= [% default.category FILTER uri %]- diff --git a/template/en/default/reports/email/security-risk.html.tmpl b/template/en/default/reports/email/security-risk.html.tmpl new file mode 100644 index 000000000..0fca42e05 --- /dev/null +++ b/template/en/default/reports/email/security-risk.html.tmpl @@ -0,0 +1,95 @@ +[%# 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. + #%] + +[% PROCESS global/variables.none.tmpl %] + +<!doctype html> +<html> +<head> + <title>Security [% terms.Bugs %] Report for the week of [% report_week FILTER html %]</title> + <base href="[% urlbase FILTER txt %]"> +</head> +<body> +<p>Security [% terms.Bugs %] Report for the week of [% report_week FILTER html %]</p> +<p>To narrow down open [% terms.bugs %] click on the link and at the bottom of the search results use the 'Edit Search' functionality to filter by component and so on. +This will filter only the open [% terms.bugs %] counted in the report (as long as you do not modify the '[% terms.Bugs %] numbered' section of the search). +</p> + +<h3>[% terms.Bugs %] By Severity</h3> +<table style="border: 1px solid grey"> + <tr> + <th style="border: 1px solid grey"></th> + [% FOREACH keyword IN sec_keywords %] + <th style="border: 1px solid grey; text-align: center" colspan="2"><b>[% keyword FILTER html %]</b></th> + [% END %] + </tr> + <tr> + <td style="border: 1px solid grey"></td> + [% FOREACH keyword IN sec_keywords %] + <td style="border: 1px solid grey; text-align: right">Open Count</td> + <td style="border: 1px solid grey; text-align: right">Median Days Open</td> + [% END %] + </tr> + [% FOREACH result IN results.reverse %] + <tr> + <td style="border: 1px solid grey">[% result.date.ymd('-') FILTER html %]</td> + [% FOREACH keyword IN sec_keywords %] + <td style="border: 1px solid grey; text-align: right"> + [% IF result.bugs_by_sec_keyword.$keyword.open.size %] + <a href="[% build_bugs_link(result.bugs_by_sec_keyword.$keyword.open) FILTER html %]"> + [% result.bugs_by_sec_keyword.$keyword.open.size FILTER html %] + </a> + [% ELSE %] + [% result.bugs_by_sec_keyword.$keyword.open.size FILTER html %] + [% END %] + </td> + <td style="border: 1px solid grey; text-align: right"> + [% result.bugs_by_sec_keyword.$keyword.median_age_open FILTER format("%.2f") FILTER html %] + </td> + [% END %] + </tr> + [% END %] +</table> + +<h3>Sec-Critical + Sec-High [% terms.Bugs %] by Product</h3> +<table style="border: 1px solid grey"> + <tr> + <th style="border: 1px solid grey"></th> + [% FOREACH product IN products %] + <th style="border: 1px solid grey; text-align: center" colspan="2"><b>[% product FILTER html %]</b></th> + [% END %] + </tr> + <tr> + <td style="border: 1px solid grey"></td> + [% FOREACH product IN products %] + <td style="border: 1px solid grey; text-align: right">Open Count</td> + <td style="border: 1px solid grey; text-align: right">Median Days Open</td> + [% END %] + </tr> + [% FOREACH result IN results.reverse %] + <tr> + <td style="border: 1px solid grey">[% result.date.ymd('-') FILTER html %]</td> + [% FOREACH product IN products %] + <td style="border: 1px solid grey; text-align: right"> + [% IF result.bugs_by_product.$product.open.size %] + <a href="[% build_bugs_link(result.bugs_by_product.$product.open, product) FILTER html %]"> + [% result.bugs_by_product.$product.open.size FILTER html %] + </a> + [% ELSE %] + [% result.bugs_by_product.$product.open.size FILTER html %] + [% END %] + </td> + <td style="border: 1px solid grey; text-align: right"> + [% result.bugs_by_product.$product.median_age_open FILTER format("%.2f") FILTER html %] + </td> + [% END %] + </tr> + [% END %] +</table> +</body> +</html> diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl index 0edc0fee7..5d81b1330 100644 --- a/template/en/default/reports/report-line.png.tmpl +++ b/template/en/default/reports/report-line.png.tmpl @@ -51,7 +51,7 @@ line_width => 2, dclrs => ["lred", "lgreen", "lblue", "lyellow", "lpurple", "lorange", "black", "green", - "blue", "dpink", "lbrown", "gray", + "blue", "dpink", "lbrown", "gray", "red", "dpurple", "gold", "marine"]); # Workaround for the fact that set_legend won't take row_names directly, diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl index 27f5525dd..410359f37 100644 --- a/template/en/default/reports/report-pie.png.tmpl +++ b/template/en/default/reports/report-pie.png.tmpl @@ -28,12 +28,12 @@ [% FILTER null; USE graph = GD.Graph.pie(width, height); - + graph.set(title => col_field_disp, pie_height => 20, suppress_angle => 2, start_angle => 180); - + graph.plot(data.0).png | stdout(1); END; -%] diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 096eb171a..af2eef5f3 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -28,7 +28,7 @@ # tbl_field: string. Name of the field being plotted as tables. # col_names: array. List of values for the field being plotted as columns. # row_names: array. List of values for the field being plotted as rows. - # data: <depends on format>. Data to plot. Only data.$tbl is accessed. + # data: <depends on format>. Data to plot. Only data.$tbl is accessed. # tbl: Name of a hash in data which is the table to be plotted. #%] @@ -145,7 +145,7 @@ YAHOO.util.Event.addListener(window, "load", function() { ] }; this.myDataTable = new YAHOO.widget.DataTable("tabular_report_container_ - [% tbl FILTER js %]", myColumnDefs, this.myDataSource, + [% tbl FILTER js %]", myColumnDefs, this.myDataSource, {formatRow: totalRowFormatter}); }); </script> @@ -184,7 +184,7 @@ YAHOO.util.Event.addListener(window, "load", function() { [% FOREACH col = col_names %] [% col_totals.$col = 0 %] [% NEXT IF col == "" %] - + [% col_idx = 1 - col_idx %] <th class="[% classes.$row_idx.$col_idx %]"> [% PROCESS value_display value = col field = col_field %] @@ -199,7 +199,7 @@ YAHOO.util.Event.addListener(window, "load", function() { <tbody> [% FOREACH row = row_names %] [% row_total = 0 %] - + [% row_idx = 1 - row_idx %] <tr> <td class="[% classes.$row_idx.$col_idx %]" align="right"> @@ -209,7 +209,7 @@ YAHOO.util.Event.addListener(window, "load", function() { [% row_total = row_total + data.$tbl.$col.$row %] [% NEXT IF col == "" %] [% col_totals.$col = (col_totals.$col || 0) + data.$tbl.$col.$row %] - + [% col_idx = 1 - col_idx %] <td class="[% classes.$row_idx.$col_idx %]" align="center"> [% IF data.$tbl.$col.$row AND data.$tbl.$col.$row > 0 %] @@ -221,7 +221,7 @@ YAHOO.util.Event.addListener(window, "load", function() { . [% END %] </td> - [% END %] + [% END %] <td class="ttotal" align="right"> <a href="[% urlbase %]& [% row_field FILTER uri %]=[% row FILTER uri %] @@ -238,7 +238,7 @@ YAHOO.util.Event.addListener(window, "load", function() { </td> [% FOREACH col = col_names %] [% NEXT IF col == "" %] - + <td class="ttotal" align="center"> <a href="[% urlbase %]& [% col_field FILTER uri %]=[% col FILTER uri %] @@ -257,7 +257,7 @@ YAHOO.util.Event.addListener(window, "load", function() { </tbody> </table> </div> - + </td> </tr> </table> @@ -270,4 +270,4 @@ YAHOO.util.Event.addListener(window, "load", function() { [% disp_value = value FILTER email %] [% END %] [% disp_value FILTER html FILTER replace('^ $',' ') %] -[% END %] +[% END %] diff --git a/template/en/default/reports/report.csv.tmpl b/template/en/default/reports/report.csv.tmpl index f26bc1f36..0687064e9 100644 --- a/template/en/default/reports/report.csv.tmpl +++ b/template/en/default/reports/report.csv.tmpl @@ -19,7 +19,7 @@ #%] [% PROCESS "global/field-descs.none.tmpl" %] [% FOREACH tbl = tbl_names %] - [% PROCESS "reports/report-table.csv.tmpl" %] + [% PROCESS "reports/report-table.csv.tmpl" %] -[% END %] +[% END %] diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl index c70f3de13..8c580fd94 100644 --- a/template/en/default/reports/report.html.tmpl +++ b/template/en/default/reports/report.html.tmpl @@ -17,14 +17,14 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> #%] - + [%# INTERFACE: # col_field: string. Name of the field being plotted as columns. # row_field: string. Name of the field being plotted as rows. # tbl_field: string. Name of the field being plotted as tables. # tbl_names: array. List of values for the field being plotted as tables. # time: integer. Seconds since the epoch. - # data: <depends on format>. Data to plot. + # data: <depends on format>. Data to plot. # format: string. Format of the individual reports. # width: integer. For image charts, height of the image. # height: integer. For image charts, width of the image. @@ -34,7 +34,7 @@ #%] [% DEFAULT width = 600 - height = 350 + height = 350 %] [% IF min_width AND width < min_width %] @@ -54,7 +54,7 @@ [% switchbase = switchbase FILTER html %] [% title = BLOCK %] - Report: + Report: [% IF tbl_field %] [% tbl_field_disp FILTER html %] [% END %] @@ -68,7 +68,7 @@ [% time = time FILTER time('%Y-%m-%d %H:%M:%S') FILTER html %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl style = " .t1 { background-color: #ffffff } /* white */ .t2 { background-color: #dfefff } /* light blue */ @@ -86,7 +86,7 @@ <div align="center"> - [% FOREACH tbl = tbl_names %] + [% FOREACH tbl = tbl_names %] [% IF tbl == "-total-" %] [% tbl_disp = "Total" %] [% ELSE %] @@ -99,7 +99,7 @@ [% IF tbl %] <h2>[% tbl_disp FILTER email FILTER html %]</h2> [% END %] - + [% imageurl = BLOCK %]report.cgi?[% imagebase FILTER html %]&format= [% format FILTER uri %]&ctype=png&action=plot& [% IF tbl_field %] @@ -112,14 +112,14 @@ [% END %] [% END %] [% END %] - [% END %]width=[% width %]&height=[% height %] + [% END %]width=[% width %]&height=[% height %] [% END %] - + <img alt="Graphical report results" src="[% imageurl %]" width="[% width %]" height="[% height %]"> [% END %] <br> - [% END %] + [% END %] <table> <tr> @@ -129,7 +129,7 @@ { name => "line", description => "Line" }, { name => "table", description => "Table" } ] %] - [% formaturl = "report.cgi?$switchbase&width=$width" _ + [% formaturl = "report.cgi?$switchbase&width=$width" _ "&height=$height&action=wrap" %] [% FOREACH other_format = formats %] [% NEXT IF other_format.name == "pie" AND row_field AND col_field %] @@ -137,11 +137,11 @@ <a href="[% formaturl %]&format=[% other_format.name %]"> [% END %] [% other_format.description FILTER html %] - [% "</a>" UNLESS other_format.name == format %] | + [% "</a>" UNLESS other_format.name == format %] | [% END %] - <a href="[% formaturl %]&ctype=csv&format=table">CSV</a> + <a href="[% formaturl %]&ctype=csv&format=table">CSV</a> </td> - + [% IF format != "table" %] <td> @@ -154,7 +154,7 @@ <a href="[% sizeurl %]&width=[% width %]&height= [% height + 100 %]">Taller</a><br> <a href="[% sizeurl %]&width=[% width - 100 %]&height= - [% height %]">Thinner</a> * + [% height %]">Thinner</a> * <a href="[% sizeurl %]&width=[% width + 100 %]&height= [% height %]">Fatter</a> <br> <a href="[% sizeurl %]&width=[% width %]&height= @@ -166,7 +166,7 @@ <p> [% IF format == "table" %] - <a href="query.cgi?[% switchbase %]&format=report-table">Edit + <a href="query.cgi?[% switchbase %]&format=report-table">Edit this report</a> [% ELSE %] <a href="query.cgi?[% switchbase %]&chart_format= @@ -175,7 +175,7 @@ </a> [% END %] </p> - + </div> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/reports/series-common.html.tmpl b/template/en/default/reports/series-common.html.tmpl index b8032255d..7bf387bd2 100644 --- a/template/en/default/reports/series-common.html.tmpl +++ b/template/en/default/reports/series-common.html.tmpl @@ -20,7 +20,7 @@ [%# INTERFACE: # donames: boolean. True if we have a multi-select for names as well as - # categories and subcategories. + # categories and subcategories. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. @@ -38,55 +38,55 @@ var series = { "[%+ s FILTER js %]" : { [% IF donames %] [% FOREACH n = category.$c.$s.keys.sort %] - "[% n FILTER js %]": + "[% n FILTER js %]": [% category.$c.$s.$n FILTER js %][% ", " UNLESS loop.last %] [% END %] [% END %] }[% ", " UNLESS loop.last %] [% END %] }[% ", " UNLESS loop.last %] -[% END %] +[% END %] }; [%# This function takes necessary action on selection of a category %] function catSelected() { var cat = document.chartform.category.value; var subcats = series[cat]; - + var subcatwidget = document.chartform.subcategory; - + subcatwidget.options.length = 0; var i = 0; - + for (x in subcats) { subcatwidget.options[i] = new Option(x, x); i++; } - + [% IF newtext %] subcatwidget.options[i] = new Option("[% newtext FILTER js %]", ""); - [% END %] + [% END %] subcatwidget.disabled = false; subcatwidget.options[0].selected = true; - + if (document.chartform.action[1]) { [%# On the query form, select the right radio button. %] document.chartform.action[1].checked = true; } - - checkNewState(); + + checkNewState(); } [%# This function updates the disabled state of the two "new" textboxes %] function checkNewState() { var fm = document.chartform; if (fm.newcategory) { - fm.newcategory.disabled = - (fm.category.value != "" || + fm.newcategory.disabled = + (fm.category.value != "" || fm.action[1] && fm.action[1].checked == false); - fm.newsubcategory.disabled = - (fm.subcategory.value != "" || + fm.newsubcategory.disabled = + (fm.subcategory.value != "" || fm.action[1] && fm.action[1].checked == false); } } diff --git a/template/en/default/reports/series.html.tmpl b/template/en/default/reports/series.html.tmpl index 164c30355..23e7d82f7 100644 --- a/template/en/default/reports/series.html.tmpl +++ b/template/en/default/reports/series.html.tmpl @@ -20,14 +20,14 @@ [%# INTERFACE: # default: hash. Defaults for category, subcategory, name etc. - # button_name: string. What the button will say. + # button_name: string. What the button will say. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% PROCESS "reports/series-common.html.tmpl" - newtext = "New (name below)" + newtext = "New (name below)" %] <script [% script_nonce FILTER none %]> @@ -63,7 +63,7 @@ size => 5 } %] <td valign="top" name="name"> - <input type="text" name="name" maxlength="64" + <input type="text" name="name" maxlength="64" value="[% default.name.0 FILTER html %]" size="25"> </td> @@ -74,24 +74,24 @@ <span style="font-weight: bold;"> day(s)</span><br> [%# Change 'admin' here and in Series.pm, or remove the check completely, if you want to change who can make series public. %] - [% IF user.in_group('admin') %] + [% IF user.in_group('admin') %] <input type="checkbox" name="public" [%+ "checked='checked'" IF default.public.0 %]> <span style="font-weight: bold;">Visible to all<br> - (within group restrictions)</span> + (within group restrictions)</span> [% END %] </td> </tr> <tr> <td> - <input type="text" style="width: 100%" name="newcategory" + <input type="text" style="width: 100%" name="newcategory" maxlength="64" value="[% default.newcategory.0 FILTER html %]"> </td> <td></td> <td> <input type="text" style="width: 100%" name="newsubcategory" - maxlength="64" + maxlength="64" value="[% default.newsubcategory.0 FILTER html %]"> </td> <td></td> diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl index c4b48b024..3246c16dc 100644 --- a/template/en/default/request/queue.html.tmpl +++ b/template/en/default/request/queue.html.tmpl @@ -161,9 +161,9 @@ to some group are shown by default. <tr> <th></th> <td> - <label><input type="radio" name="do_union" value="0" + <label><input type="radio" name="do_union" value="0" [% 'checked="checked"' IF !cgi.param('do_union') %]>AND *</label> - <label><input type="radio" name="do_union" value="1" + <label><input type="radio" name="do_union" value="1" [% 'checked="checked"' IF cgi.param('do_union') %]>OR *</label> </td> <td colspan="3"></td> @@ -171,7 +171,7 @@ to some group are shown by default. </tr> </table> - <p>(* The logical conjunction/disjunction between the requester + <p>(* The logical conjunction/disjunction between the requester and the requestee)</p> </form> @@ -229,7 +229,7 @@ to some group are shown by default. [% BLOCK start_new_table %] [% buglist = {} %] - <h3>[% column_headers.$group_field %]: + <h3>[% column_headers.$group_field %]: [%+ (request.$group_field || "None") FILTER email FILTER html %]</h3> <table class="requests" cellspacing="0" cellpadding="4" border="1"> <tr> diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl index 456cf088a..fe0eb2144 100644 --- a/template/en/default/search/field.html.tmpl +++ b/template/en/default/search/field.html.tmpl @@ -26,10 +26,10 @@ # type_selected: used by the free text to indicate which type of text # search was selected for a particular field #%] - + [% SWITCH field.type %] [% CASE [ constants.FIELD_TYPE_FREETEXT, - constants.FIELD_TYPE_TEXTAREA, + constants.FIELD_TYPE_TEXTAREA, constants.FIELD_TYPE_UNKNOWN ] %] [% INCLUDE "bug/field-label.html.tmpl" field = field @@ -38,14 +38,14 @@ %] [% INCLUDE "search/type-select.html.tmpl" name = field.name _ "_type", - types = types, + types = types, selected = type_selected - %] - <input name="[% field.name FILTER html %]" + %] + <input name="[% field.name FILTER html %]" id="[% field.name FILTER html %]" size="40" [% IF autofocus %] autofocus[% END %] [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %] - value="[% value FILTER html %]"> + value="[% value FILTER html %]"> [% CASE constants.FIELD_TYPE_KEYWORDS %] [% INCLUDE "bug/field-label.html.tmpl" field = field @@ -54,7 +54,7 @@ %] [% INCLUDE "search/type-select.html.tmpl" name = field.name _ "_type", - types = types, + types = types, selected = type_selected %] <input name="[% field.name FILTER html %]" @@ -77,20 +77,20 @@ tag_name = "span" editable = 1 %] - from <input name="[% field.name FILTER html %]from" - id="[% field.name FILTER html %]" + from <input name="[% field.name FILTER html %]from" + id="[% field.name FILTER html %]" size="10" maxlength="10" - value="[% value.0 FILTER html %]" + value="[% value.0 FILTER html %]" onchange="updateCalendarFromField(this);[% onchange FILTER html %]"> <button type="button" class="calendar_button" id="button_calendar_[% field.name FILTER html %]" onclick="showCalendar('[% field.name FILTER js %]')"> <span>Calendar</span> </button> - <span id="con_calendar_[% field.name FILTER html %]"></span> - to <input name="[% field.name FILTER html %]to" + <span id="con_calendar_[% field.name FILTER html %]"></span> + to <input name="[% field.name FILTER html %]to" id="[% field.name FILTER html %]to" size="10" maxlength="10" - value="[% value.1 FILTER html %]" + value="[% value.1 FILTER html %]" onchange="updateCalendarFromField(this);[% onchange FILTER html %]"> <button type="button" class="calendar_button" id="button_calendar_[% field.name FILTER html %]to" @@ -98,22 +98,22 @@ <span>Calendar</span> </button> <small>(YYYY-MM-DD or relative dates)</small> - + <span id="con_calendar_[% field.name FILTER html %]to"></span> <script [% script_nonce FILTER none %]> createCalendar('[% field.name FILTER js %]'); createCalendar('[% field.name FILTER js %]to'); </script> - [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT, + [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT, constants.FIELD_TYPE_MULTI_SELECT ] %] - <div id="container_[% field.name FILTER html %]" class="search_field_grid"> + <div id="container_[% field.name FILTER html %]" class="search_field_grid"> [% INCLUDE "bug/field-label.html.tmpl" field = field editable = 1 tag_name = "span" %] - <select name="[% field.name FILTER html%]" - id="[% field.name FILTER html %]" + <select name="[% field.name FILTER html%]" + id="[% field.name FILTER html %]" [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %] multiple="multiple" size="9"> [% legal_values = ${field.name} %] @@ -122,7 +122,7 @@ [% END %] [% FOREACH current_value = legal_values %] [% IF current_value.id %] - [%# current_value is a hash instead of a value which + [%# current_value is a hash instead of a value which only applies for Resolution really, everywhere else current_value is just the value %] [% v = current_value.name OR '---' -%] diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl index 4d78a53da..a9cf3ab89 100644 --- a/template/en/default/search/form.html.tmpl +++ b/template/en/default/search/form.html.tmpl @@ -49,7 +49,7 @@ var tms = new Array(); [%- FOREACH item = user.get_selectable_products(c.id) -%] [%- IF item.components.size -%] [%- sep FILTER js %]'[% item.name FILTER js %]' - [%- sep = ',' -%] + [%- sep = ',' -%] [%- END -%] [%- END -%] ]; [% nclass = nclass+1 %] @@ -76,7 +76,7 @@ var tms = new Array(); [% END %] /* - * doOnSelectProduct determines which selection should get updated + * doOnSelectProduct determines which selection should get updated * * - selectmode = 0 - init * selectmode = 1 - classification selected @@ -87,7 +87,7 @@ var tms = new Array(); */ function doOnSelectProduct(selectmode) { var f = document.forms[queryform]; - var milestone = (typeof(f.target_milestone) == "undefined" ? + var milestone = (typeof(f.target_milestone) == "undefined" ? null : f.target_milestone); if (selectmode == 0) { // If there is no classification selected, give us a chance to fill @@ -106,7 +106,7 @@ function doOnSelectProduct(selectmode) { // Hide the Advanced Fields by default, unless the user has a cookie // that specifies otherwise. -// ▸ and ▾ are both utf8 escaped characters for right +// ▸ and ▾ are both utf8 escaped characters for right // and down facing arrows respectivly. TUI_alternates['history_query'] = '►'; TUI_alternates['people_query'] = '►'; @@ -139,7 +139,7 @@ TUI_hide_default('information_query'); field = bug_fields.short_desc types = query_types value = default.short_desc.0 - type_selected = default.short_desc_type.0 + type_selected = default.short_desc_type.0 accesskey = "s" autofocus = 1 %] @@ -151,38 +151,38 @@ TUI_hide_default('information_query'); </div> [%# *** Classification Product Component *** %] - + [% Hook.process('before_selects_top') %] [% IF Param('useclassification') %] [% fake_classfication = { name => bug_fields.classification.name, type => constants.FIELD_TYPE_SINGLE_SELECT } %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => fake_classfication accesskey => "c" - onchange => "doOnSelectProduct(1);" + onchange => "doOnSelectProduct(1);" value => default.classification - %] + %] [% END %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.product accesskey => "p" - onchange => "doOnSelectProduct(2);" + onchange => "doOnSelectProduct(2);" value => default.product %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.component accesskey => "m" value => default.component %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.bug_status accesskey => "a" value => default.bug_status %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.resolution - accesskey => "r" + accesskey => "r" value => default.resolution %] @@ -193,14 +193,14 @@ TUI_hide_default('information_query'); <a href="javascript:TUI_toggle_class('information_query')"> Detailed [% terms.Bug %] Information </a> - <span class="section_help">Narrow results by the following fields: - [%+ field_descs.longdesc FILTER html %]s, [%+ field_descs.bug_file_loc FILTER html %], + <span class="section_help">Narrow results by the following fields: + [%+ field_descs.longdesc FILTER html %]s, [%+ field_descs.bug_file_loc FILTER html %], [% IF Param('usestatuswhiteboard') %] [%+ field_descs.status_whiteboard FILTER html %], [%+ END %] [% IF use_keywords %] [%+ field_descs.keywords FILTER html %], [%+ END %] [% IF user.is_timetracker %] [%+ field_descs.deadline FILTER html %], [%+ END %] - [% terms.Bug %] Numbers, [%+ field_descs.version FILTER html %], + [% terms.Bug %] Numbers, [%+ field_descs.version FILTER html %], [% IF Param('usetargetmilestone') %] [%+ field_descs.target_milestone FILTER html %], [%+ END %] - [% field_descs.bug_severity FILTER html %], [%+ field_descs.priority FILTER html %], [%+ field_descs.rep_platform FILTER html %], + [% field_descs.bug_severity FILTER html %], [%+ field_descs.priority FILTER html %], [%+ field_descs.rep_platform FILTER html %], [%+ field_descs.op_sys FILTER html %] </span> </div> @@ -210,22 +210,22 @@ TUI_hide_default('information_query'); { field => bug_fields.longdesc, accesskey => 'c' }, { field => bug_fields.bug_file_loc, accesskey => 'u' }, { field => bug_fields.status_whiteboard, accesskey => 'w' }, - { field => bug_fields.keywords, accesskey => 'k', - qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] } + { field => bug_fields.keywords, accesskey => 'k', + qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] } ] %] [% Hook.process('before_freetext_fields') %] - + [%# loop through a bunch of free text fields and print out their text stuff %] [% FOREACH field_container = freetext_fields %] - [% NEXT IF field_container.field.name == 'status_whiteboard' - AND NOT Param('usestatuswhiteboard') + [% NEXT IF field_container.field.name == 'status_whiteboard' + AND NOT Param('usestatuswhiteboard') %] - [% NEXT IF field_container.field.name == 'keywords' + [% NEXT IF field_container.field.name == 'keywords' AND NOT use_keywords %] <div class="search_field_row"> [% type = field_container.field.name _ "_type" %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => field_container.field types => field_container.qtypes || query_types accesskey => field_container.accesskey @@ -238,8 +238,8 @@ TUI_hide_default('information_query'); [%# Deadline %] [% IF user.is_timetracker %] <div class="search_field_row"> - [% INCLUDE "search/field.html.tmpl" - field = bug_fields.deadline + [% INCLUDE "search/field.html.tmpl" + field = bug_fields.deadline accesskey = "l" value = [ default.deadlinefrom.0, default.deadlineto.0 ] %] @@ -253,7 +253,7 @@ TUI_hide_default('information_query'); value="[% default.bug_id.0 FILTER html %]" size="20"> <div class="field_help">(comma-separated list)</div> </div> - should be + should be <select name="bug_id_type" id="bug_id_type"> <option value="anyexact"[% " selected" IF default.bug_id_type.0 == "anyexact" %]>only included in</option> <option value="nowords"[% " selected" IF default.bug_id_type.0 == "nowords" %]>excluded from</option> @@ -261,44 +261,44 @@ TUI_hide_default('information_query'); </div> [% Hook.process('after_freetext_fields') %] - + [%# *** Status Resolution Severity Priority Hardware OS *** %] <div> [% Hook.process('before_selects_bottom') %] [% fake_version_field = { name => bug_fields.version.name, type => constants.FIELD_TYPE_SINGLE_SELECT }%] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => fake_version_field value => default.version - %] + %] [% IF Param('usetargetmilestone') %] - [% fake_target_milestone_field = { name => bug_fields.target_milestone.name , + [% fake_target_milestone_field = { name => bug_fields.target_milestone.name , type => constants.FIELD_TYPE_SINGLE_SELECT } %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => fake_target_milestone_field value => default.target_milestone %] [% END %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => bug_fields.bug_severity - accesskey=> "v" + accesskey=> "v" value => default.bug_severity %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => bug_fields.priority accesskey => "i" value => default.priority - %] - [% INCLUDE "search/field.html.tmpl" - field => bug_fields.rep_platform + %] + [% INCLUDE "search/field.html.tmpl" + field => bug_fields.rep_platform accesskey =>"h" value => default.rep_platform - %] - [% INCLUDE "search/field.html.tmpl" - field => bug_fields.op_sys + %] + [% INCLUDE "search/field.html.tmpl" + field => bug_fields.op_sys accesskey =>"o" value => default.op_sys - %] + %] [% Hook.process('after_selects_bottom') %] </div> </div> @@ -318,14 +318,14 @@ TUI_hide_default('information_query'); [% PROCESS role_types field = { count => n, name => "emailassigned_to", label=> "the ${terms.Bug} ${field_descs.assigned_to}" } %] [% PROCESS role_types field = { count => n, name => "emailreporter", - label=> "the ${field_descs.reporter}" } %] + label=> "the ${field_descs.reporter}" } %] [% IF Param('useqacontact') %] - [% PROCESS role_types field = { count => n, name => "emailqa_contact", + [% PROCESS role_types field = { count => n, name => "emailqa_contact", label=> "the ${field_descs.qa_contact}" } %] [% END %] - [% PROCESS role_types field = { count => n, name => "emailcc", + [% PROCESS role_types field = { count => n, name => "emailcc", label=> "a ${field_descs.cc} list member" } %] - [% PROCESS role_types field = { count => n, name => "emaillongdesc", + [% PROCESS role_types field = { count => n, name => "emaillongdesc", label=> " a ${field_descs.commenter}" } %] [% PROCESS role_types field = { count => n, name => "emailbug_mentor", label => " a ${field_descs.bug_mentor}" } %] @@ -379,15 +379,15 @@ TUI_hide_default('information_query'); </li> <li> <label for="chfieldfrom">between:</label> - <input name="chfieldfrom" id="chfieldfrom" size="10" - value="[% default.chfieldfrom.0 FILTER html %]" onchange="updateCalendarFromField(this)"> + <input name="chfieldfrom" id="chfieldfrom" size="10" + value="[% default.chfieldfrom.0 FILTER html %]" onchange="updateCalendarFromField(this)"> <button type="button" class="calendar_button" id="button_calendar_chfieldfrom" onclick="showCalendar('chfieldfrom')"><span>Calendar</span></button> - and + and <div id="con_calendar_chfieldfrom"></div> - <input name="chfieldto" size="10" id="chfieldto" - value="[% default.chfieldto.0 || "Now" FILTER html %]" + <input name="chfieldto" size="10" id="chfieldto" + value="[% default.chfieldto.0 || "Now" FILTER html %]" onchange="updateCalendarFromField(this)"> <button type="button" class="calendar_button" id="button_calendar_chfieldto" @@ -398,7 +398,7 @@ TUI_hide_default('information_query'); createCalendar('chfieldfrom'); createCalendar('chfieldto'); </script> - </li> + </li> </ul> [%############################################################################%] diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl index e20822bf5..f5e317bc6 100644 --- a/template/en/default/search/knob.html.tmpl +++ b/template/en/default/search/knob.html.tmpl @@ -23,12 +23,12 @@ [%# INTERFACE: # (incomplete!) # ... - # known_name: string. Possibly known stored name for the query being + # known_name: string. Possibly known stored name for the query being # edited. This value is just passed through in a # hidden field. #%] - - + + [% PROCESS global/variables.none.tmpl %] [%# This is not necessary for English templates, but useful for localizers. %] @@ -55,7 +55,7 @@ </select> </p> -<p> +<p> <input type="submit" id="[% button_name FILTER html %]" value="[% button_name FILTER html %]"> [% IF known_name %] @@ -81,7 +81,7 @@ </label> </p> [% END %] - + [% IF userdefaultquery %] <p> <a href="query.cgi?nukedefaultquery=1&token= diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl index e0b7ff562..ec88fb038 100644 --- a/template/en/default/search/search-create-series.html.tmpl +++ b/template/en/default/search/search-create-series.html.tmpl @@ -30,28 +30,28 @@ var queryform = "chartform"; [% END %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Create New Data Set" generate_api_token = 1 onload = "doOnSelectProduct(0);" - javascript = js_data + javascript = js_data javascript_urls = [ "js/util.js", "js/productform.js", "js/TUI.js", "js/field.js" ] style_urls = [ "skins/standard/search_form.css" ] doc_section = "reporting.html#charts-new-series" %] <form method="get" action="chart.cgi" name="chartform"> - + [% PROCESS search/form.html.tmpl %] <p> <input type="submit" id="action-search" name="action-search" value="Run Search"> to see which [% terms.bugs %] would be included in this data set. </p> - + <h3>Data Set Parameters</h3> - -[% PROCESS reports/series.html.tmpl + +[% PROCESS reports/series.html.tmpl button_name = "Create Data Set" %] <input type="hidden" name="action" value="create"> <input type="hidden" name="token" value="[% issue_hash_token(['create-series']) FILTER html %]"> @@ -61,7 +61,7 @@ catSelected(); checkNewState(); </script> - + <hr> [% PROCESS "search/boolean-charts.html.tmpl" %] diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl index ed3942166..95d40a5eb 100644 --- a/template/en/default/search/search-instant.html.tmpl +++ b/template/en/default/search/search-instant.html.tmpl @@ -8,12 +8,7 @@ [% PROCESS global/variables.none.tmpl %] -[% javascript_urls = [ 'js/instant-search.js' ] %] -[% IF has_extension('GuidedBugEntry') %] - [% javascript_urls.import(['extensions/GuidedBugEntry/web/js/products.js']); %] -[% END %] - -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Instant Search" generate_api_token = 1 javascript_urls = javascript_urls diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index 57ca8a8e9..d88695284 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -42,7 +42,7 @@ var queryform = "reportform" [% PROCESS "search/search-report-select.html.tmpl" %] <p> - Choose one or more fields as your axes, and then refine your set of + Choose one or more fields as your axes, and then refine your set of [% terms.bugs %] using the rest of the form. </p> diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl index 44425898a..2eb7b797d 100644 --- a/template/en/default/search/search-report-select.html.tmpl +++ b/template/en/default/search/search-report-select.html.tmpl @@ -30,12 +30,12 @@ <select name="[% name FILTER html %]"> <option value=""><none></option> - + [% FOREACH field = report_columns.keys.sort %] [% NEXT IF field == "classification" AND !Param('useclassification') %] [% NEXT IF field == "target_milestone" AND !Param('usetargetmilestone') %] [% NEXT IF field == "qa_contact" AND !Param('useqacontact') %] - <option value="[% field FILTER html %]" + <option value="[% field FILTER html %]" [% " selected" IF default.$name.0 == field %]> [% field_descs.$field || field FILTER html %]</option> [% END %] diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl index 7ac4ac5a0..08c6523fe 100644 --- a/template/en/default/search/search-report-table.html.tmpl +++ b/template/en/default/search/search-report-table.html.tmpl @@ -42,7 +42,7 @@ var queryform = "reportform" [% PROCESS "search/search-report-select.html.tmpl" %] <p> - Choose one or more fields as your axes, and then refine your set of + Choose one or more fields as your axes, and then refine your set of [% terms.bugs %] using the rest of the form. </p> diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index be314101f..704fcbc32 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -20,7 +20,7 @@ [% PROCESS global/variables.none.tmpl %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Simple Search" style_urls = [ "skins/standard/search_form.css" ] %] @@ -28,7 +28,7 @@ [% WRAPPER search/tabs.html.tmpl %] <p> -Find a specific [% terms.bug %] by entering words that describe it. +Find a specific [% terms.bug %] by entering words that describe it. [% terms.Bugzilla %] will search [% terms.bug %] descriptions and comments for those words and return a list of matching [% terms.bugs %] sorted by relevance. @@ -54,7 +54,7 @@ for "crash secure SSL flash". { name = 'closed', label = "Closed" }, { name = 'all', label = "All" } ] %] [% FOREACH status = statuses %] - <option value="__[% status.name %]__" + <option value="__[% status.name %]__" [% " selected" IF default.bug_status.0 == "__${status.name}__" %]> [% status.label FILTER html %] </option> @@ -114,7 +114,7 @@ for "crash secure SSL flash". <tr> <td></td> <td> - + [% IF Param('search_allow_no_criteria') %] <input type="submit" id="search" value="Search"> [% ELSE %] diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl index 26ad4f39b..74ab0ca5b 100644 --- a/template/en/default/search/tabs.html.tmpl +++ b/template/en/default/search/tabs.html.tmpl @@ -29,8 +29,8 @@ { name => 'specific', label => "Simple Search", link => "query.cgi?format=specific" }, { name => 'advanced', label => "Advanced Search", - link => "query.cgi?format=advanced" }, - { name => 'google', label => 'Google Search', + link => "query.cgi?format=advanced" }, + { name => 'google', label => 'Google Search', link => "query.cgi?format=google" } ] current_tab_name = query_format || format || "advanced" %] diff --git a/template/en/default/search/type-select.html.tmpl b/template/en/default/search/type-select.html.tmpl index 6da88202e..dc261565e 100644 --- a/template/en/default/search/type-select.html.tmpl +++ b/template/en/default/search/type-select.html.tmpl @@ -14,12 +14,12 @@ # University Foundation. Portions created by the Initial Developer are # Copyright (C) 2008 the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] [% PROCESS "global/field-descs.none.tmpl" %] - + <select name="[% name FILTER html %]" title="Search type" class="[% class FILTER css_class_quote %]"> [% FOREACH type = types %] diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index a7bff5038..7f9e608ed 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -62,7 +62,7 @@ <tr> <th align="left">ID</th> <th align="left">Sev</th> - <th align="left">Pri</th> + <th align="left">Pri</th> <th align="left">Plt</th> <th align="left">Assignee</th> <th align="left">Status</th> diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl index 245a3e4a9..c991ddfa1 100644 --- a/template/en/default/whine/schedule.html.tmpl +++ b/template/en/default/whine/schedule.html.tmpl @@ -391,7 +391,7 @@ %] [% FOREACH option = options %] - <option value="[% option.0 %]" + <option value="[% option.0 %]" [%- IF val == option.0 +%] selected[% END %]> [%- option.1 -%] </option> @@ -436,7 +436,7 @@ %] [% FOREACH option = options %] - <option value="[% option.0 %]" + <option value="[% option.0 %]" [%- IF val == option.0 +%] selected[% END %]> [%- option.1 -%] </option> |
