Index: openacs-4/packages/bug-tracker/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/index.adp	11 Sep 2002 14:03:25 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/index.adp	2 Jan 2003 17:21:49 -0000	1.3
@@ -6,31 +6,32 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
     <td valign="top" width="200" style="border: solid 1px gray;" bgcolor="#ccccff" class="bt_summary_bold">
-      <div style="padding: 4px;">
-        <multiple name="by_status">
-          @by_status.num_bugs@ <a href="@by_status.name_url@">@by_status.name@</a><br>
-        </multiple>
-        <p>Open bugs summary:</p>
-      </div>
+
       <multiple name="stats">
-        <table border="0" width="100%">
-          <tr>
-            <td colspan="2" class="bt_summary_bold">
-              @stats.stat_name@
-            </td>
-          </tr>
-          <group column="stat_name">
-            <tr>
-              <td width="75%" class="bt_summary">
-                <a href="@stats.name_url@">@stats.name@</a>
-              </td>
-              <td align="right" class="bt_summary">
-                @stats.num_bugs@
-              </td>
-            </tr>
-          </group>
-        </table>
-        <p>
+        <if @stats.header@ not nil>
+          <p style="padding-left: 4px; background-color: #eeeeff; padding-top: 4px; padding-bottom: 4px; margin-top: 0px; margin-bottom: 8px; ">@stats.header@</p>
+        </if>
+        <group column="header">
+          <p style="margin-top: 0px; margin-bottom: 12px;">
+            <table border="0" width="100%">
+              <tr>
+                <td colspan="2" class="bt_summary_bold">
+                  @stats.stat_name@
+                </td>
+              </tr>
+              <group column="stat_name">
+                <tr>
+                  <td width="75%" class="bt_summary">
+                    <a href="@stats.name_url@">@stats.name@</a>
+                  </td>
+                  <td align="right" class="bt_summary">
+                    @stats.num_bugs@
+                  </td>
+                </tr>
+              </group>
+            </table>
+          </p>
+        </group>
       </multiple>
     </td>
     <td width="25">&nbsp;</td>
@@ -83,15 +84,15 @@
           <tr>
             <td valign=top>
               <font face="tahoma,verdana,arial,helvetica,sans-serif">
-              <a href="@bugs.bug_url@" title="View bug details">#@bugs.bug_number@. @bugs.summary@</a><br>
+              <font color="#6f6f6f">#</font>@bugs.bug_number@<font color="#6f6f6f">. </font><a href="@bugs.bug_url@" title="View bug details">@bugs.summary@</a><br>
               <font size="-1">
                 <if @bugs.description_short@ not nil><font size="-1">@bugs.description_short@<br></if>
                 <font color="#6f6f6f">Component:</font> @bugs.component_name@ 
-                - <font color="#6f6f6f">Opened</font> @bugs.creation_date_pretty@
+                <font color="#6f6f6f">- Opened</font> @bugs.creation_date_pretty@
                   <font color="#6f6f6f">By</font> <a href="@bugs.submitter_url@" title="Email: @bugs.submitter_email@">@bugs.submitter_first_names@ @bugs.submitter_last_name@</a><br>
                 <font color="#6f6f6f">Priority:</font> @bugs.priority_pretty@ 
-                - <font color="#6f6f6f">Severity:</font> @bugs.severity_pretty@
-                - <font color="#6f6f6f">Type:</font> @bugs.bug_type_pretty@
+                <font color="#6f6f6f">- Severity:</font> @bugs.severity_pretty@
+                <font color="#6f6f6f">- Type:</font> @bugs.bug_type_pretty@
                 <br>
                 <font color="#6f6f6f">Assigned to:</font>
                 <if @bugs.assignee_user_id@ not nil>
Index: openacs-4/packages/bug-tracker/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/bug-tracker/www/index.tcl	9 Dec 2002 21:24:22 -0000	1.12
+++ openacs-4/packages/bug-tracker/www/index.tcl	2 Jan 2003 17:21:49 -0000	1.13
@@ -170,19 +170,21 @@
 # Get stats
 #
 
