Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp	8 Aug 2005 13:10:06 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp	5 Sep 2005 20:48:24 -0000	1.3
@@ -1,8 +1,21 @@
 <master>
+<if @member_state@ eq "request approval">
+  <property name="title">Application Confirmed</property>	
+</if>
+<else>
   <property name="title">#dotlrn-ecommerce.lt_Application_Confirmed#</property>
+</else>
 
   <div class="boxed-user-message">
+
+<if @member_state@ eq "request approval">
+    <h3>Thank you for applying for a prerequisite exception for @section_name@.  We will notify you if a space becomes available.
+</h3>
+</if>
+<else>
     <h3>#dotlrn-ecommerce.lt_Thank_you_for_your_ap#</h3>
+</else>
+
   </div>
   
   <p />
Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl	16 Aug 2005 16:18:01 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl	5 Sep 2005 20:48:25 -0000	1.4
@@ -15,6 +15,7 @@
     set user_id [ad_conn user_id]
     
     if { ! [dotlrn::user_p -user_id $user_id] } {
+
 	db_transaction {
 	    # This is a newly created user and if this page is reached, that
 	    # means a new user answered a course application and should be put
Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	24 Aug 2005 10:38:27 -0000	1.31
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	5 Sep 2005 20:48:25 -0000	1.32
@@ -275,7 +275,7 @@
 
     set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} {type $list_type} return_url }]
     set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} {type $list_type} return_url }]
-    
+    ns_log Notice "***HAM : $member_state : $applicant_user_id : $community_id ***"
     if { $member_state == "needs approval" || 
 	 $member_state == "awaiting payment" ||
 	 $member_state == "waitinglist approved" ||
@@ -301,7 +301,6 @@
 	    limit 1
 	}] } {
 	    
-
 	    if {$use_embedded_application_view_p ==1} {
 		set asm_url "admin/application-view?session_id=$session_id"
 		set target ""
@@ -310,7 +309,7 @@
 		set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
 		set target "_blank"
 	    }
-	    
+	    ns_log Notice "A:HAM: $asm_url"
 
 	}
 
@@ -346,9 +345,10 @@
 		set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
 		set target "_blank"
 	    }
-
+               ns_log Notice "B:HAM: $asm_url"
 	}
     }
+ns_log Notice "1:HAM: $asm_url"
 
     set section_edit_url [export_vars -base admin/one-section { section_id return_url }]
     set person_url [export_vars -base /acs-admin/users/one { {user_id $applicant_user_id} }]
@@ -393,7 +393,6 @@
         }
 	set add_comment_url [export_vars -base "${general_comments_url}comment-add" {{object_id $session_id} {object_name "Application"} return_url}]
     }
-
 }
 
 # if we are CSV we need to get the assessment items
Index: openacs-4/packages/dotlrn-ecommerce/www/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn-ecommerce/www/home.adp	3 Sep 2005 07:46:45 -0000	1.8
+++ openacs-4/packages/dotlrn-ecommerce/www/home.adp	5 Sep 2005 20:48:25 -0000	1.9
@@ -96,7 +96,12 @@
 	<ul class="action-links">
 	  <if @sessions_with_applications@ gt 0>
 	    <multiple name="sessions">
-	      <li>@sessions.community_id@ <a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> <if @user_id@ ne @sessions.participant@>(@sessions.name@)</if>
+		<if @admin_p@ eq 1>
+		  <li> <a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> <if @user_id@ ne @sessions.participant@>(@sessions.name@)</if>
+		</if>
+		<else>
+		  <li> @sessions.pretty_name@ <if @user_id@ ne @sessions.participant@>(@sessions.name@)</if>
+		</else>    
 
 	<if @use_embedded_application_view_p@ ne 1> 
 	 [<a href="@sessions.edit_asm_url;noquote@">#acs-kernel.common_Edit#</a>]
@@ -114,7 +119,7 @@
 <if @waiting_lists:rowcount@ gt 0>
 	<ul class="action-links">
 	<multiple name="waiting_lists">
-	<li>@waiting_lists.pretty_name@ <if @user_id@ ne @waiting_lists.participant@>(@waiting_lists.name@)</if></li>
+	<li>@waiting_lists.pretty_name@ <if @user_id@ ne @waiting_lists.participant@>(@waiting_lists.name@) </if> - <font color=red>number @waiting_lists.waiting_list_number@ on waiting list</font></li>
 	</li>
         </multiple>
 	</ul>
Index: openacs-4/packages/dotlrn-ecommerce/www/home.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn-ecommerce/www/home.tcl	3 Sep 2005 07:46:45 -0000	1.10
+++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl	5 Sep 2005 20:48:25 -0000	1.11
@@ -22,6 +22,7 @@
     pvt_home_url:onevalue
 }
 
+set memoize_max_age [parameter::get -parameter CatalogMemoizeAge -default 10800]
 set user_id [auth::require_login -account_status closed]
 
 acs_user::get -array user -include_bio -user_id $user_id
@@ -163,7 +164,7 @@
     }
 
 # get waiting list requests
-    db_multirow waiting_lists waiting_lists {
+db_multirow -extend {waiting_list_number} waiting_lists waiting_lists {
 	select c.community_id, c.pretty_name,r.user_id as participant,
 	acs_object__name(r.user_id) as name
 	from 
@@ -175,7 +176,11 @@
 	where r.community_id = c.community_id
 	and r.member_state = 'needs approval'
 	and (r.user_id = :user_id or ar.object_id_one=:user_id)
+    } {
+	set waiting_list_number [util_memoize [list dotlrn_ecommerce::section::waiting_list_number $user_id $community_id] $memoize_max_age]
     }
 
 #ad_return_complaint 1 $notice
-set catalog_url [ad_conn package_url]
\ No newline at end of file
+set catalog_url [ad_conn package_url]
+set cc_package_id [apm_package_id_from_key "dotlrn-ecommerce"]
+set admin_p [permission::permission_p -object_id $cc_package_id -privilege "admin"]
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/participant-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/participant-add.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/admin/participant-add.tcl	28 Aug 2005 15:18:12 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/participant-add.tcl	5 Sep 2005 20:48:39 -0000	1.8
@@ -1,9 +1,7 @@
-# packages/dotlrn-ecommerce/www/admin/participant-add.tcl
-
 ad_page_contract {
+    packages/dotlrn-ecommerce/www/admin/participant-add.tcl    
     
     
-    
     @author Roel Canicula (roelmc@pldtdsl.net)
     @creation-date 2005-06-01
     @arch-tag: 0ee8915f-9e76-4a92-9d43-89c2c757276d
@@ -19,6 +17,7 @@
 } -errors {
 }
 
+
 if { ! [empty_string_p $cancel] } {
     ns_log notice "DEBUG:: CANCEL - $cancel - $return_url"
 
@@ -34,7 +33,6 @@
 
 set title "Participant Info for $course_name: $section_name"
 set context [list [list [export_vars -base course-info { course_id }] $section_name] "Participants and Patrons"]
-
 if { [empty_string_p $add_url] } {
     set add_url [export_vars -base "[ad_conn package_url]ecommerce/shopping-cart-add" { product_id user_id }]
 }