--- loncom/interface/coursecatalog.pm	2010/08/14 02:00:27	1.58.4.2
+++ loncom/interface/coursecatalog.pm	2010/12/20 22:56:56	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.58.4.2 2010/08/14 02:00:27 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.66 2010/12/20 22:56:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,10 +89,6 @@ sub handler {
                                            \%idx,\@jsarray,$subcats);
     my ($numtitles,@codetitles);
     if ($env{'form.coursenum'} ne '' && &user_is_known()) {
-        if ($env{'form.currcat_0'} eq 'instcode::0') {
-            $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   undef,undef,\@codetitles);
-        }
         &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
@@ -186,16 +182,14 @@ sub course_details {
              &courselink_javascript().'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
-                                           {
-                                             'add_entries' => \%add_entries,
-                                             'no_inline_link'   => 1,});
+                                           {'add_entries' => \%add_entries, });
     $r->print($start_page);
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
                   text=>"Course/Community Catalog"});
     }
-    my $brtextone = 'Course listing'; 
+    my $brtextone = 'Course listing';
     my $brtexttwo = 'Course details';
     if ($env{'form.currcat_0'} eq 'communities::0') {
         $brtextone = 'Community listing';
@@ -205,6 +199,7 @@ sub course_details {
              ({href=>"javascript:document.$formname.submit()",
               text=>$brtextone},
              {text=>$brtexttwo});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
     $r->print('<br />');
     if ($env{'form.currcat_0'} eq 'communities::0') {
         $r->print(&mt('Detailed community information:'));
@@ -310,9 +305,7 @@ sub cat_header {
     my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
     my $start_page =
         &Apache::loncommon::start_page('Other',$js,
-                                       {
-                                         'add_entries' => $add_entries,
-                                         'no_inline_link'   => 1,});
+                                       { 'add_entries' => $add_entries, });
     $r->print($start_page);
     my $brtext = 'Course listing';
     if ($env{'form.currcat_0'} eq 'communities::0') {
@@ -334,10 +327,7 @@ sub cat_header {
           text=>"Course/Community Catalog"});
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    my $onchange;
-    unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 'this.form.submit()';
-    }
+    my $onchange = 'this.form.submit()';
     $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
               '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
               &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
@@ -405,7 +395,7 @@ sub category_breadcrumbs {
                     $catlinks .= '<option value="">'.&mt('De-select').'</option>';
                     for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) {
                         my $name = $cats[$shallower]{$container}[$j];
-                        my $item = &escape($name).':'.$container.':'.$shallower;
+                        my $item = &escape($name).':'.&escape($container).':'.$shallower;
                         my $selected = '';
                         if ($item eq $env{'form.currcat_'.$shallower}) {
                             $selected = ' selected="selected"';
@@ -660,7 +650,7 @@ sub print_course_listing {
         if (keys(%courses) == 0) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= &mt('The courseID provided does not match a community in this domain.');
-            } else {
+            } else { 
                 $output .= &mt('The courseID provided does not match a course in this domain.');
             }
             return $output;
@@ -1009,9 +999,9 @@ sub courseinfo_row {
         if ($details) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= '<td>'.$accessdates.'</td>';
-            } else {
+            } else { 
                 $output .=
-                    '<td>'.$accessdates.'</td>'.
+                    '<td>'.$accessdates.'</td>'. 
                     '<td>'.$counts.'</td>'.
                     '<td>'.$autoenrollment.'</td>';
             }
@@ -1027,7 +1017,13 @@ 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="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a></td>';
+                $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a><br />';
+                if ($info->{'selfenroll_end'} == 0) {
+                    $output .= &mt('Available permanently');
+                } elsif ($info->{'selfenroll_end'} > $now) {
+                    $output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+                }
+                $output .= '</td>';
             }
             $selfenroll = 1;
         }