--- loncom/interface/coursecatalog.pm	2010/01/02 23:32:06	1.53.4.3
+++ loncom/interface/coursecatalog.pm	2009/10/17 01:42:07	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.53.4.3 2010/01/02 23:32:06 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.55 2009/10/17 01:42:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,19 +149,13 @@ 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="'.
-                          $display_button.'" /></form><br /><br />');
+                          &mt('Display courses').'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
@@ -180,7 +174,7 @@ sub course_details {
     my $js = '<script type="text/javascript">'."\n".
              &courselink_javascript().'</script>'."\n";
     my $start_page =
-        &Apache::loncommon::start_page('Course/Community Catalog',$js,
+        &Apache::loncommon::start_page('Course Catalog',$js,
                                            {
                                              'add_entries' => \%add_entries,
                                              'no_inline_link'   => 1,});
@@ -188,7 +182,7 @@ sub course_details {
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Course/Community Catalog"});
+                  text=>"Select courses"});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
@@ -298,7 +292,7 @@ sub cat_header {
         if ($numtitles > 0) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Course/Community Catalog"},
+                  text=>"Select courses"},
                  {text=>"Course listing"});
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb
@@ -307,11 +301,11 @@ sub cat_header {
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/coursecatalog",
-          text=>"Course/Community Catalog"});
+          text=>"Select courses"});
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
     my $onchange;
