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.10 -r1.11
--- openacs-4/packages/calendar/www/view-month-display.adp	30 Dec 2003 23:30:09 -0000	1.10
+++ openacs-4/packages/calendar/www/view-month-display.adp	15 Feb 2004 12:16:25 -0000	1.11
@@ -1,17 +1,9 @@
-<table CELLPADDING=0 CELLSPACING=0 width="100%">
+<table cellpadding="0" cellspacing="0" width="100%">
   <tr>
-    <td class="cla-no-border" colspan="7">
-
-      <table width="100%" cellpadding=0 cellspacing=0 border=0 class="cal-table-display">
-        <tr class="cal-table-header" bgcolor=lavender>
-          <td class="cal-month-title-text">
-            @prev_month_url;noquote@
-            <b>@month_string@ @year@</b>
-            @next_month_url;noquote@
-          </td>
-        </tr>
-      </table>
-
+    <td class="cal-month-title-text" colspan="7">
+      @prev_month_url;noquote@
+      @month_string@ @year@
+      @next_month_url;noquote@
     </td>
   </tr>
   <tr>
@@ -20,48 +12,45 @@
       <table class="cal-month-table" cellpadding="2" cellspacing="2" border="5">
         <tbody>
           <tr>
-
             <multiple name="weekday_names">
               <td width="14%" class="cal-month-day-title">
                 @weekday_names.weekday_short@
               </td>
             </multiple>
-
           </tr>
-          <tr>
 
+          <tr>
             <multiple name="days_of_a_month">
-              <if @days_of_a_month.beginning_of_week_p@ eq "t">
+              <if @days_of_a_month.beginning_of_week_p@ true>
                 <tr>
               </if>
 
-              <if @days_of_a_month.outside_month_p@ eq "t">
+              <if @days_of_a_month.outside_month_p@ true>
                 <td class="cal-month-day-inactive">&nbsp;</td>
               </if>     
               <else>
-                <if @days_of_a_month.today_p@ eq "t">
-                  <td class="cal-month-today" onclick="javascript:location.href='@base_url@cal-item-new?date=@days_of_a_month.ansi_start_date@&start_time=&end_time=';">
+                <if @days_of_a_month.today_p@ true>
+                  <td class="cal-month-today" onclick="javascript:location.href='@days_of_a_month.url@';">
                 </if>
                 <else>
-                  <td class="cal-month-day" onclick="javascript:location.href='@base_url@cal-item-new?date=@days_of_a_month.ansi_start_date@&start_time=&end_time=';">
+                  <td class="cal-month-day" onclick="javascript:location.href='@days_of_a_month.url@';">
                 </else>
 
                   <a href="?view=day&date=@days_of_a_month.ansi_start_date@@page_num@">@days_of_a_month.day_number@</a>
 
                   <group column="ansi_start_date">
-                    <if @days_of_a_month.item_id@ ne "">
+                    <if @days_of_a_month.calendar_item@ ne "">
                       <div class="cal-month-event">
                         <if @days_of_a_month.time_p@ true>@days_of_a_month.ansi_start_time@</if>
-                        <a
-                        href=cal-item-view?cal_item_id=@days_of_a_month.item_id@>@days_of_a_month.full_item;noquote@</a>
+                        <a href=@days_of_a_month.item_url@>@days_of_a_month.calendar_item;noquote@</a>
                         <span class="cal-text-grey-sml"> [@days_of_a_month.calendar_name@]</span>
                       </div>
                     </if>
                   </group>
 
                 </td>
               </else>
-              <if @days_of_a_month.end_of_week_p@ eq "t">
+              <if @days_of_a_month.end_of_week_p@ true>
                 </tr>
               </if>
             </multiple>