-db_multirow -extend { name name_url } by_status by_status {
+db_multirow -extend { name name_url stat_name header } stats by_status {
     select b.status as unique_id,
            count(b.bug_id) as num_bugs
     from   bt_bugs b
     where  b.project_id = :package_id
     group  by unique_id
     order  by bt_bug__status_sort_order(b.status)
 } {
-    set name "[bug_tracker::status_pretty $unique_id] Bugs"
+    set header "All bugs by status:"
+    set stat_name "Status"
+    set name "[bug_tracker::status_pretty $unique_id]"
     set name_url "?[export_vars { { filter.status $unique_id } }]"
 }
 
-db_multirow -extend { name name_url stat_name } stats stats_by_bug_type {
+db_multirow -extend { name name_url stat_name header } -append stats stats_by_bug_type {
     select b.bug_type as unique_id,
            count(b.bug_id) as num_bugs
     from   bt_bugs b
@@ -191,12 +193,13 @@
     group  by unique_id
     order  by bt_bug__bug_type_sort_order(b.bug_type) 
 } {
+    set header "Open bugs summary:"
     set stat_name "Type of bug"
     set name [bug_tracker::bug_type_pretty $unique_id]
     set name_url "?[export_vars { { filter.bug_type $unique_id } }]"
 }
 
-db_multirow -extend { name_url stat_name } -append stats stats_by_fix_for_version {
+db_multirow -extend { name_url stat_name header } -append stats stats_by_fix_for_version {
     select b.fix_for_version as unique_id,
            v.version_name as name,
            count(b.bug_id) as num_bugs
@@ -207,6 +210,7 @@
     group  by unique_id, v.anticipated_freeze_date, name
     order  by v.anticipated_freeze_date, name
 } {
+    set header "Open bugs summary:"
     set stat_name "Fix For"
     if { [empty_string_p $unique_id] } {
         set name "<i>Undecided</i>"
@@ -216,7 +220,7 @@
 
 set stat_name_val "Severity"
 
-db_multirow -extend { name_url stat_name } -append stats stats_by_severity {
+db_multirow -extend { name_url stat_name header } -append stats stats_by_severity {
     select b.severity as unique_id,
            p.sort_order || ' - ' || p.severity_name as name,
            count(b.bug_id) as num_bugs
@@ -227,13 +231,14 @@
     group  by unique_id, name
     order  by name
 } {
+    set header "Open bugs summary:"
     set stat_name $stat_name_val
     set name_url "?[export_vars { { filter.severity $unique_id } }]"
 }
 
 set stat_name_val "Priority"
 
-db_multirow -extend { name_url stat_name } -append stats stats_by_priority {
+db_multirow -extend { name_url stat_name header } -append stats stats_by_priority {
     select b.priority as unique_id,
            p.sort_order || ' - ' || p.priority_name as name,
            count(b.bug_id) as num_bugs
@@ -244,11 +249,12 @@
     group  by unique_id, name
     order  by name
 } {
+    set header "Open bugs summary:"
     set stat_name $stat_name_val
     set name_url "?[export_vars { { filter.priority $unique_id } }]"
 }
 
-db_multirow -extend { name_url stat_name } -append stats stats_by_assignee {
+db_multirow -extend { name_url stat_name header } -append stats stats_by_assignee {
     select b.assignee as unique_id,
            assignee.first_names || ' ' || assignee.last_name as name,
            count(b.bug_id) as num_bugs
@@ -259,14 +265,15 @@
     group  by unique_id, name
     order  by name
 } {
+    set header "Open bugs summary:"
     set stat_name "Assigned To"
     if { [empty_string_p $unique_id] } {
         set name "<i>Unassigned</i>"
     }
     set name_url "?[export_vars -url { { filter.assignee $unique_id } }]"
 }
 
-db_multirow -extend { name_url stat_name } -append stats stats_by_actionby {
+db_multirow -extend { name_url stat_name header } -append stats stats_by_actionby {
     select o.creation_user as unique_id,
            submitter.first_names || ' ' || submitter.last_name as name,
            count(b.bug_id) as num_bugs
@@ -278,11 +285,12 @@
     group  by unique_id, name
     order  by name
 } {
+    set header "Open bugs summary:"
     set stat_name "To Be Verified By"
     set name_url "?[export_vars -url { { filter.status resolved } { filter.actionby $unique_id } }]"
 }
 
-db_multirow -extend { name_url stat_name } -append stats stats_by_component {
+db_multirow -extend { name_url stat_name header } -append stats stats_by_component {
     select coalesce('com/'||c.url_name||'/', trim(to_char(c.component_id,'99999999'))) as unique_id,
            c.component_name as name,
            count(b.bug_id) as num_bugs
@@ -293,6 +301,7 @@
     group  by unique_id, name
     order  by name
 } {
+    set header "Open bugs summary:"
     set stat_name "Components"
     if { [string match "com/*" $unique_id] } {
         set name_url "[ad_conn package_url]$unique_id"