--- loncom/interface/loncreateuser.pm 2005/06/06 00:07:43 1.103 +++ loncom/interface/loncreateuser.pm 2006/06/26 21:36:53 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.103 2005/06/06 00:07:43 albertel Exp $ +# $Id: loncreateuser.pm,v 1.121 2006/06/26 21:36:53 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,6 +64,9 @@ use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; use Apache::lonlocal; +use Apache::longroup; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; my $loginscript; # piece of javascript used in two separate instances my $generalrule; @@ -108,23 +111,23 @@ sub my_custom_roles { sub authorpriv { my ($auname,$audom)=@_; - if (($auname ne $env{'user.name'}) || - (($audom ne $env{'user.domain'}) && - ($audom ne $env{'request.role.domain'}))) { return ''; } - unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; } + unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname)) + || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; } # =================================================================== Phase one sub print_username_entry_form { - my $r=shift; + my ($r) = @_; my $defdom=$env{'request.role.domain'}; my @domains = &Apache::loncommon::get_domains(); my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface'); my $selscript=&Apache::loncommon::studentbrowser_javascript(); + my $start_page = + &Apache::loncommon::start_page('Create Users, Change User Privileges', + $selscript); + my $sellink=&Apache::loncommon::selectstudent_link ('crtuser','ccuname','ccdomain'); my %existingroles=&my_custom_roles(); @@ -139,15 +142,11 @@ sub print_username_entry_form { 'nr' => "Name of Role", 'cre' => "Custom Role Editor" ); + my $help = &Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface'); my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges'); my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles'); $r->print(<<"ENDDOCUMENT"); -$html - -The LearningOnline Network with CAPA -$selscript - -$bodytag +$start_page

$lt{siur}$helpsiur

