--- loncom/interface/coursecatalog.pm	2009/05/27 16:54:57	1.52
+++ loncom/interface/coursecatalog.pm	2009/11/23 21:45:18	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.52 2009/05/27 16:54:57 www Exp $
+# $Id: coursecatalog.pm,v 1.57 2009/11/23 21:45:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,13 +149,19 @@ ENDJS
                 for (my $i=0; $i<$deeper; $i++) {
                     $r->print('<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />'."\n");
                 }
+                my $display_button;
+                if ($env{'form.currcat_0'} eq 'communities::0') {
+                    $display_button = &mt('Display communities');
+                } else {
+                    $display_button = &mt('Display courses');
+                }
                 $r->print('<input type="hidden" name="coursenum" value="" />'."\n".
                           '<input type="hidden" name="sortby" value="" />'."\n".
                           '<input type="hidden" name="state" value="listing" />'."\n".
                           '<input type="hidden" name="showdom" value="'.
                           $env{'form.showdom'}.'" />'.
                           '<input type="submit" name="catalogfilter" value="'.
-                          &mt('Display courses').'" /></form><br /><br />');
+                          $display_button.'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
@@ -174,7 +180,7 @@ sub course_details {
     my $js = '<script type="text/javascript">'."\n".
              &courselink_javascript().'</script>'."\n";
     my $start_page =
-        &Apache::loncommon::start_page('Course Catalog',$js,
+        &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                            {
                                              'add_entries' => \%add_entries,
                                              'no_inline_link'   => 1,});
@@ -182,13 +188,13 @@ sub course_details {
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Select courses"});
+                  text=>"Course/Community Catalog"});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
               text=>"Course listing"},
              {text=>"Course details"});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
     $r->print('<br />'.&mt('Detailed course information:').'<br /><br />'.
               &print_course_listing($codedom,undef,$trails,$allitems).
               '<br /><br />');
@@ -292,22 +298,21 @@ sub cat_header {
         if ($numtitles > 0) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Select courses"},
+                  text=>"Course/Community Catalog"},
                  {text=>"Course listing"});
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb
             ({text=>"Course listing"});
         }
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/coursecatalog",
-          text=>"Select courses"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
+          text=>"Course/Community Catalog"});
     }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
     my $onchange;
     unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 1;
+        $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>'.
@@ -326,7 +331,9 @@ sub category_breadcrumbs {
     my ($dom,@cats) = @_;
     my $crumbsymbol = ' &#x25b6; ';
     my ($currdepth,$deeper) = &get_depth_values();
-    my $currcat_str = '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" /><input type="hidden" name="showdom" value="'.$dom.'" />';
+    my $currcat_str = 
+        '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" />'.
+        '<input type="hidden" name="showdom" value="'.$dom.'" />';
     my $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr>';
     my $has_subcats;
     my $selitem;
@@ -356,6 +363,10 @@ sub category_breadcrumbs {
                     $catlinks .= &mt('Official courses (with institutional codes)').
                                  '<input type="hidden" name="currcat_0" value="instcode::0" />';
                     $env{'form.currcat_0'} = 'instcode::0';
+                } elsif ($cats[0][0] eq 'communities') {
+                    $catlinks .= &mt('Communities').
+                                 '<input type="hidden" name="currcat_0" value="instcode::0" />';
+                    $env{'form.currcat_0'} = 'communities::0';
                 } else {
                     my $name = $cats[0][0];
                     my $item = &escape($name).'::0';
@@ -378,6 +389,8 @@ sub category_breadcrumbs {
                     $catlinks .= '<option value="'.$item.'">';
                     if ($name eq 'instcode') {
                         $catlinks .= &mt('Official courses (with institutional codes)');
+                    } elsif ($name eq 'communities') {
+                        $catlinks .= &mt('Communities');
                     } else {
                         $catlinks .= $name;
                     }
@@ -404,6 +417,8 @@ sub category_breadcrumbs {
         my $currcat = $cat;
         if ($cat eq 'instcode') {
             $currcat = &mt('Official courses (with institutional codes)');
+        } elsif ($cat eq 'communities') {
+            $currcat = &mt('Communities');
         }
         $catlinks .= '<td><b>'.$currcat.'</b>';
         if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
@@ -476,10 +491,15 @@ sub additional_filters {
     if ($env{'form.showselfenroll'}) {
         $show_selfenroll_status = 'checked="checked" ';
     }
+    my $selfenroll_text;
+    if ($env{'form.currcat_0'} eq 'communities::0') {
+        $selfenroll_text = &mt('Only show communities which allow self-enrollment');
+    } else {
+        $selfenroll_text = &mt('Only show courses which allow self-enrollment');
+    }
     $output .= '<tr><td>'.
                '<label><input type="checkbox" name="showselfenroll" value="1" '.
-               $show_selfenroll_status.'/>'.
-               &mt('Only show courses which allow self-enrollment').
+               $show_selfenroll_status.'/>'.$selfenroll_text.
                '</label></td></tr>';
     if (&user_is_dc($codedom)) {
         my $showdetails_status;
@@ -491,14 +511,20 @@ sub additional_filters {
              $showhidden_status = 'checked="checked" ';
         }
         my $dc_title = &Apache::lonnet::plaintext('dc');
+        my ($details_text,$hidden_text);
+        if ($env{'form.currcat_0'} eq 'communities::0') {
+            $details_text = &mt('Show full details for each community ([_1] only)',$dc_title);
+            $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title);
+        } else {
+            $details_text = &mt('Show full details for each course ([_1] only)',$dc_title);
+            $hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title);
+        }
         $output .= '<tr><td>'."\n".
                    '<label><input type="checkbox" name="showdetails" value="1" '.
-                   $showdetails_status.'/>'.
-                   &mt('Show full details for each course ([_1] only)',$dc_title).
+                   $showdetails_status.'/>'.$details_text.
                    '</label>'."\n".'</td></tr><tr><td>'.
                    '<label><input type="checkbox" name="showhidden" value="1" '.
-                   $showhidden_status.'/>'.
-                   &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title).
+                   $showhidden_status.'/>'.$hidden_text.
                    '</label>'."\n".'</td></tr>';
     }
     $output .= '</table><br />';
@@ -559,13 +585,18 @@ sub search_courselist {
         } else {
             $filterstr = $filter; 
         }
-        my $showhidden;
+        my ($showhidden,$typefilter);
         if (&user_is_dc($domain)) {
             $showhidden = $env{'form.showhidden'};
         }
+        if ($env{'form.currcat_0'} eq 'communities::0') {
+            $typefilter = 'Community';
+        } else {
+            $typefilter = '.';
+        }
         %courses = 
             &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef,
-                                          '.',1,$env{'form.showselfenroll'},
+                                          $typefilter,1,$env{'form.showselfenroll'},
                                           $filterstr,$showhidden,'coursecatalog');
     }
     return %courses;
@@ -597,7 +628,11 @@ sub print_course_listing {
             %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
-            $output = &mt('No courses match the criteria you selected.');
+            if ($env{'form.currcat_0'} eq 'communities::0') {
+                $output = &mt('No communities match the criteria you selected.');
+            } else {
+                $output = &mt('No courses match the criteria you selected.');
+            }
             return $output;
         }
         if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {
@@ -733,7 +768,7 @@ sub build_courseinfo_hash {
             }
         }
         foreach my $owner (@owners) {
-            my ($ownername,$ownerdom) = @_; 
+            my ($ownername,$ownerdom); 
             if ($owner =~ /:/) {
                 ($ownername,$ownerdom) = split(/:/,$owner);
             } else {