--- loncom/interface/coursecatalog.pm	2013/11/21 16:34:23	1.58.4.9
+++ loncom/interface/coursecatalog.pm	2012/10/04 13:41:10	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.58.4.9 2013/11/21 16:34:23 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.71 2012/10/04 13:41:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,20 +66,13 @@ sub handler {
     }
     my $formname = 'coursecatalog';
     if ($env{'form.showdom'} ne '') {
-        $env{'form.showdom'} = &LONCAPA::clean_domain($env{'form.showdom'});
         if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
             $codedom = $env{'form.showdom'};
-        } else {
-            $env{'form.showdom'} = '';
         }
     }
     my $domdesc = &Apache::lonnet::domain($codedom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
-    if ($env{'form.catalog_maxdepth'} ne '') {
-        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
-    }
-
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
     my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
@@ -189,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';
@@ -208,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:'));
@@ -312,9 +304,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') {
@@ -336,10 +326,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));
@@ -535,9 +522,9 @@ sub additional_filters {
     }
     my $selfenroll_text;
     if ($env{'form.currcat_0'} eq 'communities::0') {
-        $selfenroll_text = &mt('Only show communities which allow self-enrollment');
+        $selfenroll_text = &mt('Only show communities which currently allow self-enrollment (or will allow it in the future)');
     } else {
-        $selfenroll_text = &mt('Only show courses which allow self-enrollment');
+        $selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)');
     }
     $output .= '<tr><td>'.
                '<label><input type="checkbox" name="showselfenroll" value="1" '.
@@ -662,7 +649,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;
@@ -675,9 +662,15 @@ sub print_course_listing {
         }
         if (keys(%courses) == 0) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output = &mt('No communities match the criteria you selected.');
+                $output =
+                    '<p class="LC_info">'
+                   .&mt('No communities match the criteria you selected.')
+                   .'</p>';
             } else {
-                $output = &mt('No courses match the criteria you selected.');
+                $output =
+                    '<p class="LC_info">'
+                   .&mt('No courses match the criteria you selected.')
+                   .'</p>';
             }
             return $output;
         }
@@ -706,7 +699,7 @@ sub construct_data_table {
         $sortname{'Code'} = 'code';
         $sortname{'Categories'} = 'cats';
         $sortname{'Title'} = 'title';
-        $sortname{'Owner(s)'} = 'owner';
+        $sortname{'Owner & Co-owner(s)'} = 'owner';
     }
     my $output = &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row();
@@ -716,7 +709,7 @@ sub construct_data_table {
     } else {
         push(@coltitles,'Categories');
     }
-    push(@coltitles,('Sections','Crosslisted','Title','Owner(s)'));
+    push(@coltitles,('Sections','Crosslisted','Title','Owner & Co-owner(s)'));
     if (ref($usersections) eq 'HASH') {
        $coltitles[1] = 'Your Section';
     }
@@ -1011,9 +1004,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>';
             }