Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v
diff -u -N -r1.30 -r1.30.2.1
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	10 Dec 2007 09:12:28 -0000	1.30
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	23 May 2008 11:40:36 -0000	1.30.2.1
@@ -57,6 +57,7 @@
   <msg key="edit">edit</msg>
   <msg key="End_Time">End Time</msg>
   <msg key="Event">Event</msg>
+  <msg key="Events">Events</msg>
   <msg key="events_over_1d">Display events for today</msg>
   <msg key="events_over_7d">Display events for the next 7 days</msg>
   <msg key="events_over_14d">Display events for the next 14 days</msg>
@@ -80,6 +81,7 @@
   <msg key="goto_weekday">Go to %days_of_week.day_short% %days_of_week.monthday%</msg>
   <msg key="Grant">Grant</msg>
   <msg key="Grant_Permissions">Grant Permissions</msg>
+  <msg key="Hours">Hours</msg>
   <msg key="is_recurring">Item is recurring.</msg>
   <msg key="Item">Item</msg>
   <msg key="last_week">last week</msg>
Index: openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.17 -r1.17.2.1
--- openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	10 Dec 2007 09:12:28 -0000	1.17
+++ openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	23 May 2008 11:40:36 -0000	1.17.2.1
@@ -47,6 +47,7 @@
   <msg key="edit">editar</msg>
   <msg key="End_Time">Fin</msg>
   <msg key="Event">Evento</msg>
+  <msg key="Events">Eventos</msg>
   <msg key="events_over_1d">Mostrar les eventos para hoy</msg>
   <msg key="events_over_7d">Mostrar los eventos de los pr�ximos 7 d�as</msg>
   <msg key="events_over_14d">Mostrar los eventos de los pr�ximos 14 d�as</msg>
@@ -70,6 +71,7 @@
   <msg key="goto_weekday">Ir a %days_of_week.day_short% %days_of_week.monthday%</msg>
   <msg key="Grant">Otorgar</msg>
   <msg key="Grant_Permissions">Autorizar</msg>
+  <msg key="Hours">Horas</msg>
   <msg key="is_recurring">El evento se repite</msg>
   <msg key="Item">Evento</msg>
   <msg key="last_week">semana anterior</msg>
@@ -90,26 +92,26 @@
   <msg key="lt_everyone_have_read_pe">todo el mundo tiene permisos de lectura y puede ver los eventos, tanto los usuarios registrados como los no registrados.</msg>
   <msg key="lt_Go_to_month_name_days">Ir al %days.day_number% de %month_name% del %year%</msg>
   <msg key="lt_Go_to_monthsname_curr">Ir a %months.name% del %curr_year%</msg>
-  <msg key="lt_Go_to_monthsname_curr_1">Ir a %months.name% %curr_year%&amp;gt;%months.name%&amp;lt;/a&amp;gt;&amp;lt;/td&amp;gt;
-            &amp;lt;/else&amp;gt;         
-           &amp;lt;/multiple&amp;gt;
-        &amp;lt;/if&amp;gt;
-
-        &amp;lt;else&amp;gt;
-          &amp;lt;tr class=&amp;quot;days&amp;quot;&amp;gt;
-            &amp;lt;multiple name=&amp;quot;days_of_week&amp;quot;&amp;gt;
-              &amp;lt;td&amp;gt;%days_of_week.day_short%&amp;lt;/td&amp;gt;
-            &amp;lt;/multiple&amp;gt;
-          &amp;lt;/tr&amp;gt;
-      
-          &amp;lt;multiple name=&amp;quot;days&amp;quot;&amp;gt;
-            &amp;lt;if %days.beginning_of_week_p% true&amp;gt;
-              &amp;lt;tr&amp;gt;
-            &amp;lt;/if&amp;gt;
-        
-            &amp;lt;if %days.active_p% true&amp;gt;
-              &amp;lt;if %days.today_p% true&amp;gt;
-                &amp;lt;td class=&amp;quot;today&amp;quot; onclick=&amp;quot;javascript:location.href='%days.url%';&amp;quot;&amp;gt;
+  <msg key="lt_Go_to_monthsname_curr_1">Ir a %months.name% %curr_year%&amp;gt;%months.name%&amp;lt;/a&amp;gt;&amp;lt;/td&amp;gt;
+            &amp;lt;/else&amp;gt;         
+           &amp;lt;/multiple&amp;gt;
+        &amp;lt;/if&amp;gt;
+
+        &amp;lt;else&amp;gt;
+          &amp;lt;tr class=&amp;quot;days&amp;quot;&amp;gt;
+            &amp;lt;multiple name=&amp;quot;days_of_week&amp;quot;&amp;gt;
+              &amp;lt;td&amp;gt;%days_of_week.day_short%&amp;lt;/td&amp;gt;
+            &amp;lt;/multiple&amp;gt;
+          &amp;lt;/tr&amp;gt;
+      
+          &amp;lt;multiple name=&amp;quot;days&amp;quot;&amp;gt;
+            &amp;lt;if %days.beginning_of_week_p% true&amp;gt;
+              &amp;lt;tr&amp;gt;
+            &amp;lt;/if&amp;gt;
+        
+            &amp;lt;if %days.active_p% true&amp;gt;
+              &amp;lt;if %days.today_p% true&amp;gt;
+                &amp;lt;td class=&amp;quot;today&amp;quot; onclick=&amp;quot;javascript:location.href='%days.url%';&amp;quot;&amp;gt;
                   &amp;lt;a href=&amp;quot;%days.url%&amp;quot; title=&amp;quot;&amp;lt;#_ Go to %month_name% %days.day_number%, %year%</msg>
   <msg key="lt_Hide_Checked_Calendar">Ocultar los calendarios seleccionados</msg>
   <msg key="lt_Manage_Calendar_Audie">Administrar las Audiencias del Calendario</msg>
Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -N -r1.23.2.1 -r1.23.2.2
--- openacs-4/packages/calendar/www/view-one-day-display.adp	7 May 2008 23:03:14 -0000	1.23.2.1
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	23 May 2008 11:40:36 -0000	1.23.2.2
@@ -1,35 +1,34 @@
-<table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
-  <tr>
-    <td align="center">
-      <h1>@curr_day_name@ @curr_month@ @curr_day@ @curr_year@</h1>
-    </td>
-  </tr>
-  <tr>
-    <td>
-     <table id="cal-table-day" cellpadding="0" cellspacing="1" border="0" width="75%">
-        <tr>
-			<td style="vertical-align: top;"> <div class="day-time-1"><p><a href="@grid_first_add_url@" title="#calendar.Add_item_beginning_at#">@grid_first_hour@</a></p></div></td>
-			<td style="vertical-align: top; width:80%" class="day-event-1" valign="top">
-            <div id="day-entry-box">
+  <table id="cal-table-day" cellpadding="0" cellspacing="1" border="0" width="90%">
+    <caption>@curr_day_name@ @curr_month@ @curr_day@ @curr_year@</caption>
+    <thead>
+      <tr>
+        <th id="hours">#calendar.Hours#</th>
+        <th id="events">#calendar.Events#</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td headers="hours" style="vertical-align: top;"> <div class="day-time-1"><p><a href="@grid_first_add_url@" title="#calendar.Add_item_beginning_at#">@grid_first_hour@</a></p></div></td>
+        <td headers="events" style="vertical-align: top; width:80%" class="day-event-1" valign="top">
+          <div id="day-entry-box">
             <multiple name="items">
