From fd01bab71562adc79c1f67d89b097caaf85a4853 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 6 Feb 2017 16:03:47 +0000 Subject: Bug 1237790 - The experimental user interface doesn't provide link to help of bug fields --- template/en/default/bug/edit.html.tmpl | 14 +- template/en/default/bug/field-label.html.tmpl | 2 +- template/en/default/list/edit-multiple.html.tmpl | 8 +- template/en/default/pages/fields.html.tmpl | 251 ----------------------- 4 files changed, 12 insertions(+), 263 deletions(-) delete mode 100644 template/en/default/pages/fields.html.tmpl (limited to 'template/en') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 2d0286292..164602ff2 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -142,7 +142,7 @@ - What do these fields mean? + What do these fields mean? [% PROCESS commit_button id="_top"%] @@ -384,7 +384,7 @@ [% BLOCK section_status %] - Status: + Status: @@ -443,7 +443,7 @@ : + Importance [% INCLUDE bug/field.html.tmpl @@ -462,7 +462,7 @@ : [% PROCESS select selname = "target_milestone" %] @@ -479,7 +479,7 @@ - Assigned To: + Assigned To: [% IF bug.check_can_change_field("assigned_to", 0, 1) %] @@ -579,7 +579,7 @@ : @@ -1218,7 +1218,7 @@ class="status" cellspacing="0" cellpadding="0"> - Status: + Status: [% PROCESS bug/knob.html.tmpl %] diff --git a/template/en/default/bug/field-label.html.tmpl b/template/en/default/bug/field-label.html.tmpl index ecb49318e..94180fabc 100644 --- a/template/en/default/bug/field-label.html.tmpl +++ b/template/en/default/bug/field-label.html.tmpl @@ -45,7 +45,7 @@ [% IF desc_url %] href="[% desc_url FILTER html %]" [% ELSE %] - href="page.cgi?id=fields.html#[% field.name FILTER uri %]" + href="https://wiki.mozilla.org/BMO/UserGuide/BugFields#[% field.name FILTER uri %]" [% END %] >[%- field_descs.${field.name} FILTER html %]: diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 8a1de5f2d..58d02839c 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -84,7 +84,7 @@ @@ -97,7 +97,7 @@ @@ -107,7 +107,7 @@ @@ -120,7 +120,7 @@ diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl deleted file mode 100644 index 8c763d73f..000000000 --- a/template/en/default/pages/fields.html.tmpl +++ /dev/null @@ -1,251 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Terry Weissman - # Gervase Markham - #%] - -[% PROCESS "global/field-descs.none.tmpl" %] -[% PROCESS global/header.html.tmpl - title = "$terms.Bug Fields" - style_urls = ['skins/standard/page.css'] -%] - -

This page describes the various fields that you see - on [% terms.abug %].

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

[% field_descs.bug_status FILTER upper FILTER html %]

- 		-

[% field_descs.resolution FILTER upper FILTER html %]

