--- loncom/interface/coursecatalog.pm	2008/07/15 19:43:15	1.40
+++ loncom/interface/coursecatalog.pm	2008/07/17 12:00:28	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.40 2008/07/15 19:43:15 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.41 2008/07/17 12:00:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -113,7 +113,7 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &syllabus_javascript(); 
+        $catjs .= &courselink_javascript(); 
         my $numtitles;
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
@@ -158,7 +158,7 @@ sub course_details {
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my $js = '<script type="text/javascript">'."\n".
-             &syllabus_javascript().'</script>'."\n";
+             &courselink_javascript().'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course Catalog',$js,
                                            {
@@ -181,11 +181,12 @@ sub course_details {
     $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
               '<a href = "javascript:document.coursecatalog.submit()">'.
               &mt('Back to course listing').'</a>'.
-              &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter','showdetails']).'</form>');
+              &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
+                                                       'showdetails','courseid']).'</form>');
     return;
 }
 
-sub syllabus_javascript {
+sub courselink_javascript {
     return <<"END";
 
 function ToSyllabus(cdom,cnum) {
@@ -195,8 +196,17 @@ function ToSyllabus(cdom,cnum) {
     if (cnum == '' || cnum == null) {
         return;
     }
-    document.syllabuslaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus";
-    document.syllabuslaunch.submit();
+    document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus";
+    document.linklaunch.submit();
+}
+
+function ToSelfenroll(courseid) {
+    if (courseid == '') {
+        return;
+    }
+    document.linklaunch.action = "/adm/selfenroll";
+    document.linklaunch.courseid.value = courseid;
+    document.linklaunch.submit();
 }
 
 END
@@ -755,9 +765,10 @@ sub print_course_listing {
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems);
-    $output .= "\n".'<form name="syllabuslaunch" method="post" action="">'.
+    $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
-               &Apache::lonhtmlcommon::echo_form_input(['catalogfilter']).'</form>';
+               '<input type="hidden" name="courseid" value="" />'.
+               &Apache::lonhtmlcommon::echo_form_input(['catalogfilter','courseid']).'</form>';
     return $output;
 }
 
@@ -1084,7 +1095,7 @@ sub courseinfo_row {
             if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
                 $output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';
             } else { 
-                $output .= '<td><a href="/adm/selfenroll?cid='.$course.'">'.&mt('Enroll in course').'</a></td>';
+                $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a></td>';
             }
             $selfenroll = 1;
         }