Index: openacs-4/packages/calendar/www/view-week-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/calendar/www/view-week-display.adp	7 May 2008 23:03:14 -0000	1.18.2.1
+++ openacs-4/packages/calendar/www/view-week-display.adp	23 May 2008 16:25:48 -0000	1.18.2.2
@@ -1,88 +1,55 @@
-<table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
-<tr>
-	<td>
-		<table width="@week_width@@width_units@">
-			<tr>
-				<td align="center">
-          <h1 class="calendar-back-forward">
-		  <a href="@previous_week_url@" title="#calendar.prev_week#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_week#"></a>
-                &nbsp;#calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ &ndash; @week_end_month@ @week_end_day@ @week_end_year@&nbsp;
-		  <a href="@next_week_url@" title="#calendar.next_week#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_week#"></a>
-          </h1>
-              </td>
-          </tr>
-        </table>
-	</td>
-</tr>
-<tr>
-	<td>
-		<table cellpadding="0" cellspacing="0" border="0" class="cal-week-day-title">
+  <table id="cal-table-week" cellpadding="0" cellspacing="1" border="0" width="@week_width@@width_units@">
+    <caption>
+      <a href="@previous_week_url@" title="#calendar.prev_week#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_week#"></a>
+      &nbsp;#calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ &ndash; @week_end_month@ @week_end_day@ @week_end_year@&nbsp;
+      <a href="@next_week_url@" title="#calendar.next_week#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_week#"></a>
+    </caption>
+
+    <thead>
+      <tr>
+        <th id="hours">#calendar.Hours#</th>
+        <multiple name="days_of_week">
+          <th id="@days_of_week.day_short@" style="width:@days_of_week.width@@width_units@">
+            <a href="@days_of_week.weekday_url@" title="#calendar.goto_weekday#">@days_of_week.day_short@ @days_of_week.monthday@</a>
+          </th>
+        </multiple>
+      </tr>
+    </thead>
+
+    <tbody>
+      <tr>
+        <td headers="hours" style="vertical-align: top; width:@time_of_day_width@@width_units@"><div class="day-time-1"><p>@grid_first_hour@</p></div></td>
+        <td style="vertical-align: top; width:@day_width_0@@width_units@" class="week-event-1">
+          <div class="week-entry-box">
+            <multiple name="items">
+              <div class="week-entry-item @items.style_class@" style="position: absolute; top:@items.top@@hour_height_units@; left: @items.left@@width_units@; height:@items.height@@hour_height_units@;">
+                <p><if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt="" /></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a></p>
+              </div>
+            </multiple>
+          </div>
+        </td>
+        <td class="week-event-1" style="width:@day_width_1@@width_units@">&nbsp;</td>
+        <td class="week-event-1" style="width:@day_width_2@@width_units@">&nbsp;</td>
+        <td class="week-event-1" style="width:@day_width_3@@width_units@">&nbsp;</td>
+        <td class="week-event-1" style="width:@day_width_4@@width_units@">&nbsp;</td>
+        <td class="week-event-1" style="width:@day_width_5@@width_units@">&nbsp;</td>
+        <td class="week-event-1" style="width:@day_width_6@@width_units@">&nbsp;</td>
+      </tr>
+      <multiple name="grid">
 		<tr>
-			<td><p style="width:@time_of_day_width@@width_units@;margin:0px;">&nbsp;</p></td>
-            <multiple name="days_of_week"><td style="width:@days_of_week.width@@width_units@"><a href="@days_of_week.weekday_url@" title="#calendar.goto_weekday#">@days_of_week.day_short@ @days_of_week.monthday@</a></td></multiple>
+          <if @grid.rownum@ odd>
+			<td headers="hours"><div class="day-time-2"><p>@grid.hour@</p></div></td>
+            <multiple name="days_of_week">
+              <td headers="@days_of_week.day_short@" class="week-event-2"></td>
+            </multiple>
+          </if>
+          <else>
+			<td headers="hours"><div class="day-time-1"><p>@grid.hour@</p></div></td>
+            <multiple name="days_of_week">
+              <td headers="@days_of_week.day_short@" class="week-event-1"></td>
+            </multiple>
+          </else>
 		</tr>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td>
