--- loncom/interface/coursecatalog.pm	2008/07/15 19:43:15	1.40
+++ loncom/interface/coursecatalog.pm	2008/09/23 14:41:00	1.43
@@ -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.43 2008/09/23 14:41:00 bisitz 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;
 }
 
@@ -799,7 +810,7 @@ sub construct_data_table {
             $output .=
               '<th>'.&mt('Default Access Dates for Students').'</th>'.
               '<th>'.&mt('Student Counts').'</th>'.
-              '<th>'.&mt('Auto-enrollment of <br />registered students').'</th>';
+              '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</th>';
         } else {
             $output .= '<th>'.&mt('Details').'</th>';
         }
@@ -946,10 +957,10 @@ sub build_courseinfo_hash {
                 }
             }
             if ($startaccess) {
-                $accessdates .= &mt('<i>From:</i> ').$startaccess.'<br />';
+                $accessdates .= '<i>'.&mt('From:[_1]','</i> '.$startaccess).'<br />';
             }
             if ($endaccess) {
-                $accessdates .= &mt('<i>To:</i> ').$endaccess.'<br />';
+                $accessdates .= '<i>'.&mt('To:[_1]','</i> '.$endaccess).'<br />';
             }
             if (($selfenroll_types ne '') && 
                 ($selfenroll_end > 0 && $selfenroll_end > $now)) {
@@ -970,10 +981,10 @@ sub build_courseinfo_hash {
                     if ($selfenroll_start_access || $selfenroll_end_access) {
                         $accessdates .= '<br/><br /><i>'.&mt('Self-enrollers:').'</i><br />';
                         if ($selfenroll_start_access) {
-                            $accessdates .= &mt('<i>From:</i> ').$selfenroll_start_access.'<br />';
+                            $accessdates .= '<i>'.&mt('From:[_1]','</i> '.$selfenroll_start_access).'<br />';
                         }
                         if ($selfenroll_end_access) {
-                            $accessdates .= &mt('<i>To:</i> ').$selfenroll_end_access.'<br />';
+                            $accessdates .= '<i>'.&mt('To:[_1]','</i> '.$selfenroll_end_access).'<br />';
                         }
                     }
                 }
@@ -1008,10 +1019,10 @@ sub count_students {
         $student_count{$data->[$idx{'status'}]} ++;
     }
 
-    my $countslist = &mt('[quant,_1,section]',$numsec).':<br />';
+    my $countslist = &mt('[quant,_1,section:,sections:,No sections]',$numsec).'<br />';
     foreach my $status ('Active','Future') {
-        $countslist .= '<nobr>'.$status_title{$status}.': '.
-                       $student_count{$status}.'</nobr><br />';
+        $countslist .= '<span class="LC_nobreak">'.$status_title{$status}.': '.
+                       $student_count{$status}.'</span><br />';
     }
     return $countslist;
 }
@@ -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;
         }
@@ -1151,11 +1162,11 @@ sub get_valid_classes {
     }
     if ($totalitems > 0) {
         if (@{$validations{'sections'}}) {
-            $response = &mt('Sections: ').
+            $response = &mt('Sections:').' '.
                         join(', ',@{$validations{'sections'}}).'<br />';
         }
         if (@{$validations{'xlists'}}) {
-            $response .= &mt('Courses: ').
+            $response .= &mt('Courses:').' '.
                         join(', ',@{$validations{'xlists'}});
         }
     }
@@ -1320,17 +1331,20 @@ sub autoenroll_info {
                    &get_valid_classes($seclist,$xlist_items,$code,
                                       $owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
-                    $autoenrolldates = &mt('Not enabled<br />Starts: ').
-                                       $autostart.'<br />'.$valid_classes;                }
+                    $autoenrolldates = &mt('Not enabled').'<br />'
+                                      .&mt('Starts: [_1]',$autostart)
+                                      .'<br />'.$valid_classes;
+                }
             }
         } else {
             if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) {
-                $autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend;
+                $autoenrolldates = &mt('Not enabled').'<br />'
+                                  .&mt('Ended: [_1]',$autoend);
             } else {
                 my $valid_classes = &get_valid_classes($seclist,$xlist_items,
                                                        $code,$owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
-                    $autoenrolldates = &mt('Currently enabled<br />').
+                    $autoenrolldates = &mt('Currently enabled').'<br />'.
                                        $valid_classes;
                 }
             }