@@ -158,14 +157,46 @@ $lt{'dom'}:$domform
+ENDDOCUMENT + if (&Apache::lonnet::allowed('mcr','/')) { + $r->print(<

$lt{'ecrp'}$helpecpr

$lt{'nr'}: $choice
- - -ENDDOCUMENT + +ENDCUSTOM + } + $r->print(&Apache::loncommon::end_page()); +} + + +sub user_modification_js { + my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_; + + return < + + function pclose() { + parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", + "height=350,width=350,scrollbars=no,menubar=no"); + parmwin.close(); + } + + $pjump_def + $dc_setcourse_code + + function dateset() { + eval("document.cu."+document.cu.pres_marker.value+ + ".value=document.cu.pres_value.value"); + pclose(); + } + + $nondc_setsection_code + + +END } # =================================================================== Phase two @@ -198,10 +229,31 @@ sub print_user_modification_page { $ccdomain=~s/\W//g; my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); my $dc_setcourse_code = ''; - my $loaditem; + my $nondc_setsection_code = ''; + + my %loaditem; + + my $groupslist; + my %curr_groups = &Apache::longroup::coursegroups(); + if (%curr_groups) { + $groupslist = join('","',sort(keys(%curr_groups))); + $groupslist = '"'.$groupslist.'"'; + } + if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { my $dcdom = $1; - $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|; + $loaditem{'onload'} = "document.cu.coursedesc.value='';"; + my @rolevals = ('st','ta','ep','in','cc'); + my (@crsroles,@grproles); + for (my $i=0; $i<@rolevals; $i++) { + $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course'); + $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group'); + } + my $rolevalslist = join('","',@rolevals); + my $crsrolenameslist = join('","',@crsroles); + my $grprolenameslist = join('","',@grproles); + my $pickcrsfirst = '<--'.&mt('Pick course first'); + my $pickgrpfirst = '<--'.&mt('Pick group first'); $dc_setcourse_code = <<"ENDSCRIPT"; function setCourse() { var course = document.cu.dccourse.value; @@ -213,6 +265,7 @@ sub print_user_modification_page { var userrole = document.cu.role.options[document.cu.role.selectedIndex].value var section=""; var numsections = 0; + var newsecs = new Array(); for (var i=0; i 1)) { alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.") return; } + for (var j=0; j 0)) { alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections."); section = ""; @@ -253,10 +321,10 @@ sub print_user_modification_page { else { var coursename = "_$dcdom"+"_"+course+"_"+userrole document.cu.elements[numcourse].name = "act"+coursename - document.cu.elements[numcourse+4].name = "sec"+coursename - document.cu.elements[numcourse+4].value = section - document.cu.elements[numcourse+5].name = "start"+coursename - document.cu.elements[numcourse+6].name = "end"+coursename + document.cu.elements[numcourse+5].name = "sec"+coursename + document.cu.elements[numcourse+5].value = section + document.cu.elements[numcourse+7].name = "start"+coursename + document.cu.elements[numcourse+8].name = "end"+coursename } } document.cu.submit(); @@ -270,32 +338,42 @@ sub print_user_modification_page { } return -1; } -ENDSCRIPT - } - my $html=&Apache::lonxml::xmlbegin(); - my $dochead =<<"ENDDOCHEAD"; -$html - -The LearningOnline Network with CAPA - - -ENDDOCHEAD - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges',undef,$loaditem)); +ENDSECCODE + } + my $js = &user_modification_js($pjump_def,$dc_setcourse_code, + $nondc_setsection_code,$groupslist); + my $start_page = + &Apache::loncommon::start_page('Create Users, Change User Privileges', + $js,{'add_entries' => \%loaditem,}); + my $forminfo =<<"ENDFORMINFO";
@@ -400,7 +494,7 @@ ENDFORMINFO my $genhelp=&Apache::loncommon::help_open_topic('Generation'); &initialize_authen_forms(); $r->print(<$lt{'cnu'} $forminfo

$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain

@@ -441,7 +535,7 @@ ENDNEWUSER 'gen' => "generation" ); $r->print(<$lt{'cup'} $forminfo

$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"

@@ -519,6 +613,7 @@ END '
'.&mt('Domain').': '.$coursedom.(' 'x8). &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom); $sortkey.="\0".$coursedata{'description'}; + $class=$coursedata{'type'}; } else { $carea=&mt('Unavailable course').': '.$area; $sortkey.="\0".&mt('Unavailable course').': '.$area; @@ -544,7 +639,7 @@ END $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) { - $carea.='
Section/Group: '.$3; + $carea.='
Section: '.$3; $sortkey.="\0$3"; } $area=$carea; @@ -574,7 +669,7 @@ END $class='Domain'; } } - if ($role_code eq 'ca') { + if (($role_code eq 'ca') || ($role_code eq 'aa')) { $area=~/\/(\w+)\/(\w+)/; if (&authorpriv($2,$1)) { $allowed=1; @@ -610,7 +705,7 @@ END } my $plaintext=''; unless ($croletitle) { - $plaintext=&Apache::lonnet::plaintext($role_code); + $plaintext=&Apache::lonnet::plaintext($role_code,$class) } else { $plaintext= "Customrole '$croletitle' defined by $croleuname\@$croleudom"; @@ -630,7 +725,7 @@ END } # end of foreach (table building loop) my $rolesdisplay = 0; my %output = (); - foreach my $type ('Construction Space','Course','Domain','System','Unknown') { + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { $output{$type} = ''; foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { @@ -652,7 +747,7 @@ END $lt{'rev'}$lt{'ren'}$lt{'del'}$lt{'rol'}$lt{'e xt'}$lt{'sta'}$lt{'end'} END - foreach my $type ('Construction Space','Course','Domain','System','Unknown') { + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { if ($output{$type}) { $r->print($output{$type}."\n"); } @@ -663,7 +758,7 @@ END my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); if ($currentauth=~/^krb(4|5):/) { $currentauth=~/^krb(4|5):(.*)/; - my $krbdefdom=$1; + my $krbdefdom=$2; my %param = ( formname => 'document.cu', kerb_def_dom => $krbdefdom ); @@ -778,6 +873,7 @@ ENDOTHERAUTHS 'sta' => "Start", 'end' => "End", 'cau' => "Co-Author", + 'caa' => "Assistant Co-Author", 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); @@ -796,6 +892,17 @@ ENDOTHERAUTHS $lt{'sed'} + + +$lt{'caa'} +$cudom\_$cuname + +$lt{'ssd'} + +$lt{'sed'} + ENDCOAUTH } @@ -838,18 +945,17 @@ ENDDROW $r->print($domaintext); } # -# Course level +# Course and group levels # - my $num_sections; if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { - $r->print(&course_level_dc($1)); + $r->print(&course_level_dc($1,'Course')); $r->print('
'."\n"); } else { $r->print(&course_level_table(%inccourses)); $r->print('
'."\n"); } - $r->print(""); + $r->print("".&Apache::loncommon::end_page()); } # ================================================================= Phase Three @@ -859,22 +965,16 @@ sub update_user_data { $env{'form.ccdomain'}); # Error messages my $error = ''.&mt('Error').':'; - my $end = ''; - # Print header - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDTHREEHEAD + my $end = &Apache::loncommon::end_page(); + my $title; if (exists($env{'form.makeuser'})) { $title='Set Privileges for New User'; } else { $title='Modify User Privileges'; } - $r->print(&Apache::loncommon::bodytag($title)); + $r->print(&Apache::loncommon::start_page($title)); + my %disallowed; # Check Inputs if (! $env{'form.ccuname'} ) { $r->print($error.&mt('No login name specified').'.'.$end); @@ -1096,22 +1196,23 @@ END &Apache::lonnet::critical('put:'. $env{'course.'.$cid.'.domain'}.':'. $env{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape($env{'form.ccuname'}.':'. + &escape($env{'form.ccuname'}.':'. $env{'form.ccdomain'}).'='. - &Apache::lonnet::escape($now.':'), + &escape($now.':'), $env{'course.'.$cid.'.home'}).'
'); } } if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { # Revoke custom role - $r->print(&mt('Revoking custom role'). + $r->print(&mt('Revoking custom role:'). ' '.$4.' by '.$3.'@'.$2.' in '.$1.': '. &Apache::lonnet::revokecustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2,$3,$4). '
'); } } elsif ($_=~/^form\.del/) { - if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) { + if ($_=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) { +# Delete standard role $r->print(&mt('Deleting').' '.$2.' in '.$1.': '. &Apache::lonnet::assignrole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2,$now,0,1).'
'); @@ -1122,16 +1223,26 @@ END &Apache::lonnet::critical('put:'. $env{'course.'.$cid.'.domain'}.':'. $env{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape($env{'form.ccuname'}.':'. + &escape($env{'form.ccuname'}.':'. $env{'form.ccdomain'}).'='. - &Apache::lonnet::escape($now.':'), + &escape($now.':'), $env{'course.'.$cid.'.home'}).'
'); } - } + } + if ($_=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); +# Delete custom role + $r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]', + $rolename,$rnam,$rdom,$url).': '. + &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, + $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, + 0,1).'
'); + } } elsif ($_=~/^form\.ren/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; - if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) { +# Re-enable standard role + if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) { my $url = $1; my $role = $2; my $logmsg; @@ -1151,11 +1262,20 @@ END } else { my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'}, $env{'form.ccuname'},$url,$role,0,$now); - $output = &mt('Re-Enabling [_1] in [_2]: [_3]', + $output = &mt('Re-enabling [_1] in [_2]: [_3]', $role,$url,$result).'
'; } $r->print($output); - } + } +# Re-enable custom role + if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); + my $result = &Apache::lonnet::assigncustomrole( + $env{'form.ccdomain'}, $env{'form.ccuname'}, + $url,$rdom,$rnam,$rolename,0,$now); + $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : [_5]', + $rolename,$rnam,$rdom,$url,$result).'
'); + } } elsif ($_=~/^form\.act/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; @@ -1178,8 +1298,15 @@ END if ($num_sections == 0) { $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end)); } else { - foreach (sort {$a cmp $b} keys %sections) { - my $securl = $url.'/'.$_; + my %curr_groups = + &Apache::longroup::coursegroups($one,$two); + foreach my $sec (sort {$a cmp $b} keys %sections) { + if (($sec eq 'none') || ($sec eq 'all') || + exists($curr_groups{$sec})) { + $disallowed{$sec} = $url; + next; + } + my $securl = $url.'/'.$sec; $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end)); } } @@ -1201,10 +1328,17 @@ END if ($num_sections == 0) { $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'')); } else { + my %curr_groups = + &Apache::longroup::coursegroups($one,$two); my $emptysec = 0; foreach my $sec (sort {$a cmp $b} keys %sections) { $sec =~ s/\W//g; - if ($sec ne '') { + if ($sec ne '') { + if (($sec eq 'none') || ($sec eq 'all') || + exists($curr_groups{$sec})) { + $disallowed{$sec} = $url; + next; + } my $securl = $url.'/'.$sec; $r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec)); } else { @@ -1247,12 +1381,20 @@ END } else { $r->print('

