From e596da0399b27ae9adf5ffc9be2cfaa22cf98f15 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Sun, 22 Oct 2006 18:47:00 +0000 Subject: Bug 357534: Add fieldsets in show_bug.cgi - Patch by Frédéric Buclin r=mkanat a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/bug/edit.html.tmpl | 602 +++++++++++++++++--------------- template/en/default/flag/list.html.tmpl | 20 +- 2 files changed, 333 insertions(+), 289 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 53fe5fa0b..51a14a803 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -19,6 +19,7 @@ # Contributor(s): Gervase Markham # Vaskin Kissoyan # Max Kanat-Alexander + # Frédéric Buclin #%] [% PROCESS global/variables.none.tmpl %] @@ -135,320 +136,146 @@ -[%# *** Hardware Reporter Product OS AddCC *** %] - + [%# That's the main table, which contains all editable fields. %] - - + + + [%# *** Flags *** %]
- - - - - - - [% IF Param("usebugaliases") %] + - + + + - - + [% IF use_keywords %] + + + [% PROCESS input inputname => "keywords" size => 60 colspan => 2 + value => bug.keywords.join(', ') %] + + [% END %] - - - [% IF Param('webdotbase') %] - - Show - dependency graph - [% END %] - - -
- [% IF Param('useclassification') && bug.classification_id != 1 %] - [[% bug.classification FILTER html %]] - [% END %] - [% terms.Bug %]#: - - - [% bug.bug_id %] -
+
+ Details + + + [%# *** Summary *** %] - [% PROCESS input inputname => "alias" size => "20" maxlength => "20" %] + [% PROCESS input inputname => "short_desc" size => "60" colspan => 2 + maxlength => 255 %] - [% END %] - - - - [% PROCESS select selname => "product" %] - - - [%# *** Component Version CC Priority Severity AssignedTo Milestone *** %] - - - - [% PROCESS select selname => "component" %] - - - - - - - - - - - -
- : + :
- : -
- : -
- Status: - [% status_descs.${bug.bug_status} FILTER html %]
- Resolution: - - [% get_resolution(bug.resolution) FILTER html %] - [% IF bug.resolution == "DUPLICATE" %] - of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %] - [% END %] -
-
- - - - - [% PROCESS select selname => "rep_platform" %] - - - - - [% PROCESS select selname => "op_sys" %] - - - - - [% PROCESS select selname => "version" %] - - - - - [% PROCESS select selname => "priority" %] - - - - - [% PROCESS select selname = "bug_severity" %] - - - [% IF Param("usetargetmilestone") && bug.target_milestone %] - - [% PROCESS select selname = "target_milestone" %] - [% END %] -
- : -
- : -
- : -
- : -
- : -
- : + + + + [%# *** ID, product, component, status and resolution *** %] + + + [%# *** Platform, OS, severity, priority, version and milestone *** %] + + +
[% PROCESS section_details1 %][% PROCESS section_details2 %]
-
- - - - - - - - - - - - - [% IF Param('useqacontact') %] - - - + - - [% END %] - - - - - - - - [% IF bug.cc %] - - - [% ELSE %] - + [% PROCESS input inputname => "bug_file_loc" size => "60" colspan => 2 %] + + + [% IF Param('usestatuswhiteboard') %] + + + [% PROCESS input inputname => "status_whiteboard" size => "60" colspan => 2 %] + [% END %] - -
- Reporter: - - - [% bug.reporter.identity FILTER html %] -
- 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 %] - + [%# *** URL Whiteboard Keywords *** %] + +
+
- : - - [% INCLUDE global/userselect.html.tmpl - id => "newcc" - name => "newcc" - value => "" - size => 30 - multiple => 5 - %] -
- : - - -
- - [%%] -
+ [%%]:
+ : +
-
+ : +
- + [%# *** Custom Fields *** %] + + [% USE Bugzilla %] + [% fields = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %] + [% IF fields %] + [% FOREACH field = fields %] + + [% PROCESS bug/field.html.tmpl value=bug.${field.name} + editable = bug.check_can_change_field(field.name, 0, 1) || !user.id + value_span = 2 %] + + [% END %] + [% END %] - [%# *** URL Requests Summary Whiteboard Keywords *** %] - - - - [% PROCESS input inputname => "short_desc" size => "60" colspan => 2 - maxlength => 255 %] - - - - - [% PROCESS input inputname => "bug_file_loc" size => "60" colspan => 2 %] - + [%# *** Dependencies *** %] - [% IF Param('usestatuswhiteboard') %] - - [% PROCESS input inputname => "status_whiteboard" size => "60" - colspan => 2 %] + [% PROCESS dependencies + dep = { title => "Depends on", fieldname => "dependson" } %] - [% END %] - [% IF use_keywords %] - - [% END %] - - [%# *** Custom Fields *** %] - - [% USE Bugzilla %] - [% fields = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %] - [% IF fields %] - [% FOREACH field = fields %] - - [% PROCESS bug/field.html.tmpl value=bug.${field.name} - editable = bug.check_can_change_field(field.name, 0, 1) || !user.id - value_span = 2 %] - - [% END %] - [% END %] - - - [% PROCESS dependencies - dep = { title => "Depends on", fieldname => "dependson" } %] - - - [% PROCESS dependencies accesskey = "b" - dep = { title => "Blocks", fieldname => "blocked" } %] - + + - - + + +
- : -
- : -
- : -
- : - [% PROCESS input inputname => "keywords" size => 60 colspan => 2 - value => bug.keywords.join(', ') %] + [% PROCESS dependencies accesskey = "b" + dep = { title => "Blocks", fieldname => "blocked" } %]
 
  + Show + dependency tree - - Show - dependency tree + [% IF Param('webdotbase') %] + - Show + dependency graph + [% END %] +
+ +
+ [%# *** Reporter, owner and QA contact *** %] + 		+
+ People + [% PROCESS section_people %] +
- - - + +
+
+ Flags + + + - -
[% IF bug.flag_types.size > 0 %] - [% PROCESS "flag/list.html.tmpl" - flag_types = bug.flag_types - any_flags_requesteeble = bug.any_flags_requesteeble %] + [% PROCESS "flag/list.html.tmpl" flag_no_header = 1 + flag_types = bug.flag_types + any_flags_requesteeble = bug.any_flags_requesteeble %] [% END %] -
+
+
@@ -684,6 +511,221 @@ +[%############################################################################%] +[%# Block for the first table in the "Details" section #%] +[%############################################################################%] + +[% BLOCK section_details1 %] + + + + + + + [% IF Param("usebugaliases") %] + + + [% PROCESS input inputname => "alias" size => "20" maxlength => "20" %] + + [% END %] + + + + [% PROCESS select selname => "product" %] + + + + + [% PROCESS select selname => "component" %] + + + + + + + + + + + +
+ [% IF Param('useclassification') && bug.classification_id != 1 %] + [[% bug.classification FILTER html %]] + [% END %] + [% terms.Bug %]#: + + + [% bug.bug_id %] +
+ : +
+ : +
+ : +
+ Status: + [% status_descs.${bug.bug_status} FILTER html %]
+ Resolution: + + [% get_resolution(bug.resolution) FILTER html %] + [% IF bug.resolution == "DUPLICATE" %] + of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %] + [% END %] +
+[% END %] + +[%############################################################################%] +[%# Block for the second table in the "Details" section #%] +[%############################################################################%] + +[% BLOCK section_details2 %] + + + + [% PROCESS select selname => "rep_platform" %] + + + + + [% PROCESS select selname => "op_sys" %] + + + + + [% PROCESS select selname => "version" %] + + + + + [% PROCESS select selname => "priority" %] + + + + + [% PROCESS select selname = "bug_severity" %] + + + [% IF Param("usetargetmilestone") && bug.target_milestone %] + + + [% PROCESS select selname = "target_milestone" %] + + [% END %] +
+ : +
+ : +
+ : +
+ : +
+ : +
+ : +
+[% END %] + +[%############################################################################%] +[%# Block for the table in the "People" section #%] +[%############################################################################%] + +[% BLOCK section_people %] + + + + + + + + + + + + [% IF Param('useqacontact') %] + + + + + [% END %] + + + + + + + + [% IF bug.cc %] + + + [% ELSE %] + + [% END %] + +
+ Reporter: + + + [% bug.reporter.identity FILTER html %] +
+ 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 %] +
+ : + + [% INCLUDE global/userselect.html.tmpl + id => "newcc" + name => "newcc" + value => "" + size => 30 + multiple => 5 + %] +
+ : + + +
+ + [%%] +
+
+[% END %] + [%############################################################################%] [%# Block for dependencies #%] [%############################################################################%] diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 463ade125..42bdb9d0b 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -75,16 +75,18 @@ [% DEFAULT flag_table_id = "flags" %] - - - [% IF any_flags_requesteeble %] - + - [% END %] - + [% IF any_flags_requesteeble %] + + [% END %] + + [% END %] [%# Step 1: Display every flag type (except inactive types with no flags). %] [% FOREACH type = flag_types %] -- cgit v1.2.3-24-g4f1b
- Flags: - - Requestee: + [% UNLESS flag_no_header %] +
+ Flags:
+ Requestee: +