Index: openacs-4/packages/calendar/www/view-list-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/calendar/www/view-list-display.adp	15 Dec 2006 22:45:20 -0000	1.11
+++ openacs-4/packages/calendar/www/view-list-display.adp	9 Feb 2007 16:07:38 -0000	1.11.2.1
@@ -1,68 +1,71 @@
- <table class="cal-table-display" cellpadding="0" cellspacing="0" border="0" width="99%">
+<table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
+<tr><td align="right">
+<form name="frmdays">
+<a href="@self_url@?period_days=1&@url_vars@#calendar">1</a>
+<a href="@self_url@?period_days=7&@url_vars@#calendar">7</a>
+<a href="@self_url@?period_days=14&@url_vars@#calendar">14</a>
+<a href="@self_url@?period_days=21&@url_vars@#calendar">21</a>
+<a href="@self_url@?period_days=30&@url_vars@#calendar">30</a>
+<a href="@self_url@?period_days=60&@url_vars@#calendar">60</a>
+<input type="text" class="cal-input-field" id="period_days" name="period_days" value="100" size="3" maxlength="3">
+days
+@form_vars;noquote@
+</form>
+</td></tr>
 <tr>
-<td>
-          <form name="frmdays" class="cal-frm-compact">
-            <table width="100%" cellspacing="0" cellpadding="0" border="0">
-              <tbody><tr valign="middle">
-                <td align="left">
-                  <h5>@title@</h5>
-                </td>
-                <td align="right">
-                  #calendar.Events_over_a#
-                  <input type="text" class="cal-field" id="period_days" name="period_days" value="@period_days@" size="3" maxlength="3">
-                  #calendar.day_rolling_period#
-                  <input class="cal-button-sml" type="submit" value="#acs-kernel.common_go#">
-                  @form_vars;noquote@
-                </td>
-              </tr>
-            </tbody></table>
-          </form>
+	<td align="center">
+		<h1>@start_month@ @start_day@ @start_year@ &ndash; @end_month@ @end_day@ @end_year@</h1>
+	</td>
+</tr>
 
-
 <if @items:rowcount@ gt 0>
         
-<table class="cal-table-display" border=0 cellspacing=0 cellpadding=2>
-  <tr class="cal-table-header">
-  <th align=left>#acs-datetime.Day_of_Week#</th>
-  <th align="center"><a href="@start_date_url@" title="#calendar.sort_by_date#">#calendar.Date_1#</a></th>
-  <th align="center">#calendar.Start_Time#</th>
-  <th align="center">#calendar.End_Time#</th>
-  <th align="center"><a href="@item_type_url@" title="#calendar.sort_by_type#">#calendar.Type_1#</a></th>
-  <th align=left>#calendar.Title_1#</th></tr>
+<tr>
+    <td>
 
   <multiple name="items">
 
-  <group column="weekday">
+        <div class="list-entry-item @items.container_style_class@">
 
-  <if @items.flip@ odd>
-    <tr class="cal-row-dark">
-  </if>
-  <else>
-    <tr class="cal-row-light">
-  </else>  
+		<table class="cal-table-list" cellpadding="0" cellspacing="0" border="0" width="100%">
+		<thead>
+		<tr>
+			<td>
+			@items.weekday@, @items.start_date@ &nbsp;&nbsp;&nbsp; <if @items.start_time@ ne @items.end_time@>@items.start_time@ &ndash; @items.end_time@</if>
+			</td>
+		</tr>
+		</thead>
+		<tbody>
+		<tr>
+			<td class="@items.name_style_class@">
+			<strong>Event: </strong><a href="@items.event_url@">@items.event_name@</a>
+            <if @show_calendar_name_p@>
+            (@items.calendar_name@)
+            </if>
 
-  <td class="@items.today@" align=left>@items.weekday@</td>
-  <td class="@items.today@" align="center">@items.start_date@</td>
-  <td class="@items.today@" align="center">@items.start_time@</td>
-  <td class="@items.today@" align="center">@items.end_time@</td>
-  <td class="@items.today@" align="center">@items.item_type@</td>
-  <td class="@items.today@"
-  align=left><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="@items.description_style_class@">
+			<strong>Description: </strong>
+            <if @items.description@ eq ""><em>none</em></if><else>@items.description@</else>
 
-  <if @show_calendar_name_p@>
-  (@items.calendar_name@)
-  </if>
-  </td>
+			<a href="@items.event_url@&export=print" onclick="return calOpenPrintView('@items.event_url@&export=print');"><img src="/resources/calendar/images/print-list-icon.gif" align="right" border="0"></a>
+			</td>
+		</tr>
+		</tbody>
+		</table>
 
-  </tr>
+        </div>
 
-  </group>
   </multiple>
-</table>
+
+    </td>
+</tr>
+
 </if>
 <else>
-<i>#calendar.No_Items#</i>
+<tr><td><i>#calendar.No_Items#</i></td></tr>
 </else>
-</td>
-</tr>
+
 </table>