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 -r1.9 -r1.10
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	25 Sep 2003 08:22:05 -0000	1.9
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	26 Sep 2003 12:17:54 -0000	1.10
@@ -118,6 +118,7 @@
   <msg key="Submit_query">Submit query</msg>
   <msg key="Sunday">Sunday</msg>
   <msg key="sync_with_Outlook">sync with Outlook</msg>
+  <msg key="Today_is_label">Today is</msg>
   <msg key="This_event_is">This event is</msg>
   <msg key="Thursday">Thursday</msg>
   <msg key="Time">Time:</msg>
Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/mini-calendar.adp	25 Sep 2003 23:11:12 -0000	1.4
+++ openacs-4/packages/calendar/www/mini-calendar.adp	26 Sep 2003 12:17:55 -0000	1.5
@@ -1,4 +1,4 @@
-<table class="cal-table" cellpadding=0 cellspacing=0>
+<table class="cal-table" cellpadding="0" cellspacing="0">
   <!-- Navigation bar views-->
   <tr>
   <multiple name=views>
@@ -126,15 +126,14 @@
   <tr><td nowrap>
   <font size=-2>
   
-  <if @today_p@ eq t>
-    <b>#acs_datetime.Today#</b>
+  <if @today_p@ true>
+    <b>#acs-datetime.Today#</b>
   </if>
   <else>
-    <a href="@today_url;noquote@">
-    <b>#acs_datetime.Today#</b></a> 
+    <a href="@today_url@"><b>#acs-datetime.Today#</b></a> 
   </else>
   
-  #acs_datetime.is# <%=[dt_ansi_to_pretty]%></font></td></tr>
+  #acs-datetime.is# <%=[dt_ansi_to_pretty]%></font></td></tr>
   <tr><td align=center><br>
   <form method=get action=@base_url@>
   <INPUT TYPE=text name=date size=10> <INPUT type=image src="/shared/images/go.gif" alt="Go" border=0><br><font size=-2>#acs-datetime.Date_as_YYYYMMDD#</font>
Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar/www/view-list-display.tcl	25 Sep 2003 23:11:12 -0000	1.11
+++ openacs-4/packages/calendar/www/view-list-display.tcl	26 Sep 2003 12:17:55 -0000	1.12
@@ -30,6 +30,15 @@
 if { ![info exists period_days] } {
     set period_days 31
 }
+
+if {[exists_and_not_null page_num]} {
+    set page_num_formvar [export_form_vars page_num]
+    set page_num "&page_num=$page_num"
+} else {
+    set page_num_formvar ""
+    set page_num ""
+}
+
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 # sort by cannot be empty
@@ -60,8 +69,8 @@
 set today_ansi_list [dt_ansi_to_list $today_date]
 set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]]
 
-set item_type_url "view?view=list&sort_by=item_type&start_date=$start_date&period_days=$period_days"
-set start_date_url "view?view=list&sort_by=start_date&start_date=$start_date&period_days=$period_days"
+set item_type_url "?view=list&sort_by=item_type&start_date=$start_date&period_days=$period_days$page_num"
+set start_date_url "?view=list&sort_by=start_date&start_date=$start_date&period_days=$period_days$page_num"
 
 set view list
 set form_vars [export_form_vars start_date sort_by view]
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.6 -r1.7
--- openacs-4/packages/calendar/www/view-month-display.adp	25 Sep 2003 23:11:12 -0000	1.6
+++ openacs-4/packages/calendar/www/view-month-display.adp	26 Sep 2003 12:17:55 -0000	1.7
@@ -1,6 +1,6 @@
 <table CELLPADDING=0 CELLSPACING=0 width="100%">
   <tr>
-    <td class="cla-no-border" colspan=7>
+    <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>
@@ -48,7 +48,7 @@
 
                   <a
                   href="@base_url@cal-item-new?date=@days_of_a_month.ansi_start_date@&start_time=&end_time=">
-                  <img border="0" align="right" height="16" width="16" src="/shared/images/add.gif" alt="#calendar.Add_Item#"></a>
+                  <img border="0" align="right" height="8" width="8" src="/shared/images/add.gif" alt="#calendar.Add_Item#"></a>
                   <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">