Index: openacs-4/packages/attendance/lib/cp-attendance.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attendance/lib/cp-attendance.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/attendance/lib/cp-attendance.adp	28 Dec 2005 00:24:27 -0000	1.5
+++ openacs-4/packages/attendance/lib/cp-attendance.adp	28 Dec 2005 00:37:07 -0000	1.6
@@ -2,10 +2,6 @@
 	<if @item_type_id@ defined>
 	<ul>
 		<li><a href="@calendar_url@cal-item-new?item_type_id=@item_type_id@&calendar_id=@calendar_id@&view=day&return_url=@current_url@" >Create a new event with Attendance Tracking</a>
-		<if @show_non_session_calendar_links@>
-			<li><a href="@calendar_url@cal-item-new?calendar_id=@calendar_id@&view=day" target="blank">Create Calendar Event(Any Type)</a>
-			<li><a href="@calendar_url@calendar-item-types?calendar_id=@calendar_id@" target="blank">Add New Event Type</a> - Experts only!
-		</if>
 		Note: To add attendance tracking to an existing event in your calendar edit the event and change the "Type" to "Session".
 	</ul>
 	</if>
Index: openacs-4/packages/attendance/lib/cp-attendance.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attendance/lib/cp-attendance.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/attendance/lib/cp-attendance.tcl	28 Dec 2005 00:24:27 -0000	1.11
+++ openacs-4/packages/attendance/lib/cp-attendance.tcl	28 Dec 2005 00:37:07 -0000	1.12
@@ -9,10 +9,6 @@
     set community_id [dotlrn_community::get_community_id]
 }
 
-if {![info exists show_non_session_calendar_links]} {
-    set show_non_session_calendar_links 1
-}
-
 set attendance_package_id [db_string "getattpack" ""]
 set attendance_url [apm_package_url_from_id $attendance_package_id]
 set calendar_id [dotlrn_calendar::get_group_calendar_id -community_id $community_id]
Index: openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info	21 Dec 2005 07:19:32 -0000	1.44
+++ openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info	28 Dec 2005 00:36:36 -0000	1.45
@@ -57,7 +57,6 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="OfferCodesP"  default="0" description="Support asking for offer codes for discount prices."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="PatronRelationshipCategoryTree"  description="Category tree to use when adding participant-patron relationships."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PaymentMethods"  default="cc" description="A space separeted list of allowed payment methods. Valid payment methods are 'cc' (Credit Card), 'internal_account' (With extra field asking for internal account code) or 'check'."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowNonSessionCalendarLinks"  default="0" description="Show links to the calendar that are not Session Events."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowSectionCategoryFields"  default="0" description="Display the category field in the section add/edit form."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowTemplateCommunityAdminP"  default="0" description="Show the buttons to administer template community."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowUsedCategoriesOnlyP"  default="0" description="Show only categories used in any course or section."/>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp	14 Aug 2005 21:28:58 -0000	1.13
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.adp	28 Dec 2005 00:36:37 -0000	1.14
@@ -43,7 +43,7 @@
 <if @attendance_show_p@>
 <h2>#dotlrn-ecommerce.lt_Sessions_and_Attendan#</h2>
 
-<include src=/packages/attendance/lib/cp-attendance community_id=@community_id@ package_id=@community_package_id@ show_non_session_calendar_links=@show_non_session_calendar_links@>
+<include src=/packages/attendance/lib/cp-attendance community_id=@community_id@ package_id=@community_package_id@>
 </if>
 
 
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.tcl	8 Aug 2005 13:10:07 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.tcl	28 Dec 2005 00:36:37 -0000	1.7
@@ -39,7 +39,6 @@
 set attendance_show_p [apm_package_installed_p "attendance"]
 set expensetracking_show_p [apm_package_installed_p "expenses"]
 set show_public_pages_p [parameter::get -parameter SupportPublicPagesP -default 0]
-set show_non_session_calendar_links [parameter::get -parameter ShowNonSessionCalendarLinks -default 0]
 
 # Flush cache for this section
 # Shouldn't have much effect on performance and will keep the data