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.14 -r1.15
--- openacs-4/packages/calendar/www/view-one-day-display.adp	11 Dec 2003 21:39:59 -0000	1.14
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	19 Feb 2004 17:58:37 -0000	1.15
@@ -1,73 +1,61 @@
-  <table class="cal-table-display" cellpadding="1" cellspacing="2">
-  <tr><td>
-  <table cellpadding=3 cellspacing=0 border=0 width=100% class="cal-table-display">
-    <tr class="cal-table-header" bgcolor=lavender>
+<table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
+  <tr>
     <td class="cal-month-title-text">
-    @url_previous_week;noquote@
-    </a>
-    <B>@dates;noquote@</B>
-    @url_next_week;noquote@
-    </a>
+      <a href="@previous_week_url@"><img border=0 src="<%=[dt_left_arrow]%>" alt="back one day"></a>
+      @dates@
+      <a href="@next_week_url@"><img border=0 src="<%=[dt_right_arrow]%>" alt="forward one day"></a>
     </td>
-    </tr>
-    </table>
-  </td>
   </tr>
-  <table width="100%">
   <tr>
-  <td>
-    <tr>
+    <td>
+      <table>
+      <tr>
       <td>
-          <tr class="cal-row-light">
-          <td width="1%" class="cal-day-time">@item_add_without_time;noquote@</td>
-          <td><table> 
-            <multiple name="day_items_without_time">
-	    <tr>
-            <td class="cal-day-event-notime">@day_items_without_time.full_item;noquote@</td>
+        <tr>
+          <td>
+            <tr class="cal-row-light">
+            <td width="1%" class="cal-day-time"><a href="@item_add_without_time@"><img border="0" align="left" src="/resources/acs-subsite/add.gif" alt="No Time"></a></td>
+            <td>
+            <table> 
+              <multiple name="items_without_time">
+              <tr>
+              <td class="cal-day-event-notime">
+              <a href="@items_without_time.event_url@">@items_without_time.event_name@</a>
+              </td>
+              </tr>
+              </multiple>
+            </table>
+            </td>
             </tr>
-            </multiple>
-          </table></td>
-          </tr>
-          <if @day_items_with_time:rowcount@ gt 0>
-            <multiple name="day_items_with_time">
-            <if @day_items_with_time.current_hour@ odd>
-              <tr class="odd">
-            </if>
-            <else>
-              <tr class="even">
-            </else>
-
-	<td width="20%" class="cal-day-time">     
-	@day_items_with_time.current_hour_link;noquote@
-	</td>
-
-            <group column="current_hour">
-              <if @day_items_with_time.item_id@ ne "">
-                <if @day_items_with_time.name@ ne "">
-
-                <td width="80%" class="cal-day-event" rowspan="@day_items_with_time.rowspan@"  colspan="@day_items_with_time.colspan@" valign="top">
-                @day_items_with_time.full_item;noquote@
-                <if @show_calendar_name_p@>
-                <span
-                class="cal-text-grey-sml">@day_items_with_time.calendar_name@</span>
+            <if @items:rowcount@ gt 0>
+              <multiple name="items">
+                <if @items.current_hour@ odd>
+                  <tr class="odd">
                 </if>
-                </td>
-                </if>
-              </if>
                 <else>
-                  <if @day_items_with_time.rowspan@ gt 0>
-                    <td class="cal-day-event" colspan="@day_items_with_time.colspan@">&nbsp;</td>
-                  </if>
-                  <else>
-                    <if @max_items_per_hour@ eq 0>
-                      <td width="80%" class="cal-day-event">&nbsp;</td>
-                    </if>
-                  </else>
+                  <tr class="even">
                 </else>
-            </group>
-            </tr>
-            </multiple>
-          </if>
-      </td>
-    </tr>
-  </table>
+    
+                <td width="10%" class="cal-day-time">     
+                  <a href="@items.add_url@">@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@">@items.event_name@</a>
+                      <if @show_calendar_name_p@>
+                        <span class="cal-text-grey-sml">@items.calendar_name@</span>
+                      </if>
+                    </td>
+                  </if>
+                </group>
+                </tr>
+               </multiple>
+             </if>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>