-		<table id="cal-table-week" cellpadding="0" cellspacing="1" border="0" width="@week_width@@width_units@">
-		<tr>
-			<td style="vertical-align: top; width:@time_of_day_width@@width_units@"><div class="day-time-1"><p>@grid_first_hour@</p></div></td>
-			<td style="vertical-align: top; width:@day_width_0@@width_units@" class="week-event-1">
-              <div class="week-entry-box">
-                <multiple name="items">
-				  <div class="week-entry-item @items.style_class@" style="position: absolute; top:@items.top@@hour_height_units@; left: @items.left@@width_units@; height:@items.height@@hour_height_units@;">
-					<p><if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt="" /></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a></p>
-				  </div>
-                </multiple>
-			  </div>
-            </td>
-			<td class="week-event-1" style="width:@day_width_1@@width_units@">&nbsp;</td>
-			<td class="week-event-1" style="width:@day_width_2@@width_units@">&nbsp;</td>
-			<td class="week-event-1" style="width:@day_width_3@@width_units@">&nbsp;</td>
-			<td class="week-event-1" style="width:@day_width_4@@width_units@">&nbsp;</td>
-			<td class="week-event-1" style="width:@day_width_5@@width_units@">&nbsp;</td>
-			<td class="week-event-1" style="width:@day_width_6@@width_units@">&nbsp;</td>
-		</tr>
-        <multiple name="grid">
-		<tr>
-            <if @grid.rownum@ odd>
-			<td><div class="day-time-2"><p>@grid.hour@</p></div></td>
-			<td class="week-event-2"></td>
-			<td class="week-event-2"></td>
-			<td class="week-event-2"></td>
-			<td class="week-event-2"></td>
-			<td class="week-event-2"></td>
-			<td class="week-event-2"></td>
-			<td class="week-event-2"></td>
-            </if><else>
-			<td><div class="day-time-1"><p>@grid.hour@</p></div></td>
-			<td class="week-event-1"></td>
-			<td class="week-event-1"></td>
-			<td class="week-event-1"></td>
-			<td class="week-event-1"></td>
-			<td class="week-event-1"></td>
-			<td class="week-event-1"></td>
-			<td class="week-event-1"></td>
-            </else>
-		</tr>
-        </multiple>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td>
-		<table width="@week_width@@width_units@">
-			<tr>
-				<td>
-					<div class="calendar-back-forward"><a href="@previous_week_url@" title="#calendar.prev_week#"><img src="/resources/calendar/images/left.gif" alt="#acs-kernel.common_Go#" > &nbsp; #calendar.prev_week#</a></div>
-				</td>
-				<td align="right">
-					<div class="calendar-back-forward"><a href="@next_week_url@" title="#calendar.next_week#">#calendar.next_week# &nbsp; <img src="/resources/calendar/images/right.gif" alt="#acs-kernel.common_Go#" ></a></div>
-				</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-</table>
+      </multiple>
+    </tbody>
+  </table>
Index: openacs-4/packages/calendar/www/resources/calendar-hc.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar-hc.css,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/calendar/www/resources/calendar-hc.css	23 May 2008 11:40:37 -0000	1.1.2.3
+++ openacs-4/packages/calendar/www/resources/calendar-hc.css	23 May 2008 16:25:49 -0000	1.1.2.4
@@ -93,6 +93,10 @@
 #cal-table-day th, #cal-table-week th {
     background-color: #ffffff;
     color: #000000;
+} 
+
+#cal-table-day th a, #cal-table-week th a {
+    color: #000000;
 }
 
 .day-time-1 {
@@ -166,3 +170,10 @@
 .topnavbar .active { 
 	background:#222222; 
 }
+
+.calendar-Item {
+	background-color:#FFFFFF;
+	border: 1px solid #555555;
+	-moz-opacity:1; 
+	filter:alpha(opacity=100);
+}
Index: openacs-4/packages/calendar/www/resources/calendar.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v
diff -u -r1.12.2.3 -r1.12.2.4
--- openacs-4/packages/calendar/www/resources/calendar.css	23 May 2008 11:40:37 -0000	1.12.2.3
+++ openacs-4/packages/calendar/www/resources/calendar.css	23 May 2008 16:25:49 -0000	1.12.2.4
@@ -179,6 +179,11 @@
     margin: 1em;
 }
 
+#cal-table-day caption img, #cal-table-week caption img {
+    border: 0;
+    vertical-align: middle;
+}
+
 #cal-table-day th, #cal-table-week th {
     background-color: #ffffff;
 }