-    unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) {
+    unless ($env{'form.interface'} eq 'textual') {
         $onchange = 'this.form.submit()';
     }
     $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
@@ -331,71 +325,73 @@ 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 $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr><td>';
+    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;
-    if (ref($cats[0]) eq 'ARRAY') {
-        if (@{$cats[0]} == 0) {
-            $catlinks .= &mt('No categories defined in this domain'); 
-        } elsif (@{$cats[0]} == 1) {
-            if ($cats[0][0] eq 'instcode') {
-                $catlinks .= &mt('Official courses (with institutional codes)');
-                $env{'form.currcat_0'} = 'instcode::0';
-            } elsif ($cats[0][0] eq 'communities') {
-                $catlinks .= &mt('Communities');
-                $env{'form.currcat_0'} = 'communities::0';
-            } else {
-                my $name = $cats[0][0];
-                my $item = &escape($name).'::0';
-                $catlinks .= $name;
-                $env{'form.currcat_0'} = $item;
+    for (my $i=0; $i<$deeper; $i++) {
+        $currcat_str .= '<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />';
+        my ($cattitle,$shallower);
+        if ($i == 0) {
+            if (ref($cats[0]) eq 'ARRAY') {
+                if (@{$cats[0]} > 1) {
+                    $cattitle = &mt('Main Categories');
+                }
             }
-            $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
         } else {
-            $catlinks .= &main_category_selector(@cats);
-            if (($env{'form.currcat_0'} ne '') && 
-                ($env{'form.currcat_0'} ne 'instcode::0')) {
-                $catlinks .= $crumbsymbol;
-            } else {
-                $catlinks .= '</td>';
-            }
-        }
-    } else {
-        $catlinks .= &mt('Official courses (with institutional codes)');
-                     $env{'form.currcat_0'} = 'instcode::0';
-        $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
-    }
-    if ($deeper) {
-        for (my $i=1; $i<=$deeper; $i++) {
-            my $shallower = $i-1;
-            next if ($shallower == 0);
+            $shallower = $i-1;
             my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
-            if ($cat ne '') {
-                $catlinks .= '<td valign="top">'.
-                             '<select name="currcat_'.$shallower.'" onchange="'.
-                             'setCatDepth('."'$shallower'".');this.form.submit();">';
-                if (ref($cats[$shallower]{$container}) eq 'ARRAY') {
-                    $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 $selected = '';
-                        if ($item eq $env{'form.currcat_'.$shallower}) {
-                            $selected = ' selected="selected"';
-                        }
-                        $catlinks .= 
-                           '<option value="'.$item.'"'.$selected.'>'.$name.'</option>';
+            $cattitle = $cat;
+        }
+        if ($cattitle ne '') {
+            $catlinks .= '<td valign="top"><a href="javascript:setCatDepth('."'$shallower'".')">'.$cattitle.'</a>'.$crumbsymbol.'</td>';
+        }
+    }
+    if ($deeper == 0) {
+        $catlinks .= '<td>';
+        if (ref($cats[0]) eq 'ARRAY') {
+            if ((@{$cats[0]} == 1) && (@cats == 1)) {
+                if ($cats[0][0] eq 'instcode') {
+                    $catlinks .= &mt('Official courses (with institutional codes)').
+                                 '<input type="hidden" name="currcat_0" value="instcode::0" />';
+                    $env{'form.currcat_0'} = 'instcode::0';
+                } else {
+                    my $name = $cats[0][0];
+                    my $item = &escape($name).'::0';
+                    $catlinks .= $name.
+                             '<input type="hidden" name="currcat_0" value="'.$item.'" />';
+                    $env{'form.currcat_0'} = $item;
+                }
+            } else {
+                $has_subcats = 1;
+                my $buttontext = &mt('Show subcategories');
+                $selitem = 'currcat_0';
+                $catlinks .= '<select name="'.$selitem.'">'."\n";
+                if (@{$cats[0]} > 1) {
+                    $catlinks .= '<option value="" selected="selected">'.&mt('Select').'</option>'."\n";
+                    $buttontext = &mt('Pick main category');
+                }
+                for (my $i=0; $i<@{$cats[0]}; $i++) {
+                    my $name = $cats[0][$i];
+                    my $item = &escape($name).'::0';
+                    $catlinks .= '<option value="'.$item.'">';
+                    if ($name eq 'instcode') {
+                        $catlinks .= &mt('Official courses (with institutional codes)');
+                    } else {
+                        $catlinks .= $name;
                     }
+                    $catlinks .= '</option>'."\n";
                 }
-                $catlinks .= '</select>';
+                $catlinks .= '</select>'."\n".
+                             '&nbsp;<input type="submit" name="gocats" value="'.
+                             $buttontext.'" />';
             }
-            unless ($i == $deeper) {
-                $catlinks .= $crumbsymbol;
-            } 
+        } else {
+            $catlinks .= &mt('Official courses (with institutional codes)').
+                         '<input type="hidden" name="currcat_0" value="instcode::0" />';
+            $env{'form.currcat_0'} = 'instcode::0';
         }
+    } else {
         my ($cat,$container,$depth);
         if ($env{'form.currcat_'.$currdepth} eq '') {
             my $shallower = $currdepth - 1;
@@ -403,66 +399,38 @@ sub category_breadcrumbs {
         } else {
             ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth});
         }
-        my $deeperlevel = $depth +1;
-        if (ref($cats[$deeperlevel]{$cat}) eq 'ARRAY') {
+        my $deeper = $depth +1;
+        my $currcat = $cat;
+        if ($cat eq 'instcode') {
+            $currcat = &mt('Official courses (with institutional codes)');
+        }
+        $catlinks .= '<td><b>'.$currcat.'</b>';
+        if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
             $has_subcats = 1;
             my $buttontext = &mt('Show subcategories');
-            my $selitem = 'currcat_'.$deeperlevel;
-            $catlinks .= '&nbsp;<select name="'.$selitem.'" onchange="this.form.submit()">';
-            if (@{$cats[$deeperlevel]{$cat}}) {
+            $selitem = 'currcat_'.$deeper;
+            $catlinks .= ':&nbsp;<select name="'.$selitem.'">';
+            if (@{$cats[$deeper]{$cat}} > 1) {
                 $catlinks .= '<option value="" selected="selected">'.
-                             &mt('Subcategory ...').'</option>';
+                             &mt('Select').'</option>';
+                $buttontext = &mt('Pick subcategory');
             }
-            for (my $k=0; $k<@{$cats[$deeperlevel]{$cat}}; $k++) {
-                my $name = $cats[$deeperlevel]{$cat}[$k];
-                my $item = &escape($name).':'.&escape($cat).':'.$deeperlevel;
+            for (my $k=0; $k<@{$cats[$deeper]{$cat}}; $k++) {
+                my $name = $cats[$deeper]{$cat}[$k];
+                my $item = &escape($name).':'.&escape($cat).':'.$deeper;
                 $catlinks .= '<option value="'.$item.'">'.$name.'</option>'."\n";
             }
-            $catlinks .= '</select>'."\n";
+            $catlinks .= '</select>'."\n".
+                         '&nbsp;<input type="submit" name="gocats" value="'.
+                         $buttontext.'" />';
         } elsif ($cat ne 'instcode') {
             $catlinks .= '&nbsp;'.&mt('(No subcategories)');
         }
-    } else {
-        $selitem = 'currcat_0';
     }
     $catlinks .= $currcat_str.'</td></tr></table></td>';
     return ($catlinks,$has_subcats,$selitem);
 }
 
-sub main_category_selector {
-    my (@cats) = @_;
-    my $maincatlinks = '<select name="currcat_0" onchange="setCatDepth('."'0'".');this.form.submit();">'."\n";
-    if (ref($cats[0]) eq 'ARRAY') {
-        if (@{$cats[0]} > 1) {
-            my $selected = '';
-            if ($env{'form.currcat_0'} eq '') {
-                $selected = ' selected="selected"';    
-            }
-            $maincatlinks .= 
-                '<option value=""'.$selected.'>'.&mt('Select').'</option>'."\n";
-        }
-        for (my $i=0; $i<@{$cats[0]}; $i++) {
-            my $name = $cats[0][$i];
-            my $item = &escape($name).'::0';
-            my $selected;
-            if ($env{'form.currcat_0'} eq $item) {
-                $selected = ' selected="selected"';
-            }
-            $maincatlinks .= '<option value="'.$item.'"'.$selected.'>';
-            if ($name eq 'instcode') {
-                $maincatlinks .= &mt('Official courses (with institutional codes)');
-            } elsif ($name eq 'communities') {
-                $maincatlinks .= &mt('Communities');
-            } else {
-                $maincatlinks .= $name;
-            }
-            $maincatlinks .= '</option>'."\n";
-        }
-        $maincatlinks .= '</select>'."\n";
-    }
-    return $maincatlinks;
-}
-
 sub get_depth_values {
     my $currdepth = 0;
     my $deeper = 0;
@@ -507,15 +475,10 @@ 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.'/>'.$selfenroll_text.
+               $show_selfenroll_status.'/>'.
+               &mt('Only show courses which allow self-enrollment').
                '</label></td></tr>';
     if (&user_is_dc($codedom)) {
         my $showdetails_status;
@@ -527,20 +490,14 @@ 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.'/>'.$details_text.
+                   $showdetails_status.'/>'.
+                   &mt('Show full details for each course ([_1] only)',$dc_title).
                    '</label>'."\n".'</td></tr><tr><td>'.
                    '<label><input type="checkbox" name="showhidden" value="1" '.
-                   $showhidden_status.'/>'.$hidden_text.
+                   $showhidden_status.'/>'.
+                   &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title).
                    '</label>'."\n".'</td></tr>';
     }
     $output .= '</table><br />';
@@ -601,18 +558,13 @@ sub search_courselist {
         } else {
             $filterstr = $filter; 
         }
-        my ($showhidden,$typefilter);
+        my $showhidden;
         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,
-                                          $typefilter,1,$env{'form.showselfenroll'},
+                                          '.',1,$env{'form.showselfenroll'},
                                           $filterstr,$showhidden,'coursecatalog');
     }
     return %courses;
@@ -644,11 +596,7 @@ sub print_course_listing {
             %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
-            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.');
-            }
+            $output = &mt('No courses match the criteria you selected.');
             return $output;
         }
         if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {