--- loncom/interface/lonmainmenu.pm	2009/12/07 18:37:11	1.8.4.1
+++ loncom/interface/lonmainmenu.pm	2009/12/15 05:17:52	1.8.4.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # displays the main menu
 #
-# $Id: lonmainmenu.pm,v 1.8.4.1 2009/12/07 18:37:11 raeburn Exp $
+# $Id: lonmainmenu.pm,v 1.8.4.5 2009/12/15 05:17:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,7 +81,11 @@ ENDSCRIPT
             $switcher_js = &gcitest_switcher_js($current,$numcourses);
             $script_tag= <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
+
 $switcher_js
+
+// ]]>
 </script>
 ENDSCRIPT
         }
@@ -113,7 +117,7 @@ sub gcitest_switcher {
         my $clean_title = $courses{$course}{'description'};
         $clean_title =~ s/\W+//g;
         if ($clean_title eq '') {
-            $clean_title = $courseinfo{$course}{'description'};
+            $clean_title = $courses{$course}{'description'};
         }
         push(@{$Sortby{$clean_title}},$course);
     }
@@ -132,12 +136,12 @@ sub gcitest_switcher {
     }
     if ($default) {
         $output = '<form name="pickrole" action="/adm/roles" method="post">'.
-                  '<select name="newrole" method="post" onchange="javascript:courseswitcher();">'.
+                  '<select name="newrole" onchange="javascript:courseswitcher();">'.
                   '<option value="" selected="selected">'.$default.'</option>';
         foreach my $item (@sorted_courses) {
             foreach my $course (@{$Sortby{$item}}) {
                 my ($cdom,$cnum) = split('_',$course);
-                $output .= '<option value="cc./'.$cdom.'/'.$cnum.'">'.$item.'</option>';
+                $output .= '<option value="cc./'.$cdom.'/'.$cnum.'">'.$courses{$course}{'description'}.'</option>';
             }
         }
         $output .= '</select><input type="hidden" name="selectrole" value="" /></form>';
@@ -145,6 +149,38 @@ sub gcitest_switcher {
     return $output;
 }
 
+sub gcitest_switcher_js {
+    my ($current,$numcourses) = @_;
+    my $output = <<"ENDJS";
+
+function courseswitcher(caller) {
+    var numcourses = $numcourses;
+    var current = '$current';
+    var choice = document.pickrole.newrole.options[document.pickrole.newrole.selectedIndex].value;
+    if (choice == '') {
+        if (caller == 'icon') {
+            alert('No Concept Test selected');
+        }
+        document.pickrole.selectrole.value = '';
+        return;
+    }
+    if (choice == current) {
+        if ((caller != 'icon') && (numcourses > 1)) {
+            alert('You have selected the current course.\\nPlease select a different Concept Test course');
+        }
+        document.pickrole.newrole.selectedIndex = 0;
+        document.pickrole.selectrole.value = '';
+        return;
+    }
+    document.pickrole.selectrole.value = '1';
+    document.pickrole.submit();
+    return;
+}
+
+ENDJS
+    return $output;
+}
+
 1;
 __END__