From fd01bab71562adc79c1f67d89b097caaf85a4853 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 6 Feb 2017 16:03:47 +0000 Subject: [PATCH] Bug 1237790 - The experimental user interface doesn't provide link to help of bug fields --- .../global/user-error-error_message.html.tmpl | 4 +- .../default/pages/get_permissions.html.tmpl | 44 --- .../en/default/bug_modal/edit.html.tmpl | 94 +++++-- extensions/BugModal/web/bug_modal.css | 4 + extensions/BugModal/web/bug_modal.js | 7 + .../en/default/bug/tracking_flags.html.tmpl | 14 +- .../bug/create/create-bug_flags.html.tmpl | 4 + template/en/default/bug/edit.html.tmpl | 14 +- template/en/default/bug/field-label.html.tmpl | 2 +- .../en/default/list/edit-multiple.html.tmpl | 8 +- template/en/default/pages/fields.html.tmpl | 251 ------------------ 11 files changed, 97 insertions(+), 349 deletions(-) delete mode 100644 extensions/BMO/template/en/default/pages/get_permissions.html.tmpl delete mode 100644 template/en/default/pages/fields.html.tmpl diff --git a/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl index c7fb31009..d5f0058ea 100644 --- a/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl @@ -9,8 +9,8 @@ [% IF error == 'illegal_change' || error == 'illegal_change_deps' %]

If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the - fields of a [% terms.bug %], find - out how to get the necessary permissions. + fields of a [% terms.bug %], + find out how to get the necessary permissions.

[% END %] diff --git a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl deleted file mode 100644 index c62286af3..000000000 --- a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -[%# 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/header.html.tmpl - title = "Upgrade Permissions" -%] - -

How to apply for upgraded permissions

- -

- If you want canconfirm, you can add it yourself using - the triage request form. -

- -

- If you want editbugs, email - bmo-perms@mozilla.org either: -

-

- -

- editbugs implies canconfirm; there's no need to apply for both. -

- -

- Don't forget to include your [% terms.Bugzilla %] ID if it's not the email address - you are emailing from. -

- -[% PROCESS global/footer.html.tmpl %] diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index d81fb9e92..08a47b2d6 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -203,6 +203,7 @@ field_type = constants.FIELD_TYPE_FREETEXT hide_on_view = 1 short_width = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#alias" %] [%# summary %] @@ -210,6 +211,7 @@ field = bug_fields.short_desc field_type = constants.FIELD_TYPE_FREETEXT hide_on_view = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#short_desc" %] [%# status summary %] @@ -282,8 +284,8 @@ [%# buttons %]
- [% IF user.id %] -
+
+ [% IF user.id %] -
- [% END %] + [% END %] +
[% IF bug.assigned_to.id == user.id || user.in_group("editbugs") %]
+
[% END %] @@ -339,12 +343,14 @@ [% WRAPPER fields_lhs %] [%# product %] - [% can_edit_product = bug.check_can_change_field("product", 0, 1) %] + [% can_edit_product = bug.check_can_change_field("product", 0, 1) %] + [% filtered_product = bug.product_obj.name FILTER uri %] + [% filtered_component = bug.component_obj.name FILTER uri %] [% WRAPPER bug_modal/field.html.tmpl field = bug_fields.product field_type = constants.FIELD_TYPE_SINGLE_SELECT hide_on_edit = can_edit_product - help = "describecomponents.cgi" + help = "describecomponents.cgi?product=$filtered_product" %] ▸
@@ -355,12 +361,12 @@
[% END %] [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.product - field_type = constants.FIELD_TYPE_SINGLE_SELECT - hide_on_view = 1 - hide_on_edit = !can_edit_product + field = bug_fields.product + field_type = constants.FIELD_TYPE_SINGLE_SELECT + hide_on_view = 1 + hide_on_edit = !can_edit_product append_content = 1 - help = "describecomponents.cgi" + help = "describecomponents.cgi?product=$filtered_product" %] [% INCLUDE prodcompsearch/form.html.tmpl @@ -380,9 +386,10 @@ [%# component %] [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.component + field = bug_fields.component field_type = constants.FIELD_TYPE_SINGLE_SELECT - help = "describecomponents.cgi" + help = "describecomponents.cgi?product=$filtered_product&component=$filtered_component#$filtered_component" + %] ▸
@@ -401,6 +408,7 @@ label = "Importance" container = 1 hide_on_view = bug.priority == "--" && bug.bug_severity == "normal" + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#priority" %] [% INCLUDE bug_modal/field.html.tmpl field = bug_fields.priority @@ -429,10 +437,11 @@ [%# status, resolution %] [% IF bug.assigned_to.id != user.id %] [% WRAPPER bug_modal/field.html.tmpl - name = "status-view" - container = 1 - label = "Status" + name = "status-view" + container = 1 + label = "Status" hide_on_edit = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugStatuses" %] [% bug.bug_status FILTER html %] [%+ bug.resolution FILTER html IF bug.resolution %] @@ -450,15 +459,17 @@ field = bug_fields.creation_ts label = "Reported" view_only = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#creation_ts" %] [% INCLUDE bug_modal/rel_time.html.tmpl ts=bug.creation_ts %] [% END %] [%# last modified %] [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.delta_ts - label = "Modified" - view_only = 1 + field = bug_fields.delta_ts + label = "Modified" + view_only = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#delta_ts" %] [% INCLUDE bug_modal/rel_time.html.tmpl ts=bug.delta_ts %] [% END %] @@ -467,10 +478,11 @@ [%# status/resolution knob %] [% WRAPPER bug_modal/field.html.tmpl - name = "status-edit" - container = 1 - label = "Status" + name = "status-edit" + container = 1 + label = "Status" hide_on_view = bug.assigned_to.id != user.id + help = "https://wiki.mozilla.org/BMO/UserGuide/BugStatuses" %] [% INCLUDE status_block %] [% END %] @@ -542,6 +554,7 @@ field = bug_fields.assigned_to field_type = constants.FIELD_TYPE_USER hide_on_edit = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#assigned_to" %] [% IF unassigned %] Unassigned @@ -563,6 +576,7 @@ } append_content = 1 default = bug.component_obj.default_assignee.login + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#assigned_to" %]