Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.21 -r1.21.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	9 Aug 2002 18:39:31 -0000	1.21
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	17 Oct 2002 09:39:37 -0000	1.21.2.1
@@ -70,24 +70,21 @@
 
 set cal_nav [dt_widget_calendar_navigation "" $view $date "page_num=$page_num"]
 
-if {$create_p} {
-    set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\$item</a>"
-} else {
-    set item_template "\$item"
-}
+set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\$item</a>"
 
+
 if {$create_p} {
     set hour_template "<a href=calendar/cal-item-new?date=$current_date&start_time=\$start_time&end_time=\$end_time>\$hour</a>"
-    set item_add_template "<a href=calendar/cal-item-new?start_time=&end_time=&julian_date=\$julian_date>ADD</a>"
+    set item_add_template " <a href=calendar/cal-item-new?start_time=&time_p=1&end_time=&julian_date=\$julian_date><img align=\"right\" border=0 width=\"7\" height=\"7\" src=\"/graphics/add.gif\" alt=\"Add Item\"></a>"
 } else {
     set hour_template "\$hour"
     set item_add_template ""
 }
 
 if {$view == "day"} {
     set cal_stuff [calendar::one_day_display \
-            -prev_nav_template "<a href=\"?page_num=$page_num&date=\$yesterday\">&lt;</a>" \
-            -next_nav_template "<a href=\"?page_num=$page_num&date=\$tomorrow\">&gt;</a>" \
+            -prev_nav_template "<a href=\"?page_num=$page_num&date=\$yesterday\"><img border=0 src=[dt_left_arrow] alt=\"back one day\"></a>" \
+            -next_nav_template "<a href=\"?page_num=$page_num&date=\$tomorrow\"><img border=0 src=[dt_right_arrow] alt=\"forward one day\"></a>" \
             -item_template $item_template \
             -hour_template $hour_template \
             -date $current_date -start_hour 7 -end_hour 22 \
@@ -99,12 +96,12 @@
 if {$view == "week"} {
     set cal_stuff [calendar::one_week_display \
             -item_template $item_template \
-            -day_template "<font size=-1><b>\$day</b> - <a href=\"?date=\$date&page_num=$page_num&return_url=$encoded_return_url\">\$pretty_date</a> &nbsp; &nbsp; <a href=\"calendar/cal-item-new?date=\$date&start_time=&end_time=\">(Add Item)</a></font>" \
+            -day_template "<a href=\"calendar/cal-item-new?date=\$date&time_p=1&start_time=&end_time=\"><img border=0 align=right height=\"7\" width=\"7\" src=\"/graphics/add.gif\" alt=\"Add Item\"></a><font size=-1><b>\$day</b> - </font><a href=\"?date=\$date&page_num=$page_num&return_url=$encoded_return_url\">\$pretty_date</a>" \
             -date $current_date \
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -prev_week_template "<a href=\"?date=\$last_week&view=week&page_num=$page_num\">&lt;</a>" \
-            -next_week_template "<a href=\"?date=\$next_week&view=week&page_num=$page_num\">&gt;</a>" \
+            -prev_week_template "<a href=\"?date=\$last_week&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>" \
+            -next_week_template "<a href=\"?date=\$next_week&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>" \
             -show_calendar_name_p $show_calendar_name_p
     ]
 }
@@ -117,17 +114,23 @@
             -item_add_template "<font size=-3>$item_add_template</font>" \
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -prev_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num>&lt;</a>" \
-            -next_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num>&gt;</a>" \
+            -prev_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_left_arrow] alt=\"back one month\"></a>" \
+            -next_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_right_arrow] alt=\"forward one month\"></a>" \
             -show_calendar_name_p $show_calendar_name_p]
 }
 
 if {$view == "list"} {
     set sort_by [ns_queryget sort_by]
 
+    set thirty_days [expr 60*60*24*30]
+    set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
+    set end_date [ns_fmttime [expr [ns_time] + $thirty_days] "%Y-%m-%d 00:00"]
+
     set cal_stuff [calendar::list_display \
             -item_template $item_template \
             -date $current_date \
+            -start_date $start_date \
+            -end_date $end_date \
             -calendar_id_list $list_of_calendar_ids \
             -sort_by $sort_by \
             -url_template "?view=list&sort_by=\$order_by&page_num=$page_num" \
@@ -140,3 +143,11 @@
 }
 
 ad_return_template
+
+
+
+
+
+
+
+