diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/account/prefs/account.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/attachment/create.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/create/user-message.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/new_bug.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/global/variables.none.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/index.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/list/edit-multiple.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/list/table.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/search/search-google.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/search/search-instant.html.tmpl | 8 |
10 files changed, 24 insertions, 15 deletions
diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index 1e7bc25db..61ce80011 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -138,7 +138,7 @@ <td></td> <td> <p> - Your contributions on bugzilla.mozilla.org will still be visible; + Your contributions on [% terms.Bugzilla %] will still be visible; however, your email address and name will be removed in most locations. We are not able to remove your details that are part of comment text. </p> diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 329e0ab49..7006448d3 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -83,14 +83,14 @@ TUI_hide_default('attachment_text_field'); <td> <em>If you want to assign this [% terms.bug %] to yourself, check the box below.</em><br> - [% IF bug.assigned_to.login == "nobody@mozilla.org" || bug.assigned_to.login.search('.bugs$') %] + [% IF bug.assigned_to.login == Param('nobody_user') || bug.assigned_to.login.search('.bugs$') %] [% take_if_patch = 1 %] [% END %] <input type="checkbox" id="takebug" name="takebug" value="1" [% IF take_if_patch %] data-take-if-patch="1" [% END %]> <label for="takebug">take [% terms.bug %]</label> [% bug_statuses = [] %] [% FOREACH bug_status = bug.status.can_change_to %] - [% NEXT IF bug_status.name == "UNCONFIRMED" + [% NEXT IF bug_status.name == "UNCONFIRMED" && !bug.product_obj.allows_unconfirmed %] [% bug_statuses.push(bug_status) IF bug_status.is_open %] [% END %] diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index fa42ace81..51e787870 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -30,7 +30,7 @@ [% PROCESS global/variables.none.tmpl %] Before reporting [% terms.abug %], please read the -<a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines"> +<a href="[% terms.BugWritingGuidelinesURL %]"> [% 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/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl index ef5e361c0..9e0b2c1ab 100644 --- a/template/en/default/bug/new_bug.html.tmpl +++ b/template/en/default/bug/new_bug.html.tmpl @@ -27,10 +27,10 @@ <h2>Create New [% terms.Bug %]</h2> <p> Before reporting a [% terms.bug %], make sure you've read our - <a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines"> + <a href="[% terms.BugWritingGuidelinesURL %]"> [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already - been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi"> - most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi"> + been reported. Consult our list of <a href="duplicates.cgi"> + most frequently reported [% terms.bugs %]</a> and <a href="query.cgi"> search through descriptions</a> of previously reported [% terms.bugs %]. </p> </div> diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index faf1a5427..93002efa3 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -37,7 +37,9 @@ "bugs" => "bugs", "Bugs" => "Bugs", "zeroSearchResults" => "Zarro Boogs found", - "Bugzilla" => "Bugzilla" + "Bugzilla" => "Bugzilla", + + "BugWritingGuidelinesURL" => "https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines", } %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index e63bf0e87..2aff68615 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -76,7 +76,7 @@ <a href="page.cgi?id=etiquette.html">[%- terms.Bugzilla %] Etiquette</a> </li> <li> - | <a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines">[%- terms.Bug %] Writing Guidelines</a> + | <a href="[% terms.BugWritingGuidelinesURL %]">[%- terms.Bug %] Writing Guidelines</a> </li> [% Hook.process('additional_links') %] </ul> diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index eb989d15c..ead3ff54c 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -437,7 +437,6 @@ [% FOREACH r = resolutions %] [% NEXT IF !r %] [% NEXT IF r == "DUPLICATE" || r == "MOVED" %] - [% NEXT IF r == "EXPIRED" AND user.login != "gerv@mozilla.org" %] <option value="[% r FILTER html %]">[% display_value("resolution", r) FILTER html %]</option> [% END %] </select> diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index df2f6b349..486f3a00a 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -90,7 +90,9 @@ <th class="sorttable_nosort"> </th> [% END %] <th colspan="[% splitheader ? 2 : 1 %]" class="first-child - sorted_[% lsearch(order_columns, 'bug_id') FILTER html %]"> + [% order_columns.defined + ? 'sorted_' _ lsearch(order_columns, 'bug_id') + : '' FILTER html %]"> <a href="buglist.cgi? [% urlquerypart FILTER html %]&order= [% PROCESS new_order id='bug_id' %] @@ -136,7 +138,9 @@ [% BLOCK columnheader %] <th colspan="[% splitheader ? 2 : 1 %]" class="sortable_column_[% key FILTER html %] - sorted_[% lsearch(order_columns, id) FILTER html %]"> + [% order_columns.defined + ? 'sorted_' _ lsearch(order_columns, id) + : '' FILTER html %]"> <a href="buglist.cgi?[% urlquerypart FILTER html %]&order= [% PROCESS new_order %] [%-#%]&query_based_on= diff --git a/template/en/default/search/search-google.html.tmpl b/template/en/default/search/search-google.html.tmpl index 7fdc1daaa..1b07320ce 100644 --- a/template/en/default/search/search-google.html.tmpl +++ b/template/en/default/search/search-google.html.tmpl @@ -32,7 +32,7 @@ <p> <form method="get" action="https://www.google.com/search" data-no-csrf> -<input type="hidden" name="sitesearch" value="bugzilla.mozilla.org"> +<input type="hidden" name="sitesearch" value="[% urlbase.match('^([^:]*://)?(.*?)/?$').1 %]"> <nobr> <input type="text" name="q" size="60" maxlength="255" value=""> <input type="submit" value="Search"> diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl index d0cf078e7..ed3942166 100644 --- a/template/en/default/search/search-instant.html.tmpl +++ b/template/en/default/search/search-instant.html.tmpl @@ -8,11 +8,15 @@ [% 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 title = "Instant Search" generate_api_token = 1 - javascript_urls = [ 'extensions/GuidedBugEntry/web/js/products.js', - 'js/instant-search.js', ] + javascript_urls = javascript_urls %] [% UNLESS default.exists('product') && default.product.size %] |