--- loncom/interface/selfenroll.pm	2009/09/05 01:14:32	1.23
+++ loncom/interface/selfenroll.pm	2010/01/18 15:58:25	1.25.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow users to self-enroll in a course
 #
-# $Id: selfenroll.pm,v 1.23 2009/09/05 01:14:32 raeburn Exp $
+# $Id: selfenroll.pm,v 1.25.2.1 2010/01/18 15:58:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -543,8 +543,8 @@ sub store_selfenroll_request {
     my %existing = 
         &Apache::lonnet::get($namespace,[$uname.':'.$udom],$cdom,$cnum);
     if ($existing{$uname.':'.$udom}) {
-        my ($timestamp,$sec) = split(/:/,$existing{$uname.':'.$udom});
-        $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request was submitted: [_1] and remains in a queue awaiting action by a Course Coordinator.',&Apache::lonlocal::locallocaltime($timestamp));
+        $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request is in a queue awaiting action by a Course Coordinator.').
+                  '<br /><br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();
     } else {
         my %selfenroll = (
                             $uname.':'.$udom => $now.':'.$usec,
@@ -564,7 +564,7 @@ sub store_selfenroll_request {
             }
             $output = &mt('Your request for self-enrollment has been recorded.').'<br />'.
                       &mt('A message will be sent to your LON-CAPA account when the course coordinator takes action on your request.').'<br />'.
-                      &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
+                      &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".');
             my %emails = &Apache::loncommon::getemails($uname,$udom);
             if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
                 my $address = $emails{'permanentemail'};
@@ -576,7 +576,9 @@ sub store_selfenroll_request {
             if ($warning) { 
                 $output .= '<span class="LC_warning">'.$warning.'</span><br />';
             }
-  
+
+            $output .= '<br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();
+
             if ($selfenroll_notifylist) {
                 my $fullname = &Apache::loncommon::plainname($uname,$udom);
                 my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);