--- loncom/interface/coursecatalog.pm	2008/07/06 17:59:25	1.35
+++ 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.35 2008/07/06 17:59:25 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.55 2009/10/17 01:42:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,8 @@ sub handler {
     }
     &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['sortby','showdom']);
 
     my $codedom = &Apache::lonnet::default_login_domain();
 
@@ -74,38 +75,45 @@ sub handler {
 
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
-    my (@cats,@trails,%allitems,%idx,@jsarray,$cathash);
+    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
         $cathash = $domconfig{'coursecategories'}{'cats'};
     } else {
         $cathash = {};
     }
+    my $subcats;
+    if ($env{'form.withsubcats'}) {
+        $subcats = \%subcathash;
+    }
     &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
-                                           \%idx,\@jsarray);
+                                           \%idx,\@jsarray,$subcats);
     if ($env{'form.coursenum'} ne '' && &user_is_known()) {
         &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems);
     } else {
-        my $catlinks = &category_breadcrumbs($codedom,@cats);
+        my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
         my $catjs = <<"ENDSCRIPT";
 
 function setCatDepth(depth) {
     document.coursecats.catalog_maxdepth.value = depth;
+    if (depth == '') {
+        document.coursecats.currcat_0.value = '';
+    }
     document.coursecats.submit();
     return;
 }
 
-ENDSCRIPT
-        if ($env{'form.state'} eq 'listing') {
-            $catjs .= qq|
 function changeSort(caller) {
     document.$formname.sortby.value = caller;
     document.$formname.submit();
 }
+
 function setCourseId(caller) {
     document.$formname.coursenum.value = caller;
     document.$formname.submit();
-}\n|;
-        }
+}
+
+ENDSCRIPT
+        $catjs .= &courselink_javascript(); 
         my $numtitles;
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
@@ -115,13 +123,27 @@ function setCourseId(caller) {
             }
         } else {
             my (%add_entries);
+            my ($currdepth,$deeper) = &get_depth_values();
+            if ($selitem) {
+                my $alert = &mt('Choose a subcategory to display');
+                if (!$deeper) {
+                    $alert = &mt('Choose a category to display');
+                }
+                $catjs .= <<ENDJS;
+function check_selected() {
+    if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") {
+        alert('$alert');
+        return false;
+    }
+}
+ENDJS
+            }
             $catjs = '<script type="text/javascript">'."\n".$catjs."\n".'</script>';
             &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks);
             if ($env{'form.currcat_0'} ne '') {
                 $r->print('<form name="'.$formname.
                           '" method="post" action="/adm/coursecatalog">'.
-                          &additional_filters($codedom)."\n");
-                my ($currdepth,$deeper) = &get_depth_values();
+                          &additional_filters($codedom,$has_subcats)."\n");
                 $r->print('<input type="hidden" name="catalog_maxdepth" value="'.
                           $deeper.'" />'."\n");
                 for (my $i=0; $i<$deeper; $i++) {
@@ -136,7 +158,7 @@ function setCourseId(caller) {
                           &mt('Display courses').'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems));
+                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
             }
         }
     }
