--- loncom/interface/courseclassifier.pm	2014/03/16 22:27:06	1.17
+++ loncom/interface/courseclassifier.pm	2014/03/17 02:33:32	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utilities for classifying courses based on institutional code
 #
-# $Id: courseclassifier.pm,v 1.17 2014/03/16 22:27:06 raeburn Exp $
+# $Id: courseclassifier.pm,v 1.18 2014/03/17 02:33:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -489,12 +489,27 @@ sub instcode_selectors_data {
                 if ($officialjs) {
                     $jscript .= '
 
-function toggleOfficial() {';
+function toggleOfficial() {
+   var choice; 
+   for (var i=0; i<document.'.$formname.'.official.length; i++) {
+       if (document.'.$formname.'.official[i].checked) {
+           choice = document.'.$formname.'.official[i].value;
+       }
+   }
+   if (choice == "off") {
+       if (document.getElementById("instcodes")) {
+           document.getElementById("instcodes").style.display = "none";
+       }';
                     for (my $i=0; $i<@{$codetitles}-1; $i++) {
                         $jscript .= '
-            document.'.$formname.'.'.$codetitles->[$i].'.selectedIndex = 0;';
+       document.'.$formname.'.'.$codetitles->[$i].'.selectedIndex = 0;';
                     }
-    $jscript .=  '
+    $jscript .= '
+   } else {
+       if (document.getElementById("instcodes")) { 
+           document.getElementById("instcodes").style.display = "block";
+       }
+   }
 }
 
 function setOfficial(caller) {
@@ -564,7 +579,11 @@ sub build_instcode_selectors {
     my $output;
     my @standardnames = &Apache::loncommon::get_standard_codeitems();
     if ($numtitles > 0) {
-        $output .= '<table><tr>';
+        my $style;
+        if ($env{'form.official'} eq 'off') {
+            $style = ' style="display: none"';
+        }
+        $output .= '<div id="instcodes"'.$style.'><table><tr>';
         for (my $k=0; $k<$lasttitle-1; $k++) {
             my (@items,@unsorted);
             if (ref($cat_items->{$codetitles->[$k]}) eq 'ARRAY') {
@@ -600,7 +619,7 @@ sub build_instcode_selectors {
                        '<input type="text" name="'.$standardnames[$numtitles-1].
                        '" /><br />'."\n";
         }
-        $output .= '<br />';
+        $output .= '</div>';
     }
     return $output;
 }
@@ -614,13 +633,14 @@ sub instcode_selectors {
     if ($numtitles > 0) {
         my $official = ' checked="checked" ';
         my $unofficial = '';
-        if ($env{'form.official'} eq 'off') {
+        if (($formname eq 'filterpicker') && ($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="on"'.$official.
+                   ' onclick="toggleOfficial();" />'.&mt('Yes').'</label>'.
+                   ('&nbsp;'x3).'<label>'.
                    '<input type="radio" name="official" value="off"'.$unofficial.
                    ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
                    &build_instcode_selectors($numtitles,$lasttitle,\%cat_items,$codetitles,