diff options
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 67 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/field-descs.none.tmpl | 1 |
4 files changed, 44 insertions, 29 deletions
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index eeb4539d2..3eed01124 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -635,6 +635,7 @@ TUI_hide_default('attachment_text_field'); <tbody> [%# non-tracking flags custom fields %] [% FOREACH field = Bugzilla.active_custom_fields(product=>product,type=>1) %] + [% NEXT IF field.type == constants.FIELD_TYPE_EXTENSION %] [% NEXT UNLESS field.enter_bug %] [%# crash-signature gets custom handling %] [% IF field.name == 'cf_crash_signature' %] @@ -671,14 +672,15 @@ TUI_hide_default('attachment_text_field'); </tbody> [% END %] -[% tracking_flags = [] %] -[% project_flags = [] %] +[% old_tracking_flags = [] %] +[% old_project_flags = [] %] [% FOREACH field = Bugzilla.active_custom_fields(product=>product,type=>2) %] + [% NEXT IF field.type == constants.FIELD_TYPE_EXTENSION %] [% NEXT UNLESS field.enter_bug %] [% IF cf_is_project_flag(field.name) %] - [% project_flags.push(field) %] + [% old_project_flags.push(field) %] [% ELSE %] - [% tracking_flags.push(field) %] + [% old_tracking_flags.push(field) %] [% END %] [% END %] @@ -690,7 +692,7 @@ TUI_hide_default('attachment_text_field'); [% LAST IF display_flags && any_flags_requesteeable %] [% END %] -[% IF project_flags.size || tracking_flags.size || display_flags %] +[% IF old_project_flags.size || old_tracking_flags.size || display_flags %] <tbody class="expert_fields"> <tr> <th>Flags:</th> @@ -708,41 +710,47 @@ TUI_hide_default('attachment_text_field'); <table cellpadding="0" cellspacing="0"> <tr> - [% IF tracking_flags.size %] + [% IF old_tracking_flags.size %] <td [% IF project_flags.size %]rowspan="2"[% END %]> - <table id="bug_tracking_flags"> + <table class="tracking_flags"> <tr> <th colspan="2" style="text-align:left">Tracking Flags:</th> </tr> - <tr> - [% FOREACH field = tracking_flags %] - [% SET value = ${field.name}.defined ? ${field.name} : "" %] - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = field, value = value, editable = 1, - value_span = 3 %] - </tr> - [% END %] - </tr> + [% FOREACH field = old_tracking_flags %] + [% SET value = ${field.name}.defined ? ${field.name} : "" %] + <tr> + [% INCLUDE bug/field.html.tmpl + bug = default + field = field + value = value + editable = 1 + value_span = 3 + %] + </tr> + [% END %] + [% Hook.process('tracking_flags_end') %] </table> </td> [% END %] - [% IF project_flags.size %] + [% IF old_project_flags.size %] <td> - <table id="bug_project_flags"> + <table class="tracking_flags"> <tr> <th colspan="2" style="text-align:left">Project Flags:</th> </tr> - <tr> - [% FOREACH field = project_flags %] - [% SET value = ${field.name}.defined ? ${field.name} : "" %] - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = field, value = value, editable = 1, - value_span = 3 %] - </tr> - [% END %] - </tr> + [% FOREACH field = old_project_flags %] + [% SET value = ${field.name}.defined ? ${field.name} : "" %] + <tr> + [% INCLUDE bug/field.html.tmpl + bug = default + field = field + value = value + editable = 1 + value_span = 3 + %] + </tr> + [% END %] + [% Hook.process('project_flags_end') %] </table> </td> </tr> @@ -757,6 +765,7 @@ TUI_hide_default('attachment_text_field'); </td> [% END %] </tr> + [% Hook.process('bug_flags_end') %] </table> </fieldset> </div> diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index e641cee93..8c2d09872 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -962,6 +962,7 @@ [%# *** Custom Fields *** %] [% USE Bugzilla %] [% FOREACH field = Bugzilla.active_custom_fields(product=>bug.product_obj,component=>bug.component_obj,type=>1) %] + [% NEXT IF field.type == constants.FIELD_TYPE_EXTENSION %] [% NEXT IF NOT user.id AND field.value == "---" %] [% Hook.process('custom_field', 'bug/edit.html.tmpl') %] [% NEXT IF field.hidden %] diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 74f632c54..73131225d 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -246,6 +246,8 @@ YAHOO.bugzilla.keywordAutocomplete.init('[% field.name FILTER js %]', 'keyword_autocomplete'); </script> + [% CASE constants.FIELD_TYPE_EXTENSION %] + [% Hook.process('editable') %] [% END %] [% ELSE %] [% SWITCH field.type %] @@ -269,6 +271,8 @@ </li> [% END %] [% '</ul>' IF value.size %] + [% CASE constants.FIELD_TYPE_EXTENSION %] + [% Hook.process('non_editable') %] [% CASE %] [% value.join(', ') FILTER html %] [% END %] diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 1596f3884..731ba37ef 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -62,6 +62,7 @@ ${constants.FIELD_TYPE_DATETIME} => "Date/Time", ${constants.FIELD_TYPE_DATE} => "Date", ${constants.FIELD_TYPE_BUG_ID} => "$terms.Bug ID", + ${constants.FIELD_TYPE_EXTENSION} => "Extension", } %] [% IF in_template_var %] |