@@ -149,8 +171,10 @@ sub course_details {
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
+    my $js = '<script type="text/javascript">'."\n".
+             &courselink_javascript().'</script>'."\n";
     my $start_page =
-        &Apache::loncommon::start_page('Course Catalog','',
+        &Apache::loncommon::start_page('Course Catalog',$js,
                                            {
                                              'add_entries' => \%add_entries,
                                              'no_inline_link'   => 1,});
@@ -164,16 +188,42 @@ sub course_details {
              ({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 />'.
-              '<form name="'.$formname.'" method="post">'.
               &print_course_listing($codedom,undef,$trails,$allitems).
               '<br /><br />');
-    $r->print('<a href = "javascript:document.coursecatalog.submit()">'.
+    $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
+              '<a href = "javascript:document.coursecatalog.submit()">'.
               &mt('Back to course listing').'</a>'.
-              '<input type="hidden" name="sortby" value="'.
-              $env{'form.sortby'}.'" />'.
-              '<input type="hidden" name="state" value="listing" /></form>');
+              &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
+                                                       'showdetails','courseid']).'</form>');
+    return;
+}
+
+sub courselink_javascript {
+    return <<"END";
+
+function ToSyllabus(cdom,cnum) {
+    if (cdom == '' || cdom == null) {
+        return;
+    }
+    if (cnum == '' || cnum == null) {
+        return;
+    }
+    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
 }
 
 sub instcode_course_selector {
@@ -183,79 +233,17 @@ sub instcode_course_selector {
     my @codetitles = ();
     my %cat_titles = ();
     my %cat_order = ();
-    my %idlist = ();
-    my %idnums = ();
-    my %idlist_titles = ();
-    my %by_year;
-    my %by_sem;
-    my %by_dept;
     my %cat_items;
     my $caller = 'global';
     my $format_reply;
-    my $totcodes = 0;
-    my $jscript = '';
-    my ($numtitles,$lasttitle);
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
-    my $js;
-    $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
-    if ($totcodes > 0) {
-        $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
-        if ($format_reply eq 'ok') {
-            my $numtypes = @codetitles;
-            &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
-            my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
-            my $longtitles_str = join('","',@{$longtitles});
-            my $allidlist = $idlist{$codetitles[0]};
-            $numtitles = @codetitles;
-            $lasttitle = $numtitles;
-            if ($numtitles > 4) {
-                $lasttitle = 4;
-            }
-            if ($numtitles == 0) {
-                if (!defined($env{'form.state'})) {
-                    $env{'form.state'} = 'listing';
-                }
-            } else {
-                my @data = ('top');
-                for (my $k=0; $k<$lasttitle; $k++) {
-                    my $cat = $codetitles[$k];
-                    my $level = 1;
-                    $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept);
-                }
-                $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
-                $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
-                if ($env{'form.state'} eq 'listing') {
-                    $jscript .= '
-function setElements() {
-';
-                    for (my $i=0; $i<@codetitles-1; $i++) {
-                        if ($env{'form.'.$codetitles[$i]} != -1) {
-                            $jscript .= '
-    for (var j=0; j<document.'.$formname.'.'.$codetitles[$i].'.length; j++) {
-        if (document.'.$formname.'.'.$codetitles[$i].'[j].value == "'.$env{'form.'.$codetitles[$i]}.'") {
-            document.'.$formname.'.'.$codetitles[$i].'.selectedIndex = j;
-        }
-    }
-';
-                        }
-                    }
-                    $jscript .= '   courseSet()'."\n";
-                    if ($env{'form.'.$codetitles[-1]} != -1) {
-                        $jscript .= '
-    for (var j=0; j<document.'.$formname.'.'.$codetitles[-1].'.length; j++) {
-        if (document.'.$formname.'.'.$codetitles[-1].'[j].value == "'.$env{'form.'.$codetitles[-1]}.'") {
-            document.'.$formname.'.'.$codetitles[-1].'.selectedIndex = j;
-        }
-    }
-';
-                    }
-                    $jscript .= '}';
-                }
-            }
-        }
-        $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n".
+    my ($jscript,$totcodes,$numtitles,$lasttitle) = 
+        &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
+                           \%cat_items,\@codetitles,\%cat_titles,\%cat_order);
+    my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n".
               '</script>';
+    if ($totcodes) {
         if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
             $add_entries{'onLoad'} = 'setElements()';
         }
@@ -267,43 +255,9 @@ function setElements() {
                   '<input type="hidden" name="currcat_0" value="instcode::0" />'.
                   &additional_filters($codedom));
         if ($numtitles > 0) {
-            $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />');
-            $r->print('<table><tr>');
-            for (my $k=0; $k<$lasttitle-1; $k++) {
-                my (@items,@unsorted);
-                if (ref($cat_items{$codetitles[$k]}) eq 'ARRAY') {
-                    @unsorted = @{$cat_items{$codetitles[$k]}};
-                }
-                &Apache::courseclassifier::sort_cats($k,\%cat_order,\@codetitles,\@unsorted,\@items);
-                my @longitems;
-                if (defined($cat_titles{$codetitles[$k]})) {
-                    foreach my $item (@items) {
-                        push(@longitems,$cat_titles{$codetitles[$k]}{$item});
-                    }
-                } else {
-                    @longitems = @items;
-                }
-                $r->print('<td align="center">'.$codetitles[$k].'<br />'."\n".
-                          '<select name="'.$codetitles[$k].'" onChange="courseSet()"');
-                $r->print('>'."\n".'<option value="0" />All'."\n");
-                for (my $i=0; $i<@items; $i++) {
-                    if ($longitems[$i] eq '') {
-                        $longitems[$i] = $items[$i];
-                    }
-                    $r->print(' <option value="'.$items[$i].'">'.$longitems[$i].'</option>');
-                }
-                $r->print('</select></td>');
-            }
-            $r->print('<td align="center">'.$codetitles[$lasttitle-1].'<br />'."\n".
-                      '<select name="'.$codetitles[$lasttitle-1].'">'."\n".
-                      '<option value="0">All'."\n".
-                      '</option>'."\n".'</select>'."\n".
-                 '</td></tr></table>'."\n");
-            if ($numtitles > 4) {
-                $r->print('<br /><br />'.$codetitles[$numtitles-1].'<br />'."\n".
-                '<input type="text" name="'.$codetitles[$numtitles-1].'" /><br />'."\n");
-            }
-            $r->print('<br />');
+            $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'.
+                      &Apache::courseclassifier::build_instcode_selectors($numtitles,
+                       $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order));
         }
         $r->print('<input type="hidden" name="coursenum" value="" />'."\n".
                   '<input type="hidden" name="sortby" value="" />'."\n".
@@ -312,11 +266,9 @@ function setElements() {
                   '<input type="submit" name="catalogfilter" value="'.
                   &mt('Display courses').'" />'.
                   '<input type="hidden" name="numtitles" value="'.$numtitles.
-                  '" /></form>');
-        if (($numtitles > 0) && ($env{'form.state'} eq 'listing')) {
-            $r->print('<br />');
-        }
+                  '" /></form><br /><br />');
     } else {
+        $js = '<script type"text/javascript">'."\n$catjs\n".'</script>';
         &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
         $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
@@ -331,7 +283,7 @@ function setElements() {
 sub cat_header {
     my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
     my $start_page =
-        &Apache::loncommon::start_page('Course Catalog',$js,
+        &Apache::loncommon::start_page('Other',$js,
                                        {
                                          'add_entries' => $add_entries,
                                          'no_inline_link'   => 1,});
@@ -346,63 +298,83 @@ sub cat_header {
             &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'));
+    }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+    my $onchange;
+    unless ($env{'form.interface'} eq 'textual') {
+        $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).
-	      '&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" /></td></tr></table></form>'.
-	      '<form name="coursecats" method="post" action="/adm/coursecatalog">'.
+              &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
+    if (!$onchange) {
+	   $r->print('&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" />');
+    }
+    $r->print('</td></tr></table></form>'.
+	      '<form name="coursecats" method="post" action="/adm/coursecatalog"'.
+              ' onsubmit="return check_selected();">'.
               '<table border="0"><tr>'.$catlinks.'</tr></table></form>');
     return;
 }
 
 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>';
+    my $has_subcats;
+    my $selitem;
     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) {
-            $cattitle = &mt('Main Categories');
+            if (ref($cats[0]) eq 'ARRAY') {
+                if (@{$cats[0]} > 1) {
+                    $cattitle = &mt('Main Categories');
+                }
+            }
         } else {
             $shallower = $i-1;
             my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
             $cattitle = $cat;
         }
-        $catlinks .= '<td valign="top"><a href="javascript:setCatDepth('."'$shallower'".')">'.$cattitle.'</a>-&gt;</td>';
+        if ($cattitle ne '') {
+            $catlinks .= '<td valign="top"><a href="javascript:setCatDepth('."'$shallower'".')">'.$cattitle.'</a>'.$crumbsymbol.'</td>';
+        }
     }
     if ($deeper == 0) {
-        $catlinks .= '<td>'.&mt('Main Categories').':&nbsp;';
+        $catlinks .= '<td>';
         if (ref($cats[0]) eq 'ARRAY') {
-            if ((@{$cats[0]} == 1) && ($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';
+            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 {
-                $catlinks .= '<select name="currcat_0">'."\n";
+                $has_subcats = 1;
+                my $buttontext = &mt('Show subcategories');
+                $selitem = 'currcat_0';
+                $catlinks .= '<select name="'.$selitem.'">'."\n";
                 if (@{$cats[0]} > 1) {
-                    my $selstr;
-                    if ($env{'form.currcat_0'} eq '') {
-                        $selstr = ' selected="selected" ';
-                    }
-                    $catlinks .= '<option value=""'.$selstr.'>'.&mt('Select').'</option>'."\n";
+                    $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';
-                    my $selstr;
-                    if ($env{'form.currcat_'.$i} eq $item) {
-                        $selstr = ' selected="selected" ';
-                    }
-                    $catlinks .= '<option value="'.$item.'"'.$selstr.'>';
+                    $catlinks .= '<option value="'.$item.'">';
                     if ($name eq 'instcode') {
                         $catlinks .= &mt('Official courses (with institutional codes)');
                     } else {
@@ -411,7 +383,8 @@ sub category_breadcrumbs {
                     $catlinks .= '</option>'."\n";
                 }
                 $catlinks .= '</select>'."\n".
-                             '&nbsp;<input type="submit" name="gocats" value="'.&mt('Change').'" />';
+                             '&nbsp;<input type="submit" name="gocats" value="'.
+                             $buttontext.'" />';
             }
         } else {
             $catlinks .= &mt('Official courses (with institutional codes)').
@@ -431,21 +404,31 @@ sub category_breadcrumbs {
         if ($cat eq 'instcode') {
             $currcat = &mt('Official courses (with institutional codes)');
         }
-        $catlinks .= '<td>'.$currcat;
+        $catlinks .= '<td><b>'.$currcat.'</b>';
         if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
-            $catlinks .= ':&nbsp;<select name="currcat_'.$deeper.'">'.
-                         '<option value="" selected="selected">'.&mt('Select').'</option>';
+            $has_subcats = 1;
+            my $buttontext = &mt('Show subcategories');
+            $selitem = 'currcat_'.$deeper;
+            $catlinks .= ':&nbsp;<select name="'.$selitem.'">';
+            if (@{$cats[$deeper]{$cat}} > 1) {
+                $catlinks .= '<option value="" selected="selected">'.
+                             &mt('Select').'</option>';
+                $buttontext = &mt('Pick subcategory');
+            }
             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".
-                         '&nbsp;<input type="submit" name="gocats" value="'.&mt('Change').'" />';
+                         '&nbsp;<input type="submit" name="gocats" value="'.
+                         $buttontext.'" />';
+        } elsif ($cat ne 'instcode') {
+            $catlinks .= '&nbsp;'.&mt('(No subcategories)');
         }
     }
     $catlinks .= $currcat_str.'</td></tr></table></td>';
-    return $catlinks;
+    return ($catlinks,$has_subcats,$selitem);
 }
 
 sub get_depth_values {
@@ -463,12 +446,40 @@ sub get_depth_values {
 }
 
 sub additional_filters {
-    my ($codedom) = @_;
+    my ($codedom,$has_subcats) = @_;
     my $output = '<table>';
+    if (($env{'form.currcat_0'} ne 'instcode::0') && 
+        ($env{'form.currcat_0'} ne '') && ($has_subcats)) {
+        my $include_subcat_status;
+        if ($env{'form.withsubcats'}) {
+            $include_subcat_status = 'checked="checked" ';
+        }
+        my $counter = $env{'form.catalog_maxdepth'};
+        if ($counter > 0) {
+            if ($env{'form.state'} eq 'listing') {
+                $counter --;
+            } elsif ($env{'form.currcat_'.$counter} eq '') {
+                $counter --;
+            }
+        }
+        my ($catname) = split(/:/,$env{'form.currcat_'.$counter});
+        if ($catname ne '') {
+            $output .= '<tr><td><label>'.
+                       '<input type="checkbox" name="withsubcats" value="1" '.
+                       $include_subcat_status.'/>'.
+                       &mt('Include subcategories within "[_1]"',
+                           &unescape($catname)).'</label></td></tr>';
+        }
+    }
     my $show_selfenroll_status;
     if ($env{'form.showselfenroll'}) {
         $show_selfenroll_status = 'checked="checked" ';
     }
+    $output .= '<tr><td>'.
+               '<label><input type="checkbox" name="showselfenroll" value="1" '.
+               $show_selfenroll_status.'/>'.
+               &mt('Only show courses which allow self-enrollment').
+               '</label></td></tr>';
     if (&user_is_dc($codedom)) {
         my $showdetails_status;
         if ($env{'form.showdetails'}) {
@@ -481,7 +492,7 @@ sub additional_filters {
         my $dc_title = &Apache::lonnet::plaintext('dc');
         $output .= '<tr><td>'."\n".
                    '<label><input type="checkbox" name="showdetails" value="1" '.
-                   $showdetails_status.'/>'."\n".
+                   $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" '.
@@ -489,11 +500,7 @@ sub additional_filters {
                    &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title).
                    '</label>'."\n".'</td></tr>';
     }
-    $output .= '<tr><td>'.
-               '<label><input type="checkbox" name="showselfenroll" value="1" '.
-               $show_selfenroll_status.'/>'.
-               &mt('Only show courses which allow self-enrollment').
-               '</label></td></tr></table><br />';
+    $output .= '</table><br />';
     return $output;
 }
 
@@ -510,113 +517,9 @@ sub user_is_dc {
     return;
 }
 
-sub recurse_options {
-    my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_;
-    if (ref($currlist) eq 'HASH') {
-        $level ++;
-        foreach my $key (sort(keys(%{$currlist}))) {
-            $$data[$level-1]= $key;
-            &recurse_options($key,$currlist->{$key},$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept);
-        }
-    } else {
-        $level --;
-        my @contents = split(/","/,$currlist);
-        foreach my $item (@contents) {
-            if (!grep(/^\Q$item\E$/,@{$cat_options->{$cat}})) {
-                push(@{$cat_options->{$cat}},$item);
-            }
-            if ($level == 3) {
-                if (!grep/^\Q$item\E$/,@{$by_year->{$data->[1]}->{$currkey}}) {
-                    push(@{$by_year->{$data->[1]}->{$currkey}},$item);                 
-                }
-                if (!grep/^\Q$item\E$/,@{$by_sem->{$data->[2]}->{$currkey}}) {
-                    push(@{$by_sem->{$data->[2]}->{$currkey}},$item);
-                }
-                if (!grep/^\Q$item\E$/,@{$by_dept->{$currkey}}) {
-                    push(@{$by_dept->{$currkey}},$item);
-                }
-
-            }
-        }
-    }
-    return $level;
-}
-
-sub build_javascript {
-    my ($by_year,$by_sem,$by_dept,$cat_order,$codetitles) = @_;
-    my @unsorted = keys(%{$by_year});
-    my @sorted_yrs; 
-    &Apache::courseclassifier::sort_cats('0',$cat_order,$codetitles,\@unsorted,\@sorted_yrs);
-    my $output = 'var idcse_by_yr_year = new Array("'.join('","',@sorted_yrs).'");'."\n".
-                 'var idcse_by_yr_dept = new Array('.scalar(@sorted_yrs).');'."\n".
-                 'var idcse_by_yr_num = new Array('.scalar(@sorted_yrs).');'."\n";
-    for (my $i=0; $i<@sorted_yrs; $i++) {
-        my $numkeys = keys(%{$by_year->{$sorted_yrs[$i]}});
-        $output .= " idcse_by_yr_num[$i] = new Array($numkeys);\n";
-        if (ref($by_year->{$sorted_yrs[$i]}) eq 'HASH') {
-            @unsorted = keys(%{$by_year->{$sorted_yrs[$i]}});
-            my @sorted_depts;
-            &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts);
-            $output .= qq| idcse_by_yr_dept[$i] = new Array ("|.join('","',@sorted_depts).'");'."\n";
-            for (my $j=0; $j<@sorted_depts; $j++) {
-                $output .= qq| idcse_by_yr_num[$i][$j] = new Array ("|;
-                $output .= join('","',sort(@{$by_year->{$sorted_yrs[$i]}->{$sorted_depts[$j]}})).'");'."\n";
-            }
-        }
-    }
-    @unsorted = keys(%{$by_sem});
-    my @sorted_sems;
-    &Apache::courseclassifier::sort_cats('1',$cat_order,$codetitles,\@unsorted,\@sorted_sems);
-    $output .=  'idcse_by_sem_sems = new Array("'.join('","',@sorted_sems).'");'."\n".
-                'idcse_by_sem_dept = new Array('.scalar(@sorted_sems).');'."\n".
-                'idcse_by_sem_num = new Array('.scalar(@sorted_sems).');'."\n";
-    for (my $i=0; $i<@sorted_sems; $i++) {
-        my $numkeys = keys(%{$by_sem->{$sorted_sems[$i]}});
-        $output .= " idcse_by_sem_num[$i] = new Array($numkeys);\n";
-        if (ref($by_sem->{$sorted_sems[$i]}) eq 'HASH') {
-            @unsorted = keys(%{$by_sem->{$sorted_sems[$i]}});
-            my @sorted_depts;
-            &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts);
-            $output .= qq| idcse_by_sem_dept[$i] = new Array("|.join('","',@sorted_depts).'");'."\n";
-            for (my $j=0; $j<@sorted_depts; $j++) {
-                $output .= qq| idcse_by_sem_num[$i][$j] = new Array ("|.join('","',sort(@{$by_sem->{$sorted_sems[$i]}->{$sorted_depts[$j]}})).'");'."\n";
-            }
-        }
-    }
-    @unsorted = keys(%{$by_dept});
-    my @sorted_deps;
-    &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_deps);
-    $output .= 'idcse_by_dep = new Array('.scalar(@sorted_deps).');'."\n"; 
-    for (my $k=0; $k<@sorted_deps; $k++) {
-        $output .= qq| idcse_by_dep[$k] = new Array ("|.join('","',sort(@{$by_dept->{$sorted_deps[$k]}})).'");'."\n";
-    }
-    return $output;
-}
-
 sub search_official_courselist {
     my ($domain,$numtitles) = @_;
-    my $instcode;
-    if (defined($numtitles) && $numtitles == 0) {
-        $instcode = '.+';
-    } else {
-        my (%codedefaults,@code_order);
-        my $defaults_result = 
-            &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults,
-                                                    \@code_order);
-        if ($defaults_result eq 'ok') {
-            $instcode ='^';
-            foreach my $item (@code_order) {
-                if ($env{'form.'.$item} eq '0' ) {
-                    $instcode .= $codedefaults{$item}; 
-                } else {
-                    $instcode .= $env{'form.'.$item};
-                }
-            }
-            $instcode .= '$';
-        } else {
-            $instcode = '.';
-        }
-    }
+    my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles);
     my $showhidden;
     if (&user_is_dc($domain)) {
         $showhidden = $env{'form.showhidden'};
@@ -629,7 +532,7 @@ sub search_official_courselist {
 }
 
 sub search_courselist {
-    my ($domain) = @_;
+    my ($domain,$subcats) = @_;
     my $cat_maxdepth = $env{'form.catalog_maxdepth'};
     my $filter = $env{'form.currcat_'.$cat_maxdepth};
     if (($filter eq '') && ($cat_maxdepth > 0)) {
@@ -637,7 +540,24 @@ sub search_courselist {
         $filter = $env{'form.currcat_'.$shallower};
     }
     my %courses;
+    my $filterstr;
     if ($filter ne '') {
+        if ($env{'form.withsubcats'}) {
+            if (ref($subcats) eq 'HASH') {
+                if (ref($subcats->{$filter}) eq 'ARRAY') {
+                    $filterstr = join('&',@{$subcats->{$filter}});
+                    if ($filterstr ne '') {
+                        $filterstr = $filter.'&'.$filterstr;
+                    }
+                } else {
+                    $filterstr = $filter;
+                }
+            } else {
+                $filterstr = $filter;
+            }  
+        } else {
+            $filterstr = $filter; 
+        }
         my $showhidden;
         if (&user_is_dc($domain)) {
             $showhidden = $env{'form.showhidden'};
@@ -645,13 +565,13 @@ sub search_courselist {
         %courses = 
             &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef,
                                           '.',1,$env{'form.showselfenroll'},
-                                          $filter,$showhidden,'coursecatalog');
+                                          $filterstr,$showhidden,'coursecatalog');
     }
     return %courses;
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -673,7 +593,7 @@ sub print_course_listing {
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             %courses = &search_official_courselist($domain,$numtitles);
         } else {
-            %courses = &search_courselist($domain);
+            %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
             $output = &mt('No courses match the criteria you selected.');
@@ -689,7 +609,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 .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']);
+    $output .= "\n".'<form name="linklaunch" method="post" action="">'.
+               '<input type="hidden" name="backto" value="coursecatalog" />'.
+               '<input type="hidden" name="courseid" value="" />'.
+               &Apache::lonhtmlcommon::echo_form_input(['catalogfilter','courseid']).'</form>';
     return $output;
 }
 
@@ -731,7 +654,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>';
         }
@@ -790,7 +713,7 @@ sub build_courseinfo_hash {
         $cleandesc=~s/'/\\'/g;
         $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
-        my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types,
+        my ($instcode,$singleowner,$ttype,$selfenroll_types,
             $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
         if (ref($courses->{$course}) eq 'HASH') {
             $descr = $courses->{$course}{'description'};
@@ -809,7 +732,7 @@ sub build_courseinfo_hash {
             }
         }
         foreach my $owner (@owners) {
-            my ($ownername,$ownerdom) = @_; 
+            my ($ownername,$ownerdom); 
             if ($owner =~ /:/) {
                 ($ownername,$ownerdom) = split(/:/,$owner);
             } else {
@@ -878,10 +801,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)) {
@@ -902,10 +825,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 />';
                         }
                     }
                 }
@@ -940,10 +863,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;
 }
@@ -992,7 +915,7 @@ sub courseinfo_row {
                '<td>'.$xlist_items.'</td>'.
                '<td>'.$title.'&nbsp;<font size="-2">';
     if ($showsyllabus) {
-        $output .= &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom);
+        $output .= '<a href="javascript:ToSyllabus('."'$cdom','$cnum'".')">'.&mt('Syllabus').'</a>';
     } else {
         $output .= '&nbsp;';
     }
@@ -1016,7 +939,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;
         }
@@ -1046,7 +969,7 @@ sub identify_sections {
         }
     }
     @secnums = sort {$a <=> $b} @secnums;
-    my $seclist = join(', ',@secnums);
+    $seclist = join(', ',@secnums);
     my $numsec = @secnums;
     return ($seclist,$numsec);
 }
@@ -1083,156 +1006,17 @@ 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'}});
         }
     }
     return $response;
 }
 
-sub javascript_select_filler {
-    my ($formname,$scripttext,$codetitles,$longtitles_str,$allidlist) = @_;
-    my $output = <<END;
-function courseSet() {
-    var longtitles = new Array ("$longtitles_str");
-    var valyr = document.$formname.Year.options[document.$formname.Year.selectedIndex].value
-    var valsem  = document.$formname.Semester.options[document.$formname.Semester.selectedIndex].value
-    var valdept = document.$formname.Department.options[document.$formname.Department.selectedIndex].value
-    var valclass = document.$formname.Number.options[document.$formname.Number.selectedIndex].value
-    var idyears = new Array("$allidlist");
-    var idyr = -1;
-    var idsem = -1;
-    var iddept = -1;
-    document.$formname.Number.length = 0;
-
-    $scripttext
-
-    selYear = document.$formname.Year.selectedIndex-1;
-    selSemester = document.$formname.Semester.selectedIndex-1;
-    selDepartment = document.$formname.Department.selectedIndex-1;
-    if (selYear == -1) {
-        if (selSemester == -1) {
-            if (selDepartment > -1) {
-                document.$formname.Number.options[0] =  new Option('All','0',false,false);
-                for (var k=0; k<idcse_by_dep[selDepartment].length; k++) {
-                    document.$formname.Number.options[k+1] = new Option(idcse_by_dep[selDepartment][k],idcse_by_dep[selDepartment][k],false,false);
-
-                }
-            } 
-            else {
-                document.$formname.Number.options[0] = new Option("All","0",true,true);
-            }
-        }
-        else {
-            if (selDepartment > -1) {
-                for (var i=0; i<idcse_by_sem_sems.length; i++) {
-                    if (idcse_by_sem_sems[i] == valsem) {
-                        idsem = i;
-                    }
-                }
-                if (idsem != -1) {
-                    for (var i=0; i<idcse_by_sem_dept[idsem].length; i++) {
-                        if (idcse_by_sem_dept[idsem][i] == valdept) {
-                            iddept = i;
-                        }
-                    }
-                }
-                if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
-                    for (var k=0; k<idcse_by_sem_num[idsem][iddept].length; k++) {
-                        document.$formname.Number.options[k+1] = new Option(idcse_by_sem_num[idsem][iddept][k],idcse_by_sem_num[idsem][iddept][k],false,false);
-                    }
-                }
-                else {
-                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
-                }
-            }
-            else {
-                document.$formname.Number.options[0] = new Option("All","0",true,true);
-            }
-        }
-    }
-    else {
-        if (selSemester == -1) {
-            if (selDepartment > -1) {
-                for (var i=0; i<idcse_by_yr_year.length; i++) {
-                    if (idcse_by_yr_year[i] == valyr) {
-                        idyr = i;
-                    }
-                }
-                if (idyr != -1) {      
-                    for (var i=0; i<idcse_by_yr_dept[idyr].length; i++) {
-                        if (idcse_by_yr_dept[idyr][i] == valdept) {
-                            iddept = i;
-                        }
-                    }
-                }
-                if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
-                    for (var k=0; k<idcse_by_yr_num[idyr][iddept].length; k++) {
-                        document.$formname.Number.options[k+1] = new Option(idcse_by_yr_num[idyr][iddept][k],idcse_by_yr_num[idyr][iddept][k],false,false);
-                    }
-                } 
-                else {
-                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
-                }
-            }
-            else {
-                document.$formname.Number.options[0] = new Option("All","0",true,true);
-            }
-        }
-        else {
-            if (selDepartment > -1) {
-                for (var k=0; k<idyears.length; k++) {
-                    if (idyears[k] == valyr) {
-                        idyr = k;
-                    }
-                }
-                if (idyr != -1) {
-                    for (var k=0; k<idsems[idyr].length; k++) {
-                        if (idsems[idyr][k] == valsem) {
-                            idsem = k;
-                        }
-                    }
-                }
-                if (idsem != -1) {
-                    for (var k=0; k<idcodes[idyr][idsem].length; k++) {
-                        if (idcodes[idyr][idsem][k] == valdept) {
-                            iddept = k;
-                        }
-                    }
-                }
-                if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
-                    for (var i=0; i<idcourses[idyr][idsem][iddept].length; i++) {
-                        var display = idcourses[idyr][idsem][iddept][i];
-                        if (longtitles[3] == 1) {
-                            if (idcourseslongs[idyr][idsem][iddept][i] != "") {
-                                display = idcourseslongs[idyr][idsem][iddept][i]
-                            }
-                        }
-                        document.$formname.Number.options[i+1] = new Option(display,idcourses[idyr][idsem][iddept][i],false,false)
-                    }
-                } 
-                else {
-                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
-                }
-            } 
-            else {
-                document.$formname.Number.options[0] =  new Option('All','0',true,true);
-            }
-        }
-        document.$formname.Number.selectedIndex = 0
-    }
-}
-END
-    return $output;
-}
-
 sub autoenroll_info {
     my ($coursehash,$now,$seclist,$xlist_items,$code,$owners,$cdom,$cnum) = @_;
     my $autoenrolldates = &mt('Not enabled');
@@ -1252,17 +1036,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;
                 }
             }