[BACK]Return to lonroles.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonroles.pm between versions 1.111 and 1.112

version 1.111, 2004/11/19 20:17:52 version 1.112, 2004/11/23 07:29:24
Line 563  ENDHEADER Line 563  ENDHEADER
     $sortkey=$role.$twhere;      $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.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
  $roletext{$envkey}=$roletext;   $roletext{$envkey}=$roletext;
  if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}   if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
Line 631  ENDHEADER Line 630  ENDHEADER
   
     if ($numdc > 0) {      if ($numdc > 0) {
         &display_recent_roles($r,\%roletext,\%recentroles);          &display_recent_roles($r,\%roletext,\%recentroles);
           $r->print(&coursepick_jscript());
           $r->print(&Apache::loncommon::coursebrowser_javascript());
     }      }
     foreach my $type ('Construction Space','Course','Domain','System') {      foreach my $type ('Construction Space','Course','Domain','System') {
  my $output;   my $output;
Line 647  ENDHEADER Line 648  ENDHEADER
  if ($output) {   if ($output) {
     if ($doheaders > 0) {      if ($doheaders > 0) {
  $r->print("<tr bgcolor='#BBffBB'>".   $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);      $r->print($output);
  }   }
Line 768  sub role_status { Line 769  sub role_status {
   
 sub build_roletext {  sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;      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) {      unless ($nochoose) {
         if (!$button) {          if (!$button) {
             if ($switchserver) {              if ($switchserver) {
Line 843  sub check_fordc { Line 844  sub check_fordc {
   
 sub courselink {  sub courselink {
     my ($dcdom) = @_;      my ($dcdom) = @_;
     my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom);  
     my $verify_script = &coursepick_jscript($dcdom);  
     my $courseform=&Apache::loncommon::selectcourse_link      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.'" />'.      my $hiddenitems = '<input type="hidden" name="dcdomain_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.                        '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.                        '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.
                       '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';                        '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';
     return $cb_jscript.$verify_script.$courseform.$hiddenitems;      return $courseform.$hiddenitems;
 }  }
   
 sub coursepick_jscript {  sub coursepick_jscript {
     my ($dcdom) = @_;  
     my $verify_script = <<"END";      my $verify_script = <<"END";
 <script>  <script>
 function verifyCoursePick(caller) {  function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)      var numbutton = getIndex(caller)
     var pickedCourse = document.rolechoice.dccourse_$dcdom.value      var pickedCourse = document.rolechoice.elements[numbutton+4].value
     var pickedDomain = document.rolechoice.dcdomain_$dcdom.value      var pickedDomain = document.rolechoice.elements[numbutton+2].value
     if (document.rolechoice.dcdomain_$dcdom.value == document.rolechoice.origdom_$dcdom.value) {      if (document.rolechoice.elements[numbutton+2].value == document.rolechoice.elements[numbutton+3].value) {
         if (pickedCourse != '') {          if (pickedCourse != '') {
             if (numbutton != -1) {              if (numbutton != -1) {
                 var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse                  var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
Removed from v.1.111  
changed lines
  Added in v.1.112

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>