Index: openacs-4/packages/calendar/www/cal-options.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar/www/cal-options.adp	22 Jul 2003 11:49:18 -0000	1.5
+++ openacs-4/packages/calendar/www/cal-options.adp	12 Aug 2003 23:42:38 -0000	1.6
@@ -6,7 +6,7 @@
 <li> @calendars.calendar_name@
 <if @calendars.calendar_admin_p@ eq "t">
   <br>
-  <font size=-2>[<a href="calendar-item-types?calendar_id=@calendars.calendar_id@">Manage Types</a>]</font>
+  <font size=-2>[<a href="@base_url@calendar-item-types?calendar_id=@calendars.calendar_id@">Manage Types</a>]</font>
 </if>
 </multiple>
 </ul>
Index: openacs-4/packages/calendar/www/cal-options.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/www/cal-options.tcl	11 Aug 2003 12:14:16 -0000	1.9
+++ openacs-4/packages/calendar/www/cal-options.tcl	12 Aug 2003 23:42:38 -0000	1.10
@@ -13,6 +13,13 @@
 
 set user_id [ad_conn user_id]
 
+# If we're included from another package url_stub will have been set up
+# to give a valid url prefix that points to the proper calendar.
+
+if { ![info exists base_url] } {
+    set base_url ""
+}
+
 multirow create calendars calendar_name calendar_id calendar_admin_p
 foreach calendar $calendar_list {
     multirow append calendars [lindex $calendar 0] [lindex $calendar 1] [lindex $calendar 2]