'.&mt('ERROR').': '.&mt('Unknown command').' '.$_.'


'); } - } + foreach my $key (sort(keys(%disallowed))) { + if (($key eq 'none') || ($key eq 'all')) { + $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key)); + } else { + $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key)); + } + $r->print(' '.&mt('Please go back and choose a different section name.').'


'); + } + } } # End of foreach (keys(%env)) # Flush the course logs so reverse user roles immediately updated &Apache::lonnet::flushcourselogs(); $r->print('

Create/Modify Another User

'); - $r->print(''); + $r->print(&Apache::loncommon::end_page()); } sub commit_customrole { @@ -1333,7 +1475,7 @@ sub commit_studentrole { } } else { $$logmsg .= "Incomplete course id defined. Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed"; - $result = "Error: incomplete course id\n"; + $result = "error: incomplete course id\n"; } return $result; } @@ -1388,14 +1530,14 @@ sub custom_role_editor { return; } - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges').'

'); + $r->print(&Apache::loncommon::start_page('Custom Role Editor')); my $syspriv=''; my $dompriv=''; my $coursepriv=''; my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); # ------------------------------------------------------- Does this role exist? + $r->print('

'); if (($rdummy ne 'con_lost') && ($roledef ne '')) { $r->print(&mt('Existing Role').' "'); # ------------------------------------------------- Get current role privileges @@ -1442,7 +1584,7 @@ sub custom_role_editor { } my %lt=&Apache::lonlocal::texthash( 'prv' => "Privilege", - 'crl' => "Course Level", + 'crl' => "Course/Group Level", 'dml' => "Domain Level", 'ssl' => "System Level" ); @@ -1454,25 +1596,32 @@ sub custom_role_editor { $lt{'prv'}$lt{'crl'}$lt{'dml'} $lt{'ssl'} ENDCCF - foreach (sort keys %full) { - $r->print(''.&Apache::lonnet::plaintext($_).''. - ($courselevel{$_}?'':' '). + foreach my $priv (sort keys %full) { + my $privtext = &Apache::lonnet::plaintext($priv); + if ($env{'course.'.$env{'request.course.id'}.'.type'}) { + $privtext =~ s/Student/Member/; + $privtext =~ s/student/member/; + $privtext =~ s/course/group/; + } + $r->print(''.$privtext.''. + ($courselevel{$priv}?'':' '). ''. - ($domainlevel{$_}?'':' '). + ($domainlevel{$priv}?'':' '). ''. - ($systemlevel{$_}?'':' '). + ($systemlevel{$priv}?'':' '). ''); } $r->print( - ''); + '
'. + &Apache::loncommon::end_page()); } # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my $r=shift; + my ($r) = @_; my $rolename=$env{'form.rolename'}; @@ -1483,10 +1632,10 @@ sub set_custom_role { return; } - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges').'

