diff options
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/create/comment-guided.txt.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/bug/create/create-guided.html.tmpl | 40 | ||||
| -rw-r--r-- | template/en/default/bug/create/user-message.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/dependency-tree.html.tmpl | 30 | ||||
| -rw-r--r-- | template/en/default/bug/field-events.js.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/field-help.none.tmpl | 18 | ||||
| -rw-r--r-- | template/en/default/bug/field-label.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 24 | ||||
| -rw-r--r-- | template/en/default/bug/format_comment.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/knob.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/link.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/new_bug.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/process/midair.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/process/verify-new-product.html.tmpl | 20 | ||||
| -rw-r--r-- | template/en/default/bug/show-multiple.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/bug/show.xml.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/bug/summarize-time.html.tmpl | 20 |
17 files changed, 101 insertions, 101 deletions
diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl index 67748e594..baf390c18 100644 --- a/template/en/default/bug/create/comment-guided.txt.tmpl +++ b/template/en/default/bug/create/comment-guided.txt.tmpl @@ -24,7 +24,7 @@ # 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() %] @@ -42,12 +42,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..9201eb977 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 @@ -232,7 +232,7 @@ function PutDescription() { [% 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") %] @@ -245,11 +245,11 @@ function PutDescription() { <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 + 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> @@ -275,7 +275,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 +317,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 +423,7 @@ function PutDescription() { </p> </td> </tr> - + <tr> <td valign="top" align="right"> <b>Severity</b> @@ -452,7 +452,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 +474,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 fa42ace81..4d13da96d 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -29,7 +29,7 @@ [% PROCESS global/variables.none.tmpl %] -Before reporting [% terms.abug %], please read the +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 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/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 ef5e361c0..b642be3c7 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"> |