-			<div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@"><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>
+              <div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@"><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><!-- day-entry-box -->
+          </div><!-- day-entry-box -->
+        </td>
+      </tr>
+      <multiple name="grid">
+        <tr>
+          <if @grid.rownum@ even>
+            <td headers="hours"> <div class="day-time-1"><p><a href="@grid.add_url@" title="#calendar.Add_item_beginning_at#">@grid.hour@</a></p></div></td>
+            <td headers="events" class="day-event-1" style="width: 80%" valign="top">
             </td>
+          </if>
+          <else>
+            <td headers="hours"> <div class="day-time-2"><p><a href="@grid.add_url@" title="#calendar.Add_item_beginning_at#">@grid.hour@</a></p></div></td>
+            <td headers="events" class="day-event-2" style="width: 80%" valign="top"></td>
+          </else>
         </tr>
-        <multiple name="grid">
-		<tr>
-            <if @grid.rownum@ even>
-			<td> <div class="day-time-1"><p><a href="@grid.add_url@" title="#calendar.Add_item_beginning_at#">@grid.hour@</a></p></div></td>
-			<td class="day-event-1" style="width: 80%" valign="top">
-            </td>
-            </if><else>
-			<td> <div class="day-time-2"><p><a href="@grid.add_url@" title="#calendar.Add_item_beginning_at#">@grid.hour@</a></p></div></td>
-			<td class="day-event-2" style="width: 80%" valign="top"></td>
-            </else>
-		</tr>
-        </multiple>
-     </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 -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/calendar/www/resources/calendar-hc.css	23 May 2008 10:48:35 -0000	1.1.2.2
+++ openacs-4/packages/calendar/www/resources/calendar-hc.css	23 May 2008 11:40:37 -0000	1.1.2.3
@@ -86,6 +86,15 @@
 	background-color: #ffffff;
 }
 
+#cal-table-day caption, #cal-table-week caption {
+    color: inherit;
+}
+
+#cal-table-day th, #cal-table-week th {
+    background-color: #ffffff;
+    color: #000000;
+}
+
 .day-time-1 {
 	border:1px #ffffff solid;
 	background-color: #222222;
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 -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/calendar/www/resources/calendar.css	23 May 2008 10:48:35 -0000	1.12.2.2
+++ openacs-4/packages/calendar/www/resources/calendar.css	23 May 2008 11:40:37 -0000	1.12.2.3
@@ -172,6 +172,17 @@
 	background-color:#89A2B3;
 }
 
+#cal-table-day caption, #cal-table-week caption {
+	font-size: 1.2em;
+    font-weight: bold;
+    color: #646c61;
+    margin: 1em;
+}
+
+#cal-table-day th, #cal-table-week th {
+    background-color: #ffffff;
+}
+
 .day-time-1 {
 	border:1px #ffffff solid;
 	background-color:#D8E0E6;