'); + $r->print(&Apache::loncommon::start_page('Save Custom Role').'

'); my ($rdummy,$roledef)= - &Apache::lonnet::get('roles',["rolesdef_$rolename"]); + &Apache::lonnet::get('roles',["rolesdef_$rolename"]); + # ------------------------------------------------------- Does this role exist? if (($rdummy ne 'con_lost') && ($roledef ne '')) { $r->print(&mt('Existing Role').' "'); @@ -1536,7 +1685,8 @@ sub set_custom_role { $env{'user.name'}, $rolename)); } - $r->print(''); + $r->print('

Create another role, or Create/Modify a user.

'); + $r->print(&Apache::loncommon::end_page()); } # ================================================================ Main Handler @@ -1553,7 +1703,7 @@ sub handler { (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) || (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) || (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) || - (&Apache::lonnet::allowed('cca',$env{'request.role.domain'})) || + (&authorpriv($env{'user.name'},$env{'request.role.domain'})) || (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -1589,11 +1739,11 @@ sub course_level_table { 'new' => "Define new section", 'ssd' => "Set Start Date", 'sed' => "Set End Date", - 'crl' => "Course Level", + 'crl' => "Course/Group Level", 'act' => "Activate", 'rol' => "Role", 'ext' => "Extent", - 'grs' => "Group/Section", + 'grs' => "Section", 'sta' => "Start", 'end' => "End" ); @@ -1604,21 +1754,26 @@ sub course_level_table { $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); my $area=$coursedata{'description'}; + my $type=$coursedata{'type'}; if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; } my $bgcol=$thiscourse; $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); my ($domain,$cnum)=split(/\//,$thiscourse); - my %sections_count = (); - my $num_sections = 0; + my %sections_count; if (defined($env{'request.course.id'})) { if ($env{'request.course.id'} eq $domain.'_'.$cnum) { - $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count); + %sections_count = + &Apache::loncommon::get_sections($domain,$cnum); } } - foreach ('st','ta','ep','ad','in','cc') { + foreach ('st','ta','ep','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); + # Was this left in by mistake? + # if ($type eq 'Group') { + # $plrole = &Apache::loncommon::convert_role($plrole,$type); + # } $table .= <

