Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/calendar/www/view-month-display.adp	15 Dec 2006 22:45:20 -0000	1.16
+++ openacs-4/packages/calendar/www/view-month-display.adp	15 May 2007 20:14:21 -0000	1.17
@@ -1,73 +1,88 @@
- <table class="cal-table-display" cellpadding="0" cellspacing="0" border="0" width="99%">
+<% ns_log notice "DAVEB 103 view-month-display.adp" %>
+
+    <h1 align="center">
+      <a href="@previous_month_url@#calendar" title="#calendar.prev_month#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_month#" /></a>
+      &nbsp;@month_string@ @year@&nbsp;
+    <a href="@next_month_url@#calendar" title="#calendar.next_month#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_month#" /></a>
+    </h1>
+
+<table class="cal-table-display" cellpadding="0" cellspacing="0" border="0" width="99%" summary="calendar grid display for @month_string@ @year@">
   <tr>
-    <td class="cal-month-title-text" colspan="7">
-      <a href="@previous_month_url;noquote@" title="#calendar.prev_month#"><img border=0 src="<%=[dt_left_arrow]%>" alt="#calendar.prev_month#"></a>
-      @month_string@ @year@
-      <a href="@next_month_url;noquote@" title="#calendar.next_month#"><img border=0 src="<%=[dt_right_arrow]%>" alt="#calendar.next_month#"></a>
-    </td>
+    <multiple name="weekday_names">
+      <th width="14%" class="cal-month-day-title">
+        @weekday_names.weekday_short@
+      </th>
+    </multiple>
   </tr>
+
   <tr>
-    <td>
+    <td colspan="7">
 
-      <table class="cal-month-table" cellpadding="2" cellspacing="2" border="5">
+      <table class="cal-month-table" cellpadding="0" cellspacing="0" border="0" width="100%">
+
         <tbody>
-          <tr>
-            <multiple name="weekday_names">
-              <th width="14%" class="cal-month-day-title">
-                @weekday_names.weekday_short@
-              </th>
-            </multiple>
-          </tr>
 
-          <tr>
+                <!-- tr -->
+
             <multiple name="items">
+
               <if @items.beginning_of_week_p@ true>
                 <tr>
               </if>
 
               <if @items.outside_month_p@ true>
-                <td class="cal-month-day-inactive">&nbsp;</td>
+                <td class="cal-month-day-inactive" width="14%">&nbsp;</td>
               </if>     
               <else>
                 <if @items.today_p@ true>
-                  <td class="cal-month-today" <if @items.day_url@ not nil>onclick="javascript:location.href='@items.day_url@';"</if>>
+                  <td class="cal-month-today"  width="14%" onclick="javascript:location.href='@items.add_url@';" onkeypress="javascript:acs_KeypressGoto('@items.add_url@',event);">
                 </if>
                 <else>
-                  <td class="cal-month-day" <if @items.day_url@ not nil>onclick="javascript:location.href='@items.day_url@';"</if>>
+                  <td class="cal-month-day"  width="14%" onclick="javascript:location.href='@items.add_url@';"onkeypress="javascript:acs_KeypressGoto('@items.add_url@',event);">
                 </else>
-                  <if @items.day_url@ not nil>
-                     <a href="@items.day_url@" title="#calendar.goto_day_items_day_number#">@items.day_number@</a> <if @add_p@><a href="@items.add_url@" title="#calendar.Add_Item#"><img border="0" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#"></a></if>
-                    </if>
-                    <else>
-                     @items.day_number@
-                    </else>
+                  &nbsp;<span class="screen-reader-only">[</span><a href="@items.day_url@" title="#calendar.goto_day_items_day_number#">@items.day_number@</a><span class="screen-reader-only"> ]</span>
 
                   <group column="day_number">
                     <if @items.event_name@ true>
-                      <div class="cal-month-event">
-                        <if @items.time_p@ true>@items.ansi_start_time@</if>
-                        <a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a>
+                      <div class="cal-month-event @items.style_class@">
+                        <a href="@items.event_url@" title="#calendar.goto_items_event_name#">
+                        <if @items.time_p@ true>@items.start_time@</if>
+                        @items.event_name@
                         <if @show_calendar_name_p@>
-                          <span class="cal-text-grey-sml"><if @show_calendar_name_p@>[@items.calendar_name@]</if> </span>
+                          <span class="cal-text-grey-sml"> [@items.calendar_name@]</span>
                         </if>
+                        </a>
                       </div>
                     </if>
                   </group>
 
                 </td>
               </else>
+
               <if @items.end_of_week_p@ true>
                 </tr>
               </if>
+
             </multiple>
 
-          </tr>
+                <!-- /tr -->
+
         </tbody>
       </table>
     </td>
   </tr>
+  <tr>
+	<td colspan="7">
+		<table width="100%">
+			<tr>
+				<td>
+					<div class="calendar-back-forward"><a href="@previous_month_url@#calendar" title="#calendar.prev_month#"><img src="/resources/calendar/images/left.gif" alt="#acs-kernel.common_Go#" /> &nbsp; #calendar.prev_month#</a></div>
+				</td>
+				<td align="right">
+					<div class="calendar-back-forward"><a href="@next_month_url@#calendar" title="#calendar.next_month#">#calendar.next_month#&nbsp; <img src="/resources/calendar/images/right.gif" alt="#acs-kernel.common_Go#" /></a></div>
+				</td>
+			</tr>
+		</table>
+	</td>
+  </tr>
 </table>
-
-
-
-