Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	22 Sep 2003 10:04:39 -0000	1.18
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	26 Sep 2003 06:54:44 -0000	1.19
@@ -18,19 +18,74 @@
 
 %>
 
+  <style type="text/css" media="all">
+    @import "/resources/calendar/calendar.css";
+  </style>
+
 <if @config.shaded_p@ ne "t">
   <table border=0 width="100%">
     <tr>
       <td valign=top width=180>
-        @cal_nav;noquote@
+	<include src="/packages/calendar/www/mini-calendar" base_url="@base_url@" view="@view@" date="@date@" page_num=@page_num@>
         <p align="left">
         <ul align="left">
           <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=&time_p=1">#calendar-portlet.Add_an_item#</a></if>
           <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">#calendar-portlet.Manage_Item_Types#</a></if>
         </ul>
       </td>
       <td valign=top>
-        @cal_stuff;noquote@
+
+ <switch @view@>
+   <case value="day">
+     <include src="/packages/calendar/www/view-one-day-display" 
+     date="@date@" 
+     start_display_hour=7 
+     end_display_hour=22
+     hour_template="@hour_template;noquote@" 
+     item_template="@item_template;noquote@"
+     item_add_template="@item_add_template;noquote@"
+     prev_nav_template="@previous_link;noquote@"
+     next_nav_template="@next_link;noquote@"
+     base_url="@base_url@calendar/"
+     url_stub_callback="@url_stub_callback;noquote@" 
+     calendar_id_list="@list_of_calendar_ids@">
+   </case>
+
+  <case value="list">
+     <include src="/packages/calendar/www/view-list-display" 
+     start_date=@start_date@ 
+     end_date=@end_date@ 
+     date=@current_date@ 
+     period_days=30
+     calendar_id_list=@list_of_calendar_ids@ 
+     url_template="@url_template;noquote@" 
+     url_stub_callback="@url_stub_callback;noquote@" 
+     sort_by=@sort_by@> 
+  </case>
+  
+  <case value="week">
+     <include src="/packages/calendar/www/view-week-display" 
+     date="@current_date@"
+     calendar_id_list=@list_of_calendar_ids@ 
+     base_url="@base_url@calendar/"
+     item_template="@item_template;noquote@"
+     page_num=@page_num@
+     prev_week_template="@prev_week_template;noquote@"
+     next_week_template="@next_week_template;noquote@"
+     url_stub_callback="@url_stub_callback;noquote@">
+  </case>
+
+  <case value="month">
+     <include src="/packages/calendar/www/view-month-display"
+     date=@current_date@
+     calendar_id_list=@list_of_calendar_ids@ 
+     item_template="@item_template;noquote@"
+     base_url="@base_url@calendar/"
+     page_num=@page_num@
+     prev_month_template="@prev_month_template;noquote@"
+     next_month_template="@next_month_template;noquote@">
+  </case>
+ </switch>
       </td>
     </tr>
   </table>
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.27 -r1.28
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	22 Sep 2003 10:04:39 -0000	1.27
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	26 Sep 2003 06:54:44 -0000	1.28
@@ -45,6 +45,8 @@
 }
 set list_of_calendar_ids $config(calendar_id)
 
+set base_url [ad_conn url]
+
 set scoped_p $config(scoped_p)
 if {$scoped_p == "t"} {
     set show_calendar_name_p 1
@@ -72,28 +74,25 @@
     }
 }
 
+# global variables
 set current_date $date
 set date_format "YYYY-MM-DD HH24:MI"
 set return_url "[ns_conn url]?[ns_conn query]"
 set encoded_return_url [ns_urlencode $return_url]
 
-set cal_nav [dt_widget_calendar_navigation "" $view $date "page_num=$page_num"]
-
 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 hour_template "<a href=calendar/cal-item-new?date=$current_date&start_time=\$day_current_hour>\$localized_day_current_hour</a>"
     set item_add_template "<a href=calendar/cal-item-new?start_time=&time_p=1&end_time=&julian_date=\$julian_date title=\"[_ calendar.Add_Item]\">+</a>"
 } else {
-    set hour_template "\$hour"
+    set hour_template "\$localized_day_current_hour"
     set item_add_template ""
 }
 
-if {$view == "day"} {
+set url_stub_callback "calendar_portlet_display::get_url_stub" 
 
-    # Check that the previous and next days are in the tcl boundaries
-    # so that the calendar widget doesn't bomb when it creates the next/prev links
+if {$view == "day"} {
     if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
 	set previous_link ""
     } else {
@@ -113,23 +112,9 @@
 	    set next_link "<a href=\"?page_num=$page_num&date=\$tomorrow\"><img border=0 src=[dt_right_arrow] alt=\"forward one day\"></a>"
 	}
     }
-
-
-    set cal_stuff [calendar::one_day_display \
-            -prev_nav_template $previous_link \
-            -next_nav_template $next_link \
-            -item_template $item_template \
-            -hour_template $hour_template \
-            -date $current_date -start_hour 7 -end_hour 22 \
-            -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -show_calendar_name_p $show_calendar_name_p]
 } 
 
 if {$view == "week"} {
-
-    # Check that the previous and next weeks are in the tcl boundaries
-    # so that the calendar widget doesn't bomb when it creates the next/prev links
     if {[catch {set last_w [clock format [clock scan "1 week ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
         set previous_link ""
     } else {
@@ -150,77 +135,45 @@
 	}
     }
 
-    set cal_stuff [calendar::one_week_display \
-            -item_template $item_template \
-           -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=\"/shared/images/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\"><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
-    ]
+    set prev_week_template "<a href=\"?date=\[ad_urlencode \[dt_julian_to_ansi \[expr \$first_weekday_julian - 7\]\]\]&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>" 
+    set next_week_template "<a href=\"?date=\[ad_urlencode \[dt_julian_to_ansi \[expr \$first_weekday_julian + 7\]\]\]&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>" 
 }
 
-if {$view == "month"} {
 
-    # Check that the previous and next months are in the tcl boundaries
-    # so that the calendar widget doesn't bomb when it creates the next/prev links
+if {$view == "month"} {
     if {[catch {set prev_m [clock format [clock scan "1 month ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set previous_link ""
+        set prev_month_template ""
     } else {
 	if {[catch {clock scan $prev_m}]} {
-	    set previous_link ""
+	    set prev_month_template ""
 	} else {
-	    set previous_link "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_left_arrow] alt=\"back one month\"></a>"
+	    set prev_month_template "<a href=?view=month&date=\[ad_urlencode \$prev_month\]&page_num=$page_num><img border=0 src=[dt_left_arrow] alt=\"back one month\"></a>"
 	}
     }
 	
     if {[catch {set next_m [clock format [clock scan "1 month" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set next_link ""
+        set next_month_template ""
     } else {
 	if {[catch {clock scan $next_m}]} {
-	    set next_link ""
+	    set next_month_template ""
 	} else {
-	    set next_link "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_right_arrow] alt=\"forward one month\"></a>"
+	    set next_month_template "<a href=?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num><img border=0 src=[dt_right_arrow] alt=\"forward one month\"></a>"
 	}
     }
-
-
-    set cal_stuff [calendar::one_month_display \
-            -item_template "<font size=-2>$item_template</font>" \
-            -day_template "<font size=-1><b><a href=?julian_date=\$julian_date&page_num=$page_num>\$day_number</a></b></font>" \
-            -date $current_date \
-            -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 $previous_link \
-            -next_month_template $next_link \
-            -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" \
-            -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -show_calendar_name_p $show_calendar_name_p]
+    set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
 }
 
-if {$view == "year"} {
-    set cal_stuff ""
-}
 
 ad_return_template
 
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	22 Sep 2003 10:04:39 -0000	1.11
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	26 Sep 2003 06:54:44 -0000	1.12
@@ -19,7 +19,18 @@
 %>
 
 <if @config.shaded_p@ ne "t">
+  <if @view@ eq "day">
+  <include src="/packages/calendar/www/view-one-day-display" 
+  base_url=@base_url@
+  date="@date@" start_display_hour=7 end_display_hour=22
+  hour_template="@hour_template;noquote@" item_add_template="@item_add_template;noquote@"
+  prev_nav_template="@previous_link;noquote@"
+  next_nav_template="@next_link;noquote@"
+  calendar_id_list="@list_of_calendar_ids@">
+  </if>
+  <else>
 @cal_stuff;noquote@
+</else>
 </if>
 <else>
 &nbsp;
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	22 Sep 2003 10:04:39 -0000	1.23
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	26 Sep 2003 06:54:44 -0000	1.24
@@ -42,6 +42,7 @@
 array set config $cf
 set view $config(default_view)
 set list_of_calendar_ids $config(calendar_id)
+set base_url [ad_conn url]
 
 set scoped_p $config(scoped_p)
 
@@ -73,10 +74,10 @@
 set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ns_urlencode "../"]&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 hour_template "<a href=calendar/cal-item-new?date=$current_date&start_time=\$day_current_hour>\$localized_day_current_hour</a>"
+    set item_add_template "<a href=calendar/cal-item-new?start_time=&time_p=1&end_time=&julian_date=\$julian_date title=\"[_ calendar.Add_Item]\">+</a>"
 } else {
-    set hour_template "\$hour"
+    set hour_template "\$localized_day_current_hour"
     set item_add_template ""
 }
 
@@ -105,16 +106,8 @@
 	}
     }
 
-
-    set cal_stuff [calendar::one_day_display \
-            -prev_nav_template $previous_link \
-            -next_nav_template $next_link \
-            -item_template $item_template \
-            -hour_template $hour_template \
-            -date $current_date -start_hour 7 -end_hour 22 \
-            -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -show_calendar_name_p $show_calendar_name_p]
+#             -url_stub_callback "calendar_portlet_display::get_url_stub" \
+#             -show_calendar_name_p $show_calendar_name_p]
     
 }