@@ -1626,8 +1781,8 @@ sub course_level_table { ENDEXTENT if ($_ ne 'cc') { - if ($num_sections > 0) { - my $currsec = &course_sections($num_sections,\%sections_count,$protectedcourse.'_'.$_); + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_); $table .= '
$area
Domain: $domain		'. ' END - if ($num_sections > 0) { - my $currsec = &course_sections($num_sections,\%sections_count,$customrole); + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$customrole); $table.= '
'.$lt{'exs'}.'
'. @@ -1667,8 +1822,8 @@ ENDTIMEENTRY 		$plrole $area'. ''; $otheritems .= <
'.$lt{'exs'}.'
'. @@ -1707,10 +1862,10 @@ ENDTABLE } sub course_sections { - my ($num_sections,$sections_count,$role) = @_; + my ($sections_count,$role) = @_; my $output = ''; my @sections = (sort {$a <=> $b} keys %{$sections_count}); - if ($num_sections == 1) { + if (scalar(@sections) == 1) { $output = ''."\n"; foreach (@sections) { $output .= '\n"; @@ -1735,14 +1890,12 @@ sub course_level_dc { ''. ''; my $courseform=''.&Apache::loncommon::selectcourse_link - ('cu','dccourse','dcdomain','coursedesc').''; - - my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom); + ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Group').''; + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom); my %lt=&Apache::lonlocal::texthash( - 'crl' => "Course Level", - 'crt' => "Course Title", + 'typ' => "Type", 'rol' => "Role", - 'grs' => "Group/Section", + 'grs' => "Section", 'exs' => "Existing sections", 'new' => "Define new section", 'sta' => "Start", @@ -1750,11 +1903,16 @@ sub course_level_dc { 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - my $header = '

'.$lt{'crl'}.'

'. - ''; - my $otheritems = ''. + my $header = '

'.&mt('Course/Group Level').'

'. + '
'.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'
'; + my $otheritems = ''."\n". ''. ''. ''. + ''. + ''. '
'.$lt{'typ'}.''.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'
'."\n". + '   '.$lt{'new'}.'
'. - '