--- loncom/interface/portfolio.pm 2006/10/19 20:36:12 1.165 +++ loncom/interface/portfolio.pm 2006/11/06 20:02:58 1.171 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.165 2006/10/19 20:36:12 albertel Exp $ +# $Id: portfolio.pm,v 1.171 2006/11/06 20:02:58 rezaferry Exp $ # # Copyright Michigan State University Board of Trustees # @@ -95,6 +95,13 @@ sub display_common { 'createdir_label' => 'Create subdirectory in current directory:'); my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); + my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles'); + my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory'); + + # FIXME: This line should be deleted once Portfolio uses breadcrumbs + $r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio')); + + $r->print(<<"TABLE"); <table id="LC_portfolio_actions"> <tr id="LC_portfolio_upload"> @@ -109,7 +116,7 @@ sub display_common { <input type="hidden" name="action" value="$env{"form.action"}" /> <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" /> <input type="hidden" name="mode" value="$env{"form.mode"}" /> - <input type="submit" name="storeupl" value="$text{'upload'}" /> + <input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload </form> </td> </tr> @@ -124,7 +131,7 @@ sub display_common { <input type="hidden" name="action" value="$env{"form.action"}" /> <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" /> <input type="hidden" name="mode" value="$env{"form.mode"}" /> - <input type="submit" name="createdir" value="$text{'createdir'}" /> + <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir </form> </td> </tr> @@ -155,6 +162,7 @@ TABLE } } $r->print('</span>'); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory')); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.&group_args()); $r->print('">'. @@ -236,7 +244,7 @@ sub display_directory { $current_permissions,$group); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group); my $now = time; - if ($env{"form.mode"} eq 'selectfile'){ + if ($env{"form.mode"} eq 'selectfile') { &select_files($r); $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); $select_mode = 'true'; @@ -259,8 +267,16 @@ sub display_directory { '<tr><th>Select</th><th> </th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>'); } else { $r->print('<form method="post" action="'.$url.'">'); + $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', + 'Using the portfolio file list')); $r->print('<table id="LC_browser">'. - '<tr><th colspan="2">Actions</th><th> </th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>'); + '<tr><th colspan="2">Actions'. + &Apache::loncommon::help_open_topic('Portfolio FileAction'). + '</th><th> </th><th> </th><th>Name'. + &Apache::loncommon::help_open_topic('Portfolio OpenFile'). + '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'. + &Apache::loncommon::help_open_topic('Portfolio ShareFile'). + '</th></tr>'); } $r->print("\n".&group_form_data()."\n"); @@ -436,7 +452,8 @@ sub display_directory { $r->print('</table>'); if ($can_delete) { $r->print(' - <input type="submit" name="doit" value="Delete Checked Files" /> + <input type="submit" name="doit" value="Delete Checked Files" />'. + &Apache::loncommon::help_open_topic('Portfolio DeleteFile').' <input type="hidden" name="action" value="delete" /> <input type="hidden" name="currentpath" value="'.$current_path.'" /> </form>' @@ -523,7 +540,7 @@ sub delete { my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my ($uname,$udom) = &get_name_dom(); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print ("The file is locked and cannot be deleted.<br />"); + $r->print("The file is locked and cannot be deleted.<br />"); $r->print(&done('Back',$url)); } else { if (scalar(@files)) { @@ -550,9 +567,10 @@ sub delete_confirmed { $env{'form.currentpath'}. $delete_file); if ($result ne 'ok') { - $r->print('<span class="LC_error"> An error occured ('.$result. - ') while trying to delete '. - &display_file(undef, $delete_file).'</span><br />'); + $r->print('<span class="LC_error">'. + &mt('An error occured ([_1]) while trying to delete + [_2].',$result,&display_file(undef, $delete_file)). + '</span><br /><br />'); } else { $r->print(&mt('File: [_1] deleted.', &display_file(undef,$delete_file))); @@ -563,7 +581,7 @@ sub delete_confirmed { $group,$file_name); if (keys(%access_controls) > 0) { my %changes; - foreach my $key (%{$access_controls{$file_name}}) { + foreach my $key (keys(%{$access_controls{$file_name}})) { $changes{'delete'}{$key} = 1; } if (keys(%changes) > 0) { @@ -573,15 +591,15 @@ sub delete_confirmed { if ($outcome ne 'ok') { $r->print('<br />'.&mt("An error occured ([_1]) while ". "trying to delete access controls for the file.",$outcome). - '</span><br />'); + '</span><br /><br />'); } else { if ($deloutcome eq 'ok') { - $r->print('<br />'.&mt('Access controls also deleted for the file.')); + $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />'); } else { $r->print('<span class="LC_error">'.'<br />'. &mt("An error occured ([_1]) while ". "trying to delete access controls for the file.",$deloutcome). - '</span><br />'); + '</span><br /><br />'); } } } @@ -633,7 +651,7 @@ sub rename { my ($uname,$udom) = &get_name_dom(); $file_name = &prepend_group($file_name); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print ("The file is locked and cannot be renamed.<br />"); + $r->print("The file is locked and cannot be renamed.<br />"); $r->print(&done(undef,$url)); } else { &open_form($r,$url); @@ -729,7 +747,7 @@ sub access_for_renamed { } sub display_access { - my ($r,$url,$group,$can_setacl,$port_path) = @_; + my ($r,$url,$group,$can_setacl,$port_path,$action) = @_; my ($uname,$udom) = &get_name_dom(); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; $file_name = &prepend_group($file_name); @@ -737,21 +755,29 @@ sub display_access { $uname); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name); my $aclcount = keys(%access_controls); - my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'; - my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.'); - $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.'); - $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.'); - $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'; - $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'; - $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>'; - if ($group eq '') { - $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />")); + my ($header,$info); + if ($action eq 'chgaccess') { + $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'; + $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.'); + $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.'); + $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.'); + $info .= '</li><li>'.&explain_conditionals(); + $info .= '</li></ul>'; + if ($group eq '') { + $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />")); + } + } else { + $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'. + &explain_conditionals().'<br />'; } - if ($can_setacl) { &open_form($r,$url); $r->print($header.$info); - &access_setting_table($r,$access_controls{$file_name}); + $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access')); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings')); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access')); + &access_setting_table($r,$url,$file_name,$access_controls{$file_name}, + $action); my $button_text = { 'continue' => &mt('Proceed'), 'cancel' => &mt('Back to directory listing'), @@ -766,6 +792,13 @@ sub display_access { } } +sub explain_conditionals { + return + &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n". + &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'<br />'."\n". + &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); +} + sub view_access_settings { my ($r,$url,$access_controls,$aclcount) = @_; my ($showstart,$showend); @@ -804,9 +837,8 @@ sub build_access_summary { domains => 'Conditional: domain-based', users => 'Conditional: user-based', course => 'Conditional: course-based', - group => 'Conditional: group-based', ); - my @allscopes = ('public','guest','domains','users','course','group'); + my @allscopes = ('public','guest','domains','users','course'); foreach my $scope (@allscopes) { if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { next; @@ -829,7 +861,7 @@ sub build_access_summary { } } $r->print('<td>'.&mt($scope_desc{$scope})); - if (($scope eq 'course') || ($scope eq 'group')) { + if ($scope eq 'course') { if ($chg ne 'delete') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); @@ -841,16 +873,12 @@ sub build_access_summary { if ($chg ne 'delete') { if ($scope eq 'guest') { $r->print(&mt('Passphrase').': '.$content->{'password'}); - } elsif ($scope eq 'course' || $scope eq 'group') { + } elsif ($scope eq 'course') { $r->print('<table><tr>'); $r->print('<th>'.&mt('Roles').'</th><th>'. &mt('Access').'</th><th>'. &mt('Sections').'</th>'); - if ($scope eq 'course') { - $r->print('<th>'.&mt('Groups').'</th>'); - } else { - $r->print('<th>'.&mt('Teams').'</th>'); - } + $r->print('<th>'.&mt('Groups').'</th>'); $r->print('</tr>'); foreach my $id (sort(keys(%{$content->{'roles'}}))) { $r->print('<tr>'); @@ -874,11 +902,11 @@ sub build_access_summary { } else { $r->print(join(',',@{$content->{'roles'}{$id}{$item}})); } - $r->print('</tr>'); + $r->print('</td>'); } - $r->print("</table>"); + $r->print('</tr>'); } - $r->print("</tr></table>"); + $r->print('</table>'); } elsif ($scope eq 'domains') { $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}})); } elsif ($scope eq 'users') { @@ -992,14 +1020,14 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - foreach my $newitem ('course','group','domains','users') { + foreach my $newitem ('course','domains','users') { $allnew += $env{'form.new'.$newitem}; } if ($allnew > 0) { my $now = time; my $then = $now + (60*60*24*180); # six months approx. &open_form($r,$url); - foreach my $newitem ('course','group','domains','users') { + foreach my $newitem ('course','domains','users') { if ($env{'form.new'.$newitem} > 0) { $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />'); $firstitem = $totalnew; @@ -1038,7 +1066,7 @@ sub build_access_record { if ($scope eq 'guest') { $record->{'password'} = $env{'form.password'}; - } elsif (($scope eq 'course') || ($scope eq 'group')) { + } elsif ($scope eq 'course') { $record->{'domain'} = $env{'form.crsdom_'.$num}; $record->{'number'} = $env{'form.crsnum_'.$num}; my @role_ids; @@ -1120,19 +1148,18 @@ sub sort_users { } sub access_setting_table { - my ($r,$access_controls) = @_; + my ($r,$url,$filename,$access_controls,$action) = @_; my ($public,$publictext); - $publictext = &mt('Off'); + $publictext ='Off'; my ($guest,$guesttext); - $guesttext = &mt('Off'); + $guesttext = 'Off'; my @courses = (); - my @groups = (); my @domains = (); my @users = (); my $now = time; my $then = $now + (60*60*24*180); # six months approx. my ($num,$scope,$publicnum,$guestnum); - my (%acl_count,%end,%start); + my (%acl_count,%end,%start,%conditionals); foreach my $key (sort(keys(%{$access_controls}))) { ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key); if ($scope eq 'public') { @@ -1143,19 +1170,34 @@ sub access_setting_table { $guest=$key; $guestnum = $num; $guesttext = &acl_status($start{$key},$end{$key},$now); - } elsif ($scope eq 'course') { - push(@courses,$key); - } elsif ($scope eq 'group') { - push(@groups,$key); - } elsif ($scope eq 'domains') { - push(@domains,$key); - } elsif ($scope eq 'users') { - push(@users,$key); + } else { + $conditionals{$scope}{$key} = $$access_controls{$key}; + if ($scope eq 'course') { + push(@courses,$key); + } elsif ($scope eq 'domains') { + push(@domains,$key); + } elsif ($scope eq 'users') { + push(@users,$key); + } } $acl_count{$scope} ++; } $r->print('<table border="0"><tr><td valign="top">'); - $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>'); + if ($action eq 'chgaccess') { + &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start, + \%end,$public,$publicnum,$publictext,$guest,$guestnum, + $guesttext,$access_controls,%conditionals); + } else { + &condition_setting($r,$access_controls,$now,$then,\%acl_count, + \@domains,\@users,\@courses); + } + $r->print('</td></tr></table>'); +} + +sub standard_settings { + my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum, + $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_; + $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>'); @@ -1163,7 +1205,7 @@ sub access_setting_table { $r->print(&Apache::loncommon::start_data_table_row()); if ($public) { $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'. - &dateboxes($publicnum,$start{$public},$end{$public}).'</td>'); + &dateboxes($publicnum,$start->{$public},$end->{$public}).'</td>'); } else { $r->print('<td>'.&actionbox('new','0','public').'</td><td>'. &dateboxes('0',$now,$then).'</td>'); @@ -1171,7 +1213,7 @@ sub access_setting_table { $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); $r->print('</td><td width="40"> </td><td valign="top">'); - $r->print('<h3>'.&mt('Passphrase-protected access:').' '.$guesttext.'</h3>'); + $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available'). @@ -1182,7 +1224,7 @@ sub access_setting_table { if ($guest) { $passwd = $$access_controls{$guest}{'password'}; $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'. - &dateboxes($guestnum,$start{$guest},$end{$guest}).'</td>'); + &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'</td>'); } else { $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'. &dateboxes('1',$now,$then).'</td>'); @@ -1191,36 +1233,75 @@ sub access_setting_table { $passwd.'" /></td>'); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); - $r->print('</td></tr><tr><td colspan="3"> </td></tr><tr><td valign="top">'); - &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); + $r->print('</td></tr><tr><td colspan="3"> </td></tr>'. + '<tr><td colspan="3">'); + my $numconditionals = 0; + my $conditionstext; + my %cond_status; + foreach my $scope ('domains','users','course') { + $numconditionals += $acl_count->{$scope}; + if ($acl_count->{$scope} > 0) { + if ($conditionstext ne 'Active') { + foreach my $key (keys(%{$conditionals{$scope}})) { + $conditionstext = &acl_status($start->{$key},$end->{$key},$now); + if ($conditionstext eq 'Active') { + last; + } + } + } + } + } + if ($conditionstext eq '') { + $conditionstext = 'Off'; + } + my %anchor_fields = ( + 'access' => $env{'form.selectfile'}, + 'action' => 'chgconditions', + 'currentpath' => $env{'form.currentpath'}, + ); + $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>'); + if ($numconditionals > 0) { + my $count = 1; + my $chg = 'none'; + $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'<br /><br />'); + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available'). + '</th><th>'.&mt('Additional information').'</th>'); + $r->print(&Apache::loncommon::end_data_table_header_row()); + &build_access_summary($r,$count,$chg,%conditionals); + $r->print(&Apache::loncommon::end_data_table()); + } else { + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.')); + } +} + +sub condition_setting { + my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_; + $r->print('<tr><td valign="top">'); + &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then); $r->print('</td><td> </td><td valign="top">'); - &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); + &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then); $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>'); - if (@courses > 0 || @groups > 0) { + if ($acl_count->{course} > 0) { $r->print('<td colspan="3" valign="top">'); } else { $r->print('<td valign="top">'); } - &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); + &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then); $r->print('</td>'); - if (@courses > 0 || @groups > 0) { - $r->print('</tr><tr><td colspan="3"> </td></tr><tr><td colspan="3" valign="top">'); - } else { - $r->print('<td> </td><td valign="top">'); - } - &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); $r->print('</td></tr></table>'); } sub acl_status { my ($start,$end,$now) = @_; if ($start > $now) { - return &mt('Inactive'); + return 'Inactive'; } if ($end && $end<$now) { - return &mt('Inactive'); + return 'Inactive'; } - return &mt('Active'); + return 'Active'; } sub access_element { @@ -1255,7 +1336,7 @@ sub display_access_row { $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'. &mt('Dates available').'</th>'); - if (($type eq 'course') || ($type eq 'group')) { + if ($type eq 'course') { $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type). '</th>'); $colspan ++; @@ -1265,7 +1346,7 @@ sub display_access_row { $r->print(&Apache::loncommon::end_data_table_header_row()); foreach my $key (@{$items}) { $r->print(&Apache::loncommon::start_data_table_row()); - if (($type eq 'course') || ($type eq 'group')) { + if ($type eq 'course') { &course_row($r,$status,$type,$key,$access_controls,$now,$then); } elsif ($type eq 'domains') { &domains_row($r,$status,$key,\@all_doms,$access_controls,$now, @@ -1342,10 +1423,6 @@ sub course_row { } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $crsgrptext = 'Groups'; - if ($type eq 'group') { - $crsgrptext = 'Teams'; - } my $uctype = $type; $uctype =~ s/^(\w)/uc($1)/e; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, @@ -1362,7 +1439,7 @@ sub course_row { $r->print('<td><table><tr>'); $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'. &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'. - &mt($crsgrptext).'</th></tr>'); + &mt('Groups').'</th></tr>'); if ($status eq 'old') { my $max_id = 0; foreach my $role_id (sort(keys(%{$content->{'roles'}}))) { @@ -1432,7 +1509,12 @@ sub actionbox { my ($status,$num,$scope) = @_; my $output = '<span style="white-space: nowrap"><label>'; if ($status eq 'new') { - $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'. + my $checkstate; + if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') { + $checkstate = 'checked="checked"'; + } + $output .= '<input type="checkbox" name="activate" value="'.$num.'" '. + $checkstate.' />'. &mt('Activate'); } else { $output .= '<input type="checkbox" name="delete" value="'.$num. @@ -1560,10 +1642,6 @@ sub role_options_window { my $cnum = $env{'form.cnum'}; my $type = $env{'form.type'}; my $addindex = $env{'form.setroles'}; - my $grouptitle = 'Groups'; - if ($type eq 'Group') { - $grouptitle = 'Teams'; - } my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker'); $r->print(<<"END_SCRIPT"); <script type="text/javascript"> @@ -1584,7 +1662,7 @@ function setRoles() { </script> END_SCRIPT $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.')); - $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt($grouptitle).'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />'); + $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />'); return; } @@ -2070,9 +2148,12 @@ sub handler { } } elsif ($env{'form.access'}) { $env{'form.selectfile'} = $env{'form.access'}; - $env{'form.action'} = 'chgaccess'; - &display_access($r,$url,$group,$can_setacl,$port_path); - } elsif ($env{'form.action'} eq 'chgaccess') { + if (!defined($env{'form.action'})) { + $env{'form.action'} = 'chgaccess'; + } + &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'}); + } elsif (($env{'form.action'} eq 'chgaccess') || + ($env{'form.action'} eq 'chgconditions')) { if ($can_setacl) { &update_access($r,$url,$group,$port_path); } else {