--- loncom/interface/lonpickcourse.pm	2013/03/01 04:55:35	1.106
+++ loncom/interface/lonpickcourse.pm	2014/03/11 21:42:18	1.110
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.106 2013/03/01 04:55:35 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.110 2014/03/11 21:42:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,8 +109,7 @@ sub handler {
         $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
     }
     my $js = &js_changer();
-    $r->print(&Apache::loncommon::start_page($title,
-                                             &Apache::lonhtmlcommon::scripttag($js),
+    $r->print(&Apache::loncommon::start_page($title,$js,
 					     {'add_entries' => \%loaditem,
 					      'no_nav_bar'  => 1, }));
 
@@ -217,7 +216,7 @@ function updateFilters(caller) {
     }
     document.filterpicker.submit();
 }
-// ]]
+// ]]>
 </script>
 
 ENDJS
@@ -285,7 +284,7 @@ sub create_user_javascript {
         my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
         my ($showcredits,$credits);
         if (($crstype ne 'Community') &&
-            ($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'})) {
+            (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'}))) {
             $showcredits = 1; 
             $credits = $coursedescription{'internal.defaultcredits'};
         }
@@ -514,7 +513,7 @@ sub display_matched_courses {
     if (!%courses) {
         $r->print('<p class="LC_info">'.&mt('None found').'</p>');
     } elsif ($multiple) {
-        $r->print('<input type="button" value="'.&mt('Submit').'" onClick="gochoose('."'','','')".'" />');
+        $r->print('<input type="button" value="'.&mt('Submit').'" onclick="gochoose('."'','','')".'" />');
     }
     $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'.
               "\n".'<input type="hidden" name="pickedcourse" value="" />'."\n".
@@ -695,7 +694,8 @@ sub build_filters {
                 || ($formname eq 'modifycourse')) {
                 $officialjs = 1;
                 ($instcodeform,$jscript,$$numtitlesref) = 
-                    &instcode_selectors($codedom,'filterpicker',$officialjs,$codetitlesref);
+                    &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker',
+                                                                  $officialjs,$codetitlesref);
                 if ($jscript) {
                     $jscript = '<script type="text/javascript" language="Javascript">'.
                                $jscript.'</script>'."\n";
@@ -874,33 +874,6 @@ sub get_coordinator_cloneable {
     }
 }
 
-sub instcode_selectors {
-    my ($codedom,$formname,$officialjs,$codetitles) = @_;
-    my ($output,%cat_titles,%cat_order,%cat_items);
-    my ($jscript,$totcodes,$numtitles,$lasttitle) =
-        &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
-                           \%cat_items,$codetitles,\%cat_titles,\%cat_order,$officialjs);
-    if ($numtitles > 0) {
-        my $official = ' checked="checked" ';
-        my $unofficial = '';
-        if ($env{'form.official'} eq 'off') {
-            $unofficial = $official;
-            $official = '';
-        }
-        $output .= '<span class="LC_nobreak">'.&mt('Official course:').'&nbsp;<label>'.
-                   '<input type="radio" name="official" value="on"'.$official.' />'.
-                   &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                   '<input type="radio" name="official" value="off"'.$unofficial.
-                   ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
-                   &Apache::courseclassifier::build_instcode_selectors($numtitles,
-                   $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order)."\n".
-                   '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
-                   '<input type="hidden" name="state" value="listing" />'."\n";
- 
-    }
-    return ($output,$jscript,$numtitles);
-}
-
 sub search_courses {
     my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_;
     my (%courses,%showcourses,$cloner,$ccrole);
@@ -1009,7 +982,7 @@ sub course_chooser {
             $output = &mt('No rights to clone')."\n";
         }
     } else {
-        $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
+        $output = '<input type="button" value="'.&mt('Select').'" onclick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
     }
     return $output;
@@ -1029,7 +1002,7 @@ sub gochoose_javascript {
                                  list  => 'courselist',
                               },
                     );
-    my $output .= qq|
+    my $output = qq|
 function gochoose(cname,cdom,cdesc) {
     var openerForm = "$env{'form.form'}";
     courseCount = 0;