From 635c234550550644f8cec49ed00588394a3bf924 Mon Sep 17 00:00:00 2001
From: Robert Haas <robertmhaas@gmail.com>
Date: Fri, 3 Jul 2009 00:26:06 -0400
Subject: [PATCH] Display topics on separate header lines, rather than as a
 table column.

---
 html/layout/css/blue/commitfest.css | 4 ++--
 perl-lib/PgCommitFest/CommitFest.pm | 9 +++++++++
 template/commitfest_view.tt2        | 7 +++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/html/layout/css/blue/commitfest.css b/html/layout/css/blue/commitfest.css
index e23729e..02543a8 100644
--- a/html/layout/css/blue/commitfest.css
+++ b/html/layout/css/blue/commitfest.css
@@ -87,8 +87,8 @@ h2 {
 }
 
 h3 { 
-  font-weight: bold; 
-  color: #666; 
+  font-weight: normal; 
+  color: #EC5800; 
   font-size: 1.1em;
 }
 
diff --git a/perl-lib/PgCommitFest/CommitFest.pm b/perl-lib/PgCommitFest/CommitFest.pm
index b553905..de19005 100644
--- a/perl-lib/PgCommitFest/CommitFest.pm
+++ b/perl-lib/PgCommitFest/CommitFest.pm
@@ -97,6 +97,7 @@ EOM
 		$d->{'commitfest_status'});
 
 	# Load list of patches.
+	my $previous_topic;
 	my %patch_grouping;
 	my %patch_index;
 	my $patch_list = $r->db->select(<<EOM, $d->{'id'});
@@ -110,6 +111,14 @@ EOM
 			push @{$patch_grouping{$p->{'patch_status_id'}}}, $p;
 		}
 		else {
+			if (!defined $previous_topic
+				|| $previous_topic ne $p->{'commitfest_topic'}) {
+				push @{$patch_grouping{'p'}}, {
+					'topic_header' => 1,
+					'commitfest_topic' => $p->{'commitfest_topic'}
+				};
+				$previous_topic = $p->{'commitfest_topic'};
+			}
 			push @{$patch_grouping{'p'}}, $p;
 		}
 		$patch_index{$p->{'id'}} = $p;
diff --git a/template/commitfest_view.tt2 b/template/commitfest_view.tt2
index 051838c..1b8d2cd 100644
--- a/template/commitfest_view.tt2
+++ b/template/commitfest_view.tt2
@@ -10,7 +10,6 @@ changes, click on the patch name.</p>
 <table cellspacing='0' class='tblBasicGrey' style='width: 100%'>
 <tr class='firstrow'>
   <th class='colFirst' style='width: 60%'>Patch Name</th>
-  <th>Topic</th>
   <th>Status</th>
   <th>Author</th>
   <th>Reviewers</th>
@@ -18,6 +17,10 @@ changes, click on the patch name.</p>
 </tr>
 [% FOREACH p = g.patch_list %]
 <tr[% IF loop.last %] class='lastrow'[% END %]>
+[% IF p.topic_header %]
+  <td class='colFirstT' colspan='5'><h3 style='margin: 0px'>[% p.commitfest_topic | htmlsafe %]</h3></td>
+  <td class='colLast'>&nbsp;</td>
+[% ELSE %]
   <td class='colFirstT'><a href='/action/patch_view?id=[% p.id %]'>[% p.name | htmlsafe %]</a>
   <div style='padding-left: 10px'>
     [% FOREACH c = p.comment_list %]
@@ -25,11 +28,11 @@ changes, click on the patch name.</p>
     [% END %]
   </div>
   </td>
-  <td class='colMidT'>[% p.commitfest_topic | htmlsafe %]</td>
   <td class='colMidT'>[% p.patch_status | htmlsafe %]</td>
   <td class='colMidT'>[% p.author | htmlsafe %]</a></td>
   <td class='colMidT'>[% IF p.reviewers != '' %][% p.reviewers %][% ELSE %]<span class='controlerror'>Nobody</span>[% END %]</a></td>
   <td class='colLastT'>[% IF g.closed %][% IF p.date_closed.defined %][% p.date_closed %][% ELSE %](None)[% END %][% ELSE %][% IF p.comment_list.defined && p.comment_list.-1.defined %][% p.comment_list.-1.creation_time %][% ELSE %](None)[% END %][% END %]</a></td>
+[% END %]
 </tr>
 [% END %]
 </table>
-- 
2.39.5