diff options
Diffstat (limited to 'extensions/BMO/template/en/default/hook')
8 files changed, 28 insertions, 20 deletions
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl index 5b58a9637..ee88aac7c 100644 --- a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl @@ -1,4 +1,4 @@ - <tr bgcolor="[% tablecolour FILTER html %]"> + <tr bgcolor="[% tablecolour %]"> <td valign="middle" align="right"> <b>Security</b> </td> diff --git a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl index ba6eeb78c..0c68d8e72 100644 --- a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl @@ -49,6 +49,7 @@ [% FOREACH field = Bugzilla.active_custom_fields %] [% NEXT IF NOT user.id AND field.value == "---" %] [% NEXT IF cf_hidden_in_product(field.name, bug.product, bug.component, 2) %] + [% NEXT IF cf_flag_disabled(field.name, bug) %] [% custom_flags.push(field.name) %] <tr id="row_[% field.name FILTER js %]"> <td> </td> diff --git a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl index 05276d5f7..0277f3e7e 100644 --- a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl @@ -21,7 +21,7 @@ <link rel="shortcut icon" href="extensions/BMO/web/images/bugzilla.png"> [% IF bug %] -<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id FILTER uri %]"> +<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id %]"> [% END %] <style type="text/css"> diff --git a/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl new file mode 100644 index 000000000..067347f3b --- /dev/null +++ b/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl @@ -0,0 +1,3 @@ +[% IF object == 'group_admins' %] + the group administrators report +[% END %] diff --git a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl index 5a3e2bed6..85881aca7 100644 --- a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl @@ -34,22 +34,7 @@ [% title = "Invalid Date" %] The date '[% date FILTER html %]' is invalid. -[% ELSIF error == "remo_payment_invalid_product" %] - [% title = "Mozilla Reps Payment Invalid $terms.Bug" %] - You can only attach budget payment information to [% terms.bugs %] under - the product 'Mozilla Reps' and component 'Budget Requests'. - -[% ELSIF error == "remo_payment_bug_edit_denied" %] - [% title = "Mozilla Reps Payment $terms.Bug Edit Denied" %] - You do not have permission to edit [% terms.bug %] '[% bug_id FILTER html %]'. - -[% ELSIF error == "remo_payment_cancel_dupe" %] - [% title = "Already filed payment request" %] - You already used the form to file - <a href="[% urlbase FILTER html %]attachment.cgi?id=[% attachid FILTER uri %]&action=edit"> - attachment [% attachid FILTER uri %]</a>.<br> - <br> - You can either <a href="[% urlbase FILTER html %]page.cgi?id=remo-form-payment.html"> - create a new payment request</a> or [% "go back to $terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]. +[% ELSIF error == "invalid_object" %] + Invalid [% object FILTER html %]: "[% value FILTER html %]" [% END %] diff --git a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl index 346e02373..5f6ca946a 100644 --- a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl @@ -22,7 +22,7 @@ [% IF (group == "canconfirm" OR group == "editbugs") AND !reason %] <p> - If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %], + If you are attempting to confirm an unconfirmed bug or edit the fields of a bug, <a href="http://www.gerv.net/hacking/before-you-mail-gerv.html#bugzilla-permissions">find out how to get the necessary permissions</a>. </p> diff --git a/extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl b/extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl new file mode 100644 index 000000000..4d12ab345 --- /dev/null +++ b/extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl @@ -0,0 +1,13 @@ +<dt> + [% display_value("resolution", "INCOMPLETE") FILTER html %] +</dt> +<dd> + The problem is vaguely described with no steps to reproduce, + or is a support request. The reporter should be directed to the + product's support page for help diagnosing the issue. If there + are only a few comments in the [% terms.bug %], it may be reopened only if + the original reporter provides more info, or confirms someone + else's steps to reproduce. If the [% terms.bug %] is long, when enough info + is provided a new [% terms.bug %] should be filed and the original [% terms.bug %] + marked as a duplicate of it. +</dd> diff --git a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl index b42ff8d2a..6e8463020 100644 --- a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl +++ b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl @@ -31,5 +31,11 @@ %]page.cgi?id=triage_reports.html">Triage Report</a></strong> - Report on UNCONFIRMED [% terms.bugs %] to assist triage. </li> + [% IF user.in_group('editusers') %] + <li> + <strong><a href="[% urlbase FILTER none + %]page.cgi?id=group_admins.html">Group Admins</a></strong> - Group Admins Report + </li> + [% END %] </ul> |