-
The [% field_descs.bug_status FILTER html %] field indicates the - current state of a [% terms.bug %]. Only certain status transitions - are allowed.The [% field_descs.resolution FILTER html %] field indicates what - happened to this [%+ terms.bug %].
Open [% terms.Bugs %]
-
-
- [% display_value("bug_status", "UNCONFIRMED") FILTER html %] -
-
- This [% terms.bug %] has recently been added to the database. - Nobody has validated that this [% terms.bug %] is true. Users - who have the "canconfirm" permission set may confirm - this [% terms.bug %], changing its state to [% display_value("bug_status", "NEW") FILTER html %]. Or, it may be - directly resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %]. -
-
- [% display_value("bug_status", "NEW") FILTER html %] -
-
- This [% terms.bug %] has recently been added to the assignee's - list of [% terms.bugs %] and must be processed. [% terms.Bugs %] in - this state may be accepted, and become [% display_value("bug_status", "ASSIGNED") FILTER html %], passed - on to someone else, and remain [% display_value("bug_status", "NEW") FILTER html %], or resolved and marked - [% display_value("bug_status", "RESOLVED") FILTER html %]. -
- -
- [% display_value("bug_status", "ASSIGNED") FILTER html %] -
-
- This [% terms.bug %] is not yet resolved, but is assigned to the - proper person. From here [% terms.bugs %] can be given to another - person and become [% display_value("bug_status", "NEW") FILTER html %], or - resolved and become [% display_value("bug_status", "RESOLVED") FILTER html %]. -
- -
- [% display_value("bug_status", "REOPENED") FILTER html %] -
-
- This [% terms.bug %] was once resolved, but the resolution was - deemed incorrect. For example, a [% display_value("resolution", "WORKSFORME") FILTER html %] [% terms.bug %] is - [% display_value("bug_status", "REOPENED") FILTER html %] when more information shows up and - the [% terms.bug %] is now reproducible. From here [% terms.bugs %] are - either marked [% display_value("bug_status", "ASSIGNED") FILTER html %] or - [% display_value("bug_status", "RESOLVED") FILTER html %]. -
- - [% Hook.process('open-status') %] -
- 		- No resolution yet. All [% terms.bugs %] which are in one of - these "open" states have no resolution set. -
Closed [% terms.Bugs %]
-
-
- [% display_value("bug_status", "RESOLVED") FILTER html %] -
-
- A resolution has been performed, and it is awaiting verification by - QA. From here [% terms.bugs %] are either reopened and given some - open status, or are verified by QA and marked - [% display_value("bug_status", "VERIFIED") FILTER html %]. -
- -
- [% display_value("bug_status", "VERIFIED") FILTER html %] -
-
- QA has looked at the [% terms.bug %] and the resolution and - agrees that the appropriate resolution has been taken. - Any zombie [% terms.bugs %] who choose to walk the earth again must - do so by becoming [% display_value("bug_status", "REOPENED") FILTER html %]. -
- - [% Hook.process('closed-status') %] -
- 		-
-
- [% display_value("resolution", "FIXED") FILTER html %] -
-
- A fix for this [% terms.bug %] is checked into the tree and - tested. -
- -
- [% display_value("resolution", "INVALID") FILTER html %] -
-
- The problem described is not [% terms.abug %]. -
- -
- [% display_value("resolution", "WONTFIX") FILTER html %] -
-
- The problem described is [% terms.abug %] which will never be - fixed. -
- -
- [% display_value("resolution", "DUPLICATE") FILTER html %] -
-
- The problem is a duplicate of an existing [% terms.bug %]. - Marking [% terms.abug %] duplicate requires the [% terms.bug %]# - of the duplicating [% terms.bug %] and will at least put - that [% terms.bug %] number in the description field. -
- -
- [% display_value("resolution", "WORKSFORME") FILTER html %] -
-
- All attempts at reproducing this [% terms.bug %] were futile, - and reading the code produces no clues as to why the described - behavior would occur. If more information appears later, - the [% terms.bug %] can be reopened. -
- - [% Hook.process('resolution') %] -
-
- -

Other Fields

- -[% SET field_help_map = {} %] -[% FOREACH field = bug_fields.keys %] - [% SET field_desc = field_descs.$field %] - [% field_help_map.$field_desc = { help => help_html.$field, - field => field } %] -[% END %] - -[%# This field is not a real one, but its label is visible in bugs. %] - -[% field_help_map.Importance = { help => help_html.importance, - field => "importance" } %] - -[%# These are fields that don't need to be documented, either because - # they have docs somewhere else in the UI, or they don't show up on bugs. - # %] -[% SET skip_fields = [ - 'days_elapsed', - 'everconfirmed', - 'reporter_accessible', - 'cclist_accessible', - 'bug_group', - 'commenter', - 'owner_idle_time', - 'bug_status', - 'resolution', - 'assignee_last_login', -] %] - -
-[% FOREACH field_desc = field_help_map.keys.sort %] - [% SET field = field_help_map.${field_desc}.field %] - [% SET field_object = bug_fields.$field %] - - [% NEXT IF field_object.obsolete %] - [% NEXT IF !user.is_timetracker AND field_object.is_timetracking %] - - [% NEXT IF field == 'status_whiteboard' AND !Param('usestatuswhiteboard') %] - [% NEXT IF field == 'target_milestone' AND !Param('usetargetmilestone') %] - [% NEXT IF field == 'alias' AND !Param('usebugaliases') %] - - [%# For now we don't have help for attachment fields and so on. %] - [% NEXT IF field.match('\.') %] - - [% NEXT IF skip_fields.contains(field) %] - -
[% field_desc FILTER html %]
-
- [% SET help_text = field_help_map.${field_desc}.help %] - [% help_text FILTER none %] -
-[% END %] -
- -[% PROCESS global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b