--- loncom/auth/lonroles.pm	2004/11/19 20:17:52	1.111
+++ loncom/auth/lonroles.pm	2004/11/23 07:29:24	1.112
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.111 2004/11/19 20:17:52 albertel Exp $
+# $Id: lonroles.pm,v 1.112 2004/11/23 07:29:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -563,7 +563,6 @@ ENDHEADER
 		    $sortkey=$role.$twhere;
                 }
  
-                $roletext.='<tr bgcolor='.$tbg.'>';
                 $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
 		$roletext{$envkey}=$roletext;
 		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
@@ -631,6 +630,8 @@ ENDHEADER
 
     if ($numdc > 0) {
         &display_recent_roles($r,\%roletext,\%recentroles);
+        $r->print(&coursepick_jscript());
+        $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
     foreach my $type ('Construction Space','Course','Domain','System') {
 	my $output;
@@ -647,7 +648,7 @@ ENDHEADER
 	if ($output) {
 	    if ($doheaders > 0) {
 		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='7'>".&mt($type)."</td>");
+			  "<td align='center' colspan='7'>".&mt($type)."</td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -768,7 +769,7 @@ sub role_status {
 
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
-    my $roletext='<tr bgcolor='.$tbg.'>';
+    my $roletext='<tr bgcolor="'.$tbg.'">';
     unless ($nochoose) {
         if (!$button) {
             if ($switchserver) {
@@ -843,26 +844,23 @@ sub check_fordc {
 
 sub courselink {
     my ($dcdom) = @_;
-    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom);
-    my $verify_script = &coursepick_jscript($dcdom);
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom);
+                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom,$dcdom);
     my $hiddenitems = '<input type="hidden" name="dcdomain_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.
                       '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';
-    return $cb_jscript.$verify_script.$courseform.$hiddenitems;
+    return $courseform.$hiddenitems;
 }
 
 sub coursepick_jscript {
-    my ($dcdom) = @_;
     my $verify_script = <<"END";
 <script>
 function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)
-    var pickedCourse = document.rolechoice.dccourse_$dcdom.value
-    var pickedDomain = document.rolechoice.dcdomain_$dcdom.value
-    if (document.rolechoice.dcdomain_$dcdom.value == document.rolechoice.origdom_$dcdom.value) {
+    var pickedCourse = document.rolechoice.elements[numbutton+4].value
+    var pickedDomain = document.rolechoice.elements[numbutton+2].value
+    if (document.rolechoice.elements[numbutton+2].value == document.rolechoice.elements[numbutton+3].value) {
         if (pickedCourse != '') {
             if (numbutton != -1) {
                 var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse