--- loncom/auth/lonroles.pm	2005/11/21 19:08:24	1.137
+++ loncom/auth/lonroles.pm	2005/12/15 23:31:22	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.137 2005/11/21 19:08:24 raeburn Exp $
+# $Id: lonroles.pm,v 1.138 2005/12/15 23:31:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -636,7 +636,7 @@ ENDHEADER
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
                 if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
-		    $output .= &allcourses_row($1);
+		    $output .= &allcourses_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
@@ -664,7 +664,7 @@ ENDHEADER
 		$output.=$roletext{$sortrole{$which}};
                 if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
                     if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1);
+                        $output .= &allcourses_row($1,'');
                     }
                 }
 	    }
@@ -876,13 +876,13 @@ sub check_fordc {
 }
 
 sub courselink {
-    my ($dcdom) = @_;
+    my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('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="" />';
+                     ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+    my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
+                      '<input type="hidden" name="coursedesc'.$rowtype.'_'.$dcdom.'" value="" />';
     return $courseform.$hiddenitems;
 }
 
@@ -923,34 +923,26 @@ END
 }
 
 sub processpick {
-    my $dcdom = shift;
     my $process_pick = <<"END";
 <script>
 function process_pick(dom) {
-    var numbutton = getIndex(dom)
-    var pickedCourse = opener.document.rolechoice.dccourse_$dcdom.value
-    var pickedDomain = opener.document.rolechoice.dcdomain_$dcdom.value
-    if (opener.document.rolechoice.dcdomain_$dcdom.value == opener.document.rolechoice.origdom_$dcdom.value) {
+    var pickedCourse=opener.document.rolechoice.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.rolechoice.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+
+    if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            if (numbutton != -1) {
-                var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-                opener.document.rolechoice.elements[numbutton].name = courseTarget
-                opener.document.rolechoice.submit()
-            }
+            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            opener.document.title='Role selected. Please stand by.';
+            opener.status='Role selected. Please stand by.';
+	    opener.document.rolechoice.newrole.value=courseTarget
+            opener.document.rolechoice.submit()
         }
+    } else {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
     }
 }
  
-function getIndex(dom) {
-    var callername = 'ccpick_'+dom
-    for (var i=0;i<opener.document.rolechoice.elements.length;i++) {
-        var elemname = opener.document.rolechoice.elements[i].name
-        if (elemname == callername) {
-            return i;
-        }
-    }
-    return -1;
-}
 </script>
 END
     return $process_pick;
@@ -987,12 +979,10 @@ sub display_cc_role {
 }
 
 sub allcourses_row {
-    my $dcdom = shift;
+    my ($dcdom,$rowtype) = @_;
     my $ccrole = Apache::lonnet::plaintext('cc');
-    my $selectlink = &courselink($dcdom);
+    my $selectlink = &courselink($dcdom,$rowtype);
     my $output = '<tr bgcolor="#77FF77">'.
-	'<input type="hidden" name="ccpick_'.$dcdom.'" />'.
-	'<input type="hidden" name="pick_'.$dcdom.'" value="1" />'.
 	'<td colspan="5">'.
 	'<font color="#002200">'.$ccrole.'</font>'.
 	' <b>'.$selectlink.'</b>'.