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.31 -r1.32
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	18 Dec 2007 21:42:11 -0000	1.31
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	11 Sep 2008 14:13:42 -0000	1.32
@@ -44,7 +44,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 calendar_url [ad_conn package_url]calendar/
 
 set scoped_p $config(scoped_p)
 
@@ -60,11 +60,6 @@
     set force_calendar_id [lindex $list_of_calendar_ids 0]
 }
 
-# permissions
-set create_p [ad_permission_p $force_calendar_id cal_item_create]
-set edit_p [ad_permission_p $force_calendar_id cal_item_edit]
-set admin_p [ad_permission_p $force_calendar_id calendar_admin]
-
 # set up some vars
 set date [ns_queryget date]
 if {[empty_string_p $date]} {
@@ -73,88 +68,6 @@
 set current_date $date
 set date_format "YYYY-MM-DD HH24:MI"
 
-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>\[ad_quotehtml \$item\]</a>"
-
-if {$create_p} {
-    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 "\$localized_day_current_hour"
-    set item_add_template ""
-}
-
-set url_stub_callback "calendar_portlet_display::get_url_stub" 
-
-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 {
-	if {[catch {clock scan $yest}]} {
-	    set previous_link ""
-	} else {
-	    set previous_link "<a href=\"?page_num=$page_num&date=\$yesterday\"><img border=0 src=\"[dt_left_arrow]\" alt=\"back one day\"></a>"
-	}
-    }
-
-    if {[catch {set tomor [clock format [clock scan "1 day" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set next_link ""
-    } else {
-	if {[catch {clock scan $tomor}]} {
-	    set next_link ""
-	} else {
-	    set next_link "<a href=\"?page_num=$page_num&date=\$tomorrow\"><img border=0 src=[dt_right_arrow] alt=\"forward one day\"></a>"
-	}
-    }
-}
-
-if {$view == "week"} {
-    if {[catch {set last_w [clock format [clock scan "1 week ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set previous_link ""
-    } else {
-	if {[catch {clock scan $last_w}]} {
-	    set previous_link ""
-	} else {
-	    set previous_link "<a href=\"?date=\$last_week&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>"
-	}
-    }
-
-    if {[catch {set next_w [clock format [clock scan "1 week" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set next_link ""
-    } else {
-	if {[catch {clock scan $next_w}]} {
-	    set next_link ""
-	} else {
-	    set next_link "<a href=\"?date=\$next_week&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>"
-	}
-    }
-    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"} {
-    if {[catch {set prev_m [clock format [clock scan "1 month ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set previous_link ""
-    } else {
-	if {[catch {clock scan $prev_m}]} {
-	    set previous_link ""
-	} 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>"
-	}
-    }
-	
-    if {[catch {set next_m [clock format [clock scan "1 month" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
-        set next_link ""
-    } else {
-	if {[catch {clock scan $next_m}]} {
-	    set next_link ""
-	} 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>"
-	}
-    }
-    if { [info exists previous_link] } { set prev_month_template $previous_link }
-    if { [info exists next_link] } { set next_month_template $next_link }
-}
-
 if {$view == "list"} {
     set sort_by [ns_queryget sort_by]
 
@@ -163,7 +76,6 @@
     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 url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
 }
 
 template::head::add_css -href "/resources/calendar/calendar.css"