From 286c0ad1454c120b61e1d162b236f6fb27b77e46 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Wed, 22 Feb 2006 00:58:06 +0000 Subject: Bug 219555: 'Format for Printing' page is a mess - Patch by Olav Vitters r=LpSolit a=justdave --- skins/standard/show_multiple.css | 44 ++++ template/en/default/bug/show-multiple.html.tmpl | 330 ++++++++++++++++-------- template/en/default/filterexceptions.pl | 4 +- 3 files changed, 266 insertions(+), 112 deletions(-) diff --git a/skins/standard/show_multiple.css b/skins/standard/show_multiple.css index fd418a82e..573a587b6 100644 --- a/skins/standard/show_multiple.css +++ b/skins/standard/show_multiple.css @@ -1,3 +1,47 @@ hr {margin: 20px auto 40px} .bz_private { color:darkred } + +h1 { + font-size: 2em; + margin-bottom: 10px; +} + +/* bugfields is table of all fields and values */ +.bugfields { + font-size: small; + background: #eee; + padding: 5px; + border: 1px solid silver; + width: 100%; +} + +.bugfields tr { + vertical-align: top; +} + +.bugfields th { + width: 10em; + text-align: left; + font-weight: normal; + line-height: 150%; +} + +.bugfields td { + font-weight: bold; + line-height: 150%; +} + +.bugfields .rightcell { + padding-left: 10px; +} + +/* set line-height to normal for nested tables of bugfields table */ +.bugfields table th, .bugfields table td { + line-height: 100%; + width: auto; +} + +.bugfields table.timetracking th, .bugfields table.timetracking td { + width: 10em; +} diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index c1eb27c75..9244592d8 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -18,13 +18,17 @@ # # Contributor(s): Terry Weissman # Gervase Markham + # Toms Baugis + # Olav Vitters #%] [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS global/header.html.tmpl title = "Full Text $terms.Bug Listing" - style_urls = [ "skins/standard/show_multiple.css" ] + h1 = "" + style_urls = ["skins/standard/show_multiple.css", + "skins/standard/buglist.css"] %] [% PROCESS bug/time.html.tmpl %] [% IF bugs.first %] @@ -46,154 +50,198 @@ [%###########################################################################%] [% BLOCK bug_display %] -
- - [% terms.Bug %] [%+ bug.bug_id %] - [% bug.short_desc FILTER html %] - -
+

+ [% terms.Bug %] + [% bug.bug_id %] + [% IF Param("usebugaliases") AND bug.alias %] + ([% bug.alias FILTER html %]) + [% END %] +

+ + + [%# The rightcell block (also called by the row block) automatically shows + # the fields from rightcells %] + [% rightcells = ['reporter', 'assigned_to'] %] + [% IF Param('useqacontact') %] + [% rightcells.push('qa_contact') %] + [% END %] + [% rightcells.push('') %] + [% IF bug.cc %] + [% rightcells.push('cc') %] + [% END %] + [% IF bug.keywords %] + [% rightcells.push('keywords') %] + [% END %] + + [%# Determine if the bug has a flag %] + [% FOREACH type = bug.flag_types %] + [% IF type.flags.size %] + [% rightcells.push('flags') %] + [% LAST %] + [% END %] + [% END %] + + [% PROCESS row cell = "short_desc" fullrow = 1 %] -
+ - - [% PROCESS cell attr = { description => "Version", - name => "version" } %] - [% PROCESS cell attr = { description => "Platform", - name => "rep_platform" } %] + [% PROCESS rightcell %] + [% PROCESS row cell = "component" %] + - [% PROCESS cell attr = { description => "OS/Version", - name => "op_sys" } %] + - [% PROCESS cell attr = { description => "Severity", - name => "bug_severity" } %] - [% PROCESS cell attr = { description => "Priority", - name => "priority" } %] - - - - - - [% IF Param('useqacontact') %] - - [% END %] + [% PROCESS rightcell %] - + - - - - - - + + + [% PROCESS rightcell %] - [% IF use_keywords %] + [% PROCESS row cell = "version" %] + [% PROCESS row cell = "target_milestone" IF Param('usetargetmilestone') %] + [% PROCESS row cell = "rep_platform" %] + [% PROCESS row cell = "op_sys" %] + + [% IF bug.bug_file_loc %] - + [% END %] [% IF Param("usestatuswhiteboard") %] + [% PROCESS row cell = "status_whiteboard" fullrow = 1 %] + [% END %] + + [% IF (bug.dependson.size || bug.blocked.size) %] + [% PROCESS dependencies name = "dependson" %] + [% PROCESS dependencies name = "blocked" %] + [% END %] + + [% IF UserInGroup(Param("timetrackinggroup")) %] - + + [% PROCESS row cell="deadline" %] [% END %] - [% IF UserInGroup(Param("timetrackinggroup")) %] + [% IF bug.attachments.size %] - + [% END %] - - - -
[% field_descs.product FILTER html %]: - [% terms.Bug %]#: - [% bug.bug_id %] - [% IF Param("usebugaliases") AND bug.alias %] - ([% bug.alias FILTER html %]) - [% END %] - - Product:   [% IF Param("useclassification") %] [[% bug.classification FILTER html %]]  [% END %] [% bug.product FILTER html %]
[% field_descs.bug_status FILTER html %]: - Status:  [% status_descs.${bug.bug_status} FILTER html %] + [%+ resolution_descs.${bug.resolution} FILTER html %]
- Resolution:  - [% resolution_descs.${bug.resolution} FILTER html %] - - Assigned To:  - [% bug.assigned_to.login FILTER html %] - - Reported By:  - [% bug.reporter.login FILTER html %] - - QA Contact:  - [% bug.qa_contact.login FILTER html %] -
- Component:  - [% bug.component FILTER html %] + [% field_descs.bug_severity FILTER html %]: + [% bug.bug_severity FILTER html %] - [% IF Param('usetargetmilestone') %] - Target Milestone:  - [% bug.target_milestone FILTER html %] - [% END %] -
- URL:  - [% IF bug.bug_file_loc - AND NOT bug.bug_file_loc.match("^(javascript|data)") %] - - [% bug.bug_file_loc FILTER html %] - [% ELSE %] - [% bug.bug_file_loc FILTER html %] - [% END %] + [% PROCESS rightcell %]
- Summary: [% bug.short_desc FILTER html %] + [% field_descs.priority FILTER html %]: + [% bug.priority FILTER html %]
- Keywords:  [% bug.keywords FILTER html %] + [% field_descs.bug_file_loc FILTER html %]: + [% IF bug.bug_file_loc.match("^(javascript|data)") %] + [% bug.bug_file_loc FILTER html %] + [% ELSE %] + + [% bug.bug_file_loc FILTER html %] + [% END %]
- Status Whiteboard:  - [% bug.status_whiteboard FILTER html %] + Time tracking: + + + + + + + + + + + + + + + + + +
[% field_descs.estimated_time FILTER html %][% field_descs.actual_time FILTER html %][% field_descs.work_time FILTER html %][% field_descs.remaining_time FILTER html %][% field_descs.percentage_complete FILTER html %]Gain
+ [% PROCESS formattimeunit time_unit = bug.estimated_time %] + + [% PROCESS formattimeunit + time_unit=(bug.remaining_time + bug.actual_time) %] + [% PROCESS formattimeunit time_unit = bug.actual_time %] + [% PROCESS formattimeunit time_unit = bug.remaining_time %] + + [% PROCESS calculatepercentage act = bug.actual_time + rem = bug.remaining_time %] + + [% PROCESS formattimeunit + time_unit=bug.estimated_time - + (bug.actual_time + bug.remaining_time) %] +
- Orig. Est.:  - [% PROCESS formattimeunit time_unit=bug.estimated_time %] -   - Current Est.:  - [% PROCESS formattimeunit - time_unit=(bug.remaining_time + bug.actual_time) %] -   - Hours Worked:  - [% PROCESS formattimeunit time_unit=bug.actual_time %]  - Hours Left:  - [% PROCESS formattimeunit time_unit=bug.remaining_time %] -   - Percentage Complete:  - [% PROCESS calculatepercentage act=bug.actual_time - rem=bug.remaining_time %]  - Gain  - [% PROCESS formattimeunit - time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] -   - Deadline:  - [% bug.deadline %] + Attachments: + [% IF bug.show_attachment_flags %] + + + + + + [% FOREACH attachment = bug.attachments %] + + + + + [% END %] +
DescriptionFlags
+ + [% attachment.description FILTER html %] + [% "
" IF not loop.last() %] + 		+ [% IF attachment.flags.size == 0 %] + none + [% ELSE %] + [% FOREACH flag = attachment.flags %] + [% flag.setter.nick FILTER html %]: + [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [% IF flag.status == "?" && flag.requestee %] + ([% flag.requestee.nick FILTER html %]) + [% END %][% ", " IF not loop.last() %] + [% END %] + [% END %] +
+ [% ELSE %] + [% FOREACH attachment = bug.attachments %] + + [% attachment.description FILTER html %] + [% "
" IF not loop.last() %] + [% END %] + [% END %]
- Opened:  - [% bug.creation_ts FILTER time %] -
+ +
+ [% PROCESS bug/comments.html.tmpl comments = bug.longdescs %] @@ -202,12 +250,72 @@ [%###########################################################################%] -[%# Block for standard table cells #%] +[%# Block for standard table rows #%] [%###########################################################################%] -[% BLOCK cell %] - - [% attr.description FILTER html %]:  - [% bug.${attr.name} FILTER html %] - +[% BLOCK row %] + + [% field_descs.${cell} FILTER html %]: + [% bug.${cell} FILTER html %] + [% PROCESS rightcell IF !fullrow %] + + [% fullrow = 0 %] +[% END %] + + +[%############################################################################%] +[%# Block for dependencies #%] +[%############################################################################%] + +[% BLOCK dependencies %] + + [% terms.Bug %] [%+ field_descs.${name} FILTER html %]: + + [% FOREACH depbug = bug.${name} %] + [% depbug FILTER bug_link(depbug) %][% ", " IF not loop.last() %] + [% END %] + + + [% PROCESS rightcell %] + +[% END %] + +[%############################################################################%] +[%# Block for cells shown right of the table #%] +[%############################################################################%] + +[% BLOCK rightcell %] + [% IF rightcells %] + [% name = rightcells.shift %] + [% IF name == "cc" %] + [% field_descs.cc FILTER html %]: + + [% FOREACH c = bug.cc %] + [% c FILTER html %][% ", " IF not loop.last() %] + [% END %] + [% ELSIF name == "reporter" || name == "assigned_to" + || name == "qa_contact" %] + [% field_descs.${name} FILTER html %]: + [% bug.${name}.identity FILTER html %] + [% ELSIF name == "flags" %] + Flags: + + [% FOREACH type = bug.flag_types %] + [% FOREACH flag = type.flags %] + [% flag.setter.nick FILTER html %]: + [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [%+ IF flag.status == "?" && flag.requestee %] + ([% flag.requestee.nick FILTER html %]) + [% END %]
+ [% END %] + [% END %] + + [% ELSIF name != "" %] + [% field_descs.${name} FILTER html %]: + [% bug.${name} FILTER html %] + [% ELSE %] +   +   + [% END %] + [% END %] [% END %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index cc4503bb7..57a323e7f 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -354,7 +354,9 @@ 'bug/show-multiple.html.tmpl' => [ 'bug.bug_id', - 'bug.deadline', + 'depbug FILTER bug_link(depbug)', + 'attachment.id', + 'flag.status', ], 'bug/show.html.tmpl' => [ -- cgit v1.2.3-24-g4f1b