From f8e8541db6b20e5ed9b6e875f14fc24207c7dfc9 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Sun, 22 Oct 2006 04:57:33 +0000 Subject: Bug 357490: Reorganize fields in show_bug.cgi and group links together - Patch by Frédéric Buclin r=bkor a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/bug/edit.html.tmpl | 272 +++++++++++++++++---------------- 1 file changed, 141 insertions(+), 131 deletions(-) (limited to 'template/en/default/bug/edit.html.tmpl') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index c829a71f4..802f0bc61 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -147,7 +147,7 @@ [% IF Param('useclassification') && bug.classification_id != 1 %] [[% bug.classification FILTER html %]] [% END %] - [% terms.Bug %]#: + [% terms.Bug %]#: @@ -182,18 +182,14 @@ - - Status: - + Status: [% status_descs.${bug.bug_status} FILTER html %] - - Resolution: - + Resolution: [% get_resolution(bug.resolution) FILTER html %] @@ -203,20 +199,9 @@ - - - - Assigned To: - - - [% bug.assigned_to.identity FILTER html %] - - - - @@ -272,12 +257,11 @@ @@ -330,36 +354,15 @@ @@ -516,82 +534,74 @@ show_attachment_flags = bug.show_attachment_flags %] -[%# *** Dependencies Votes *** %] -
- + + + + + + [% IF Param('useqacontact') %] + + + + + [% END %] +
- Reporter: + Reporter: @@ -285,6 +269,47 @@
+ Assigned To: + + + [% bug.assigned_to.identity FILTER html %] +
+ : + + [% IF bug.check_can_change_field("qa_contact", 0, 1) || !user.id %] + [% INCLUDE global/userselect.html.tmpl + id => "qa_contact" + name => "qa_contact" + value => bug.qa_contact.login + size => 30 + emptyok => 1 + %] + [% ELSE %] + + + [% IF bug.qa_contact.login && bug.qa_contact.login.length > 30 %] + + [% bug.qa_contact.identity FILTER truncate(30) FILTER html %] + + [% ELSE %] + [% bug.qa_contact.identity FILTER html %] + [% END %] + + [% END %] +
: @@ -322,7 +347,6 @@
-
- [%# *** QAContact URL Requests Summary Whiteboard Keywords *** %] + [%# *** URL Requests Summary Whiteboard Keywords *** %] - [% IF Param('useqacontact') %] - - - - - [% END %] + + + [% PROCESS input inputname => "short_desc" size => "60" colspan => 2 + maxlength => 255 %] + - [% PROCESS input inputname => "bug_file_loc" size => "60" colspan => 5 %] - - - - - [% PROCESS input inputname => "short_desc" size => "60" colspan => 5 - maxlength => 255 %] + [% PROCESS input inputname => "bug_file_loc" size => "60" colspan => 2 %] [% IF Param('usestatuswhiteboard') %] [% PROCESS input inputname => "status_whiteboard" size => "60" - colspan => 5 %] + colspan => 2 %] [% END %] @@ -398,7 +392,7 @@ [% END %] @@ -411,11 +405,35 @@ [% FOREACH field = fields %] [% PROCESS bug/field.html.tmpl value=bug.${field.name} - editable=1 %] + editable = 1 + value_span = 2 %] [% END %] [% END %] + + [% PROCESS dependencies + dep = { title => "Depends on", fieldname => "dependson" } %] + + + + [% PROCESS dependencies accesskey = "b" + dep = { title => "Blocks", fieldname => "blocked" } %] + + + + + + +
- : - - [% IF bug.check_can_change_field("qa_contact", 0, 1) || !user.id %] - [% INCLUDE global/userselect.html.tmpl - id => "qa_contact" - name => "qa_contact" - value => bug.qa_contact.login - size => 60 - emptyok => 1 - %] - [% ELSE %] - - [% IF bug.qa_contact.login && bug.qa_contact.login.length > 60 %] - - [% bug.qa_contact.login FILTER truncate(60) FILTER html %] - - [% ELSE %] - [% bug.qa_contact.login FILTER html %] - [% END %] - [% END %] -
+ : +
@@ -372,25 +375,16 @@ [% END %] [%%]:
- : -
- : + :
: - [% PROCESS input inputname => "keywords" size => 60 colspan => 5 + [% PROCESS input inputname => "keywords" size => 60 colspan => 2 value => bug.keywords.join(', ') %]
  + Show + dependency tree + + [% IF Param('webdotbase') %] + - Show + dependency graph + [% END %] +
+[%# *** Comments Groups *** %] + +
+
- [% PROCESS dependencies - dep = { title => "depends on", fieldname => "dependson" } %] - - - - [% PROCESS dependencies accesskey = "b" - dep = { title => "blocks", fieldname => "blocked" } %] - -
- Show - dependency tree + + : + [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %] + + + [% END %] +
+ + [% INCLUDE global/textarea.html.tmpl + name = 'comment' + id = 'comment' + minrows = 10 + maxrows = 25 + cols = constants.COMMENT_COLS + %] + + [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] + [% has_role = bug.user.isreporter + || bug.assigned_to.id == user.id + || (Param('useqacontact') + && bug.qa_contact + && bug.qa_contact.id == user.id) %] - [% IF Param('webdotbase') %]
- Show - dependency graph + + [% END %]
+ +
+ Related actions + + + [% IF bug.use_votes %] +
+ Votes: [% bug.votes %] + + [% END %] - [% IF bug.use_votes %] - - - -
- Votes: - - [% bug.votes %]    - Show - votes for this [% terms.bug %]    - Vote - for this [% terms.bug %] + [%# Links to more things users can do with this bug. %] + [% Hook.process("links") %] +
- [% END %] - -[%# *** Comments Groups *** %] - -
- : - [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %] - - - [% END %] -
- - [% INCLUDE global/textarea.html.tmpl - name = 'comment' - id = 'comment' - minrows = 10 - maxrows = 25 - cols = constants.COMMENT_COLS - %] - - [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] - [% has_role = bug.user.isreporter - || bug.assigned_to.id == user.id - || (Param('useqacontact') - && bug.qa_contact - && bug.qa_contact.id == user.id) %] - -
- - - [% END %]
[% IF bug.groups.size > 0 %] @@ -681,7 +691,7 @@ [% BLOCK dependencies %] : + [% dep.title %]: [% FOREACH depbug = bug.${dep.fieldname} %] @@ -726,7 +736,7 @@ [%############################################################################%] [% BLOCK input %] - + [% val = value ? value : bug.$inputname %] [% IF bug.check_can_change_field(inputname, 0, 1) || !user.id %]