From 424b21e37cd9aeac01588ce0defd3ee665944b1d Mon Sep 17 00:00:00 2001 From: Simon Green Date: Thu, 14 Aug 2014 09:40:47 +1000 Subject: Bug 1012506 - Allow a bug to have multiple aliases r=dkl, a=sgreen --- template/en/default/bug/edit.html.tmpl | 124 ++++++++++++++++---------- template/en/default/bug/show-header.html.tmpl | 4 +- 2 files changed, 79 insertions(+), 49 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 8b55dedcb..6917a89ec 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -66,9 +66,13 @@ [%# *** ID, product, component, status, resolution, Hardware, and OS *** %] [% PROCESS section_status %] - + [% PROCESS section_spacer %] - + + [% PROCESS section_aliases %] + + [% PROCESS section_spacer %] + [% PROCESS section_details1 %] [% PROCESS section_spacer %] @@ -173,61 +177,37 @@ [% BLOCK section_title %] [%# That's the main table, which contains all editable fields. %] -
+
[% PROCESS commit_button id="_top"%] [%-# %][% terms.Bug %] [% bug.bug_id FILTER html %] - [%-# %] - [% IF bug.alias != "" %] - ([% bug.alias FILTER html %]) + [%-# %] + [% IF bug.alias.size > 0 %] + ([% bug.alias.join(', ') FILTER html %]) [% END %] - [% bug.short_desc FILTER quoteUrls(bug) %] - [% IF bug.check_can_change_field('short_desc', 0, 1) || - bug.check_can_change_field('alias', 0, 1) %] - (edit) + [% IF bug.check_can_change_field('short_desc', 0, 1) %] + (edit) [% END %] - - -
-
- - [% IF bug.check_can_change_field('alias', 0, 1) %] - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.alias - editable = 1 - %] - - - [%# *** Summary *** %] - - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.short_desc - editable = 1 - accesskey = "s" - %] - - -
- [% ELSIF bug.alias %] - ( - [% ELSE %] - - [% END %] - [% PROCESS input inputname => "alias" - size => "20" - maxlength => "20" - no_td => 1 - %][% ")" IF NOT bug.check_can_change_field('alias', 0, 1) - && bug.alias %] -
- [% PROCESS input inputname => "short_desc" size => "80" colspan => 2 - maxlength => 255 spellcheck => "true" no_td => 1 %] -
+ +
+ [% INCLUDE "bug/field-label.html.tmpl" + field = bug_fields.short_desc + editable = 1 + accesskey = "s" + tag_name = 'span' + %] + [% PROCESS input inputname => "short_desc" size => "80" + maxlength => 255 spellcheck => "true" no_td => 1 %]
[% END %] @@ -867,6 +847,56 @@ [% END %] [% END %] +[% BLOCK section_aliases %] + + [% INCLUDE "bug/field-label.html.tmpl" + field = bug_fields.alias, editable = 1 + %] + + [% IF bug.alias.size %] + [% bug.alias.join(', ') FILTER html %] + [% ELSE %] + None + [% END %] + [% IF bug.check_can_change_field('alias', 0, 1) %] + + (edit) + +
+
+
+
+ +
+ +
+ [% IF bug.alias.size %] + +
+ + + + + [% END %] +
+ + [% END %] + + +[% END %] + [%############################################################################%] [%# Block for FLAGS #%] [%############################################################################%] diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl index 6dfc19dfb..3b1f27252 100644 --- a/template/en/default/bug/show-header.html.tmpl +++ b/template/en/default/bug/show-header.html.tmpl @@ -13,7 +13,7 @@ # be overridden by the calling templates. #%] -[% filtered_alias = bug.alias FILTER html %] +[% filtered_alias = bug.alias.join(', ') FILTER html %] [% filtered_desc = bug.short_desc FILTER html %] [% filtered_timestamp = bug.delta_ts FILTER time %] @@ -34,7 +34,7 @@ [% header_addl_info = "Last modified: $filtered_timestamp" %] [% unfiltered_title = "$bug.bug_id – " %] [% IF bug.alias != '' %] - [% unfiltered_title = unfiltered_title _ "($bug.alias) " %] + [% unfiltered_title = unfiltered_title _ "(" _ bug.alias.join(', ') _ ") " %] [% END %] [% unfiltered_title = unfiltered_title _ bug.short_desc %] [% javascript = BLOCK %] -- cgit v1.2.3-24-g4f1b