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.2.2.1
--- 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	5 Mar 2003 18:13:52 -0000	1.2.2.1
@@ -1,63 +1,60 @@
 <master src="../lib/master">
 <property name="title">@project_name@</property>
 <property name="context_bar">@context_bar@</property>
-<property name="notification_link">@notification_link@</property>
 
 <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>
-      </multiple>
-    </td>
-    <td width="25">&nbsp;</td>
-    <td valign="top">
-      <table border=0 width="100%" cellspacing="0" cellpadding="0" bgcolor="white">
-        <tr>
-          <td colspan="2">
-            <table width="100%" style="border: solid 1px gray;" bgcolor="#ccccff" cellspacing="0" cellpadding="4" border="0">
+        <if @stats.header@ not nil>
+          <p class="bt_summary_section">@stats.header@</p>
+        </if>
+        <group column="header">
+          <p style="margin-top: 0px; margin-bottom: 12px;">
+            <table border="0" cellspacing="0" cellpadding="2" width="100%">
               <tr>
-                <td>
-                  <b>Showing:</b> @human_readable_filter@
-                  (<if @bugs:rowcount@ eq 0><i>none</i></if><if @bugs:rowcount@ eq 1>1 bug</if><if @bugs:rowcount@ gt 1>@bugs:rowcount@ bugs</if>)
-                  <if @clear_url@ not nil>(<a href="@clear_url@">clear filters</a>)</if>
+                <td colspan="2" class="bt_summary_header">
+                 @stats.stat_name@
                 </td>
               </tr>
+              <group column="stat_name">
+                <if @stats.selected_p@ true>
+                  <tr bgcolor="#eeeeff">
+                </if>
+                <else>
+                  <tr>
+                </else>
+                  <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>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2" height="8">
-            <table cellspacing="0" cellpadding="0" border="0"><tr><td height="8"></td></tr></table>
-          </td>
-        </tr>
-        <form action="." method="get" name="displaymode_form">
-          @displaymode_form_export_vars@
-          <tr>
-            <td colspan="2" align="right">
+          </p>
+        </group>
+      </multiple>
+
+    </td>
+    <td width="25">&nbsp;</td>
+    <td valign="top">
+
+      <div  style="border: solid 1px gray; background-color: #ccccff; padding: 4px;">
+        <b>Showing:</b> @human_readable_filter@
+        (<if @bugs:rowcount@ eq 0><i>none</i></if><if @bugs:rowcount@ eq 1>1 bug</if><if @bugs:rowcount@ gt 1>@bugs_count@ <if @bugs_count@ eq 1>@pretty_names.bug@</if><else>@pretty_names.bugs@</else></if>)
+        <if @clear_url@ not nil>(<a href="@clear_url@">show default listing</a>)</if>
+      </div>
+
+      <form action="." method="get" name="displaymode_form">
+        @displaymode_form_export_vars@
+
+        <div style="background-color: #eeeeff; padding: 4px; margin-top: 8px; margin-bottom: 16px; border: solid 1px #cccccc;">
+
+         <div style="float: right; margin-left: 16px;">
+
               Order by:
               <select name="filter.orderby" onchange="document.displaymode_form.submit();">
                 <multiple name="orderby">
@@ -70,67 +67,71 @@
                 </multiple>
               </select>
               <input type="submit" value="Go">
-            </td>
-          </tr>
-        </form>
-        <tr>
-          <td colspan="2" height="16">
-            <table cellspacing="0" cellpadding="0" border="0"><tr><td height="16"></td></tr></table>
-          </td>
-        </tr>
+           </div>
 
+          <span style="align: left;">
+              Opened in the last: [ 
+              <multiple name="options_n_days">
+                <if @options_n_days.rownum@ ne 1> | </if>
+                <if @options_n_days.selected_p@ true><b>@options_n_days.label@</b></if>
+                <else><a href="@options_n_days.url@">@options_n_days.label@</a></else>
+              </multiple>
+              ] days
+         </span>
+
+
+      </div>
+
+      </form>
+
         <multiple name="bugs">
-          <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 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">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@
-                <br>
-                <font color="#6f6f6f">Assigned to:</font>
-                <if @bugs.assignee_user_id@ not nil>
-                  <a href="@bugs.assignee_url@" title="Eamil: @bugs.assignee_email@">@bugs.assignee_first_names@ @bugs.assignee_last_name@</a>
+          <p class="bt">
+
+            <span style="font-size: 115%;">
+              <span class="bt_douce">#</span>@bugs.bug_number@<span class="bt_douce">. </span>
+              <a href="@bugs.bug_url@" title="View bug details">@bugs.summary@</a><br>
+            </span>
+
+            <if @bugs.comment_short@ not nil>@bugs.comment_short@<br></if>
+            <span class="bt_douce">@pretty_names.Component@:</span> @bugs.component_name@ 
+            <span class="bt_douce">- Opened</span> @bugs.creation_date_pretty@
+              <span class="bt_douce">By</span> <a href="@bugs.submitter_url@" title="Email: @bugs.submitter_email@">@bugs.submitter_first_names@ @bugs.submitter_last_name@</a><br>
+            <if @bugs.category_name@ not nil>
+              <group column="bug_id">
+                <span class="bt_douce">@bugs.category_name@:</span> @bugs.category_value@
+                <if @bugs.groupnum_last_p@ false> - </if>
+              </group>
+              <br>
+            </if>
+            <span class="bt_douce">Assigned to:</span>
+            <if @bugs.assignee_party_id@ not nil>
+              <a href="@bugs.assignee_url@" title="Email: @bugs.assignee_email@">@bugs.assignee_name@</a>
+            </if>
+            <else>
+              <i>Unassigned</i>
+            </else>
+            <br>
+
+            <span class="bt_douce">Status:</span>
+            <span style="color: #008000;"><b>@bugs.pretty_state@</b>
+              <if @bugs.fix_for_version@ not nil>
+                (fix for version @bugs.fix_for_version_name@)
+              </if>
+              <else>
+                <if @bugs.resolution@ not nil> - @bugs.resolution_pretty@</if>
+                <if @bugs.fixed_in_version@ not nil>
+                  in version @bugs.fixed_in_version_name@
                 </if>
-                <else>
-                  <i>Unassigned</i>
-                </else>
-                <br>
-                <font color="#6f6f6f">Status:</font>
-                <font color="#008000"><b>@bugs.status_pretty@</b>
-                <if @bugs.status@ eq "open">
-                  <if @bugs.fix_for_version@ not nil>
-                    (fix for version @bugs.fix_for_version_name@)
-                  </if>
-                </if>
-                <else>
-                  <if @bugs.resolution@ not nil> - @bugs.resolution_pretty@</if>
-                  <if @bugs.fixed_in_version@ not nil>
-                    in version @bugs.fixed_in_version_name@
-                  </if>
-                </else>
-                <if @bugs.latest_estimate_minutes@ not nil>
-                  <b>Est: @bugs.latest_estimate_minutes@</b></font></font>
-                </if>
-              </font>
-              <p>
-            </td>
-          </tr>
+              </else>
+            </span>
+
+          </p>
         </multiple>
         <if @bugs:rowcount@ eq 0>
-          <tr>
-            <td colspan="2">
               <p>&nbsp;<p>
-              <i>No bugs match these criteria.</i>
-            </td>
-          </tr>
+              <i>No @pretty_names.bugs@ match these criteria.</i>
         </if>
-      </table>
+
     </td>
   </tr>
 </table>