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 -r1.19 -r1.19.2.1
--- openacs-4/packages/calendar/www/view-one-day-display.adp	15 Dec 2006 22:45:20 -0000	1.19
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	9 Feb 2007 16:07:38 -0000	1.19.2.1
@@ -1,61 +1,35 @@
 <table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
   <tr>
-    <td class="cal-month-title-text">
-      <a href="@previous_week_url@" title="#calendar.prev_day#"><img border=0 src="<%=[dt_left_arrow]%>" alt="#calendar.prev_day#"></a>
-      @dates@
-      <a href="@next_week_url@" title="#calendar.next_day#"><img border=0 src="<%=[dt_right_arrow]%>" alt="#calendar.next_day#"></a>
+    <td align="center">
+      <h1>@curr_day_name@ @curr_month@ @curr_day@ @curr_year@</h1>
     </td>
   </tr>
   <tr>
     <td>
-      <table>
-      <tr>
-      <td>
-         <table>
-            <tr class="cal-row-light">
-            <td width="1%" class="cal-day-time"><a href="@item_add_without_time@" title="#calendar.Add_all_day_event#"><img border="0" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_all_day_event#"> #calendar.Add_all_day_event#</a></td>
-            <td>
-            <table> 
-              <multiple name="items_without_time">
-              <tr>
-              <td class="cal-day-event-notime">
-              <a href="@items_without_time.event_url@" title="#calendar.goto_items_without_time_event_name#">@items_without_time.event_name@</a>
-              </td>
-              </tr>
-              </multiple>
-            </table>
+     <table id="cal-table-day" cellpadding="0" cellspacing="1" border="0" width="100%">
+        <tr>
+			<td style="vertical-align: top;"> <div class="day-time-1"><p><a href="@grid_first_add_url@">@grid_first_hour@</a></p></div></td>
+			<td style="vertical-align: top;" class="day-event-1" width="80%" valign="top">
+            <div id="day-entry-box">
+            <multiple name="items">
+			<a href="@items.event_url@"><div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" title="@items.event_name@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@" onmouseover="showCalItem(this,'@items.height@@hour_height_units@',20);" onmouseout="showCalItem(this,'@items.height@@hour_height_units@',10);"><p title="@items.event_name@">@items.event_name@</p></div></a>
+            </multiple>
+			</div><!-- day-entry-box -->
             </td>
-            </tr>
-            <if @items:rowcount@ gt 0>
-              <multiple name="items">
-                <if @items.current_hour@ odd>
-                  <tr class="odd">
-                </if>
-                <else>
-                  <tr class="even">
-                </else>
-    
-                <td width="10%" class="cal-day-time">     
-                  <a href="@items.add_url@" title="#calendar.Add_item_beginning_at#"><img border="0" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_item_beginning_at#"> @items.localized_current_hour@</a>
-                </td>
-    
-                <group column="current_hour">
-                  <if @items.event_name@ true>
-                    <td class="cal-day-event" rowspan="@items.rowspan@"  colspan="@items.colspan@" valign="top">
-                      <a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@  (@items.start_time@ - @items.end_time@)</a>
-                      <if @show_calendar_name_p@>
-                        <span class="cal-text-grey-sml">@items.calendar_name@</span>
-                      </if>
-                    </td>
-                  </if>
-                </group>
-                </tr>
-               </multiple>
-		</table>
-             </if>
-          </td>
         </tr>
-      </table>
-    </td>
-  </tr>
+        <multiple name="grid">
+		<tr>
+            <if @grid.rownum@ even>
+			<td> <div class="day-time-1"><p><a href="@grid.add_url@" title="Click to add an item starting at this time">@grid.hour@</p></a></div></td>
+			<td class="day-event-1" width="80%" valign="top">
+            </td>
+            </if><else>
+			<td> <div class="day-time-2"><p><a href="@grid.add_url@" title="Click to add an item starting at this time">@grid.hour@</a></p></div></td>
+			<td class="day-event-2" width="80%" valign="top"></td>
+            </else>
+		</tr>
+        </multiple>
+     </table>
+   </td>
+ </tr>
 </table>