--- loncom/interface/coursecatalog.pm	2009/02/07 20:45:27	1.47
+++ loncom/interface/coursecatalog.pm	2009/10/28 17:28:17	1.48.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.47 2009/02/07 20:45:27 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.48.2.2 2009/10/28 17:28:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,11 +123,16 @@ ENDSCRIPT
             }
         } 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('Choose a subcategory to display');
+        alert('$alert');
         return false;
     }
 }
@@ -139,7 +144,6 @@ ENDJS
                 $r->print('<form name="'.$formname.
                           '" method="post" action="/adm/coursecatalog">'.
                           &additional_filters($codedom,$has_subcats)."\n");
-                my ($currdepth,$deeper) = &get_depth_values();
                 $r->print('<input type="hidden" name="catalog_maxdepth" value="'.
                           $deeper.'" />'."\n");
                 for (my $i=0; $i<$deeper; $i++) {
@@ -400,7 +404,7 @@ sub cat_header {
     }
     my $onchange;
     unless (($env{'browser.interface'} eq 'textual') || ($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>'.
@@ -410,7 +414,7 @@ sub cat_header {
     }
     $r->print('</td></tr></table></form>'.
 	      '<form name="coursecats" method="post" action="/adm/coursecatalog"'.
-              ' onsubmit="check_selected()">'.
+              ' onsubmit="return check_selected();">'.
               '<table border="0"><tr>'.$catlinks.'</tr></table></form>');
     return;
 }