| '.$lt{'gnam'}.': | +'.$lt{'gnam'}.': | '); if ($action eq 'create') { - $r->print(''); + $r->print(' ('. + $lt{'lett'}.')'); } else { $r->print(''.$env{'form.groupname'}); @@ -1240,13 +1625,13 @@ sub groupsettings_options { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| $lt{'desc'}: | +$lt{'desc'}: | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| $lt{'func'}: | +$lt{'func'}: | END my $numitems = keys(%{$functions}); my $halfnum = int($numitems/2); @@ -1261,7 +1646,7 @@ END $$functions{$allfunctions[$i]}.''); } - $r->print(' | print(' | '. ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '); for (my $j=$halfnum; $j<@allfunctions; $j++) { @@ -1275,40 +1660,42 @@ END } $r->print(' | - | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.&mt('Granularity:').' | +'.&mt('Granularity:').' | '.$lt{'doyo'}.' '); if ($action eq 'modify') { $r->print(' ('.&mt('Currently set to "[_1]"', - $$stored{'granularity'}).')'); + &mt($$stored{'granularity'})).')'); } $r->print(' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.&mt('Disk quota: ').' | '); + | '.&mt('Disk quota: ').' | ');
if ($action eq 'create') {
- $r->print(&mt('If you enable the file repository for the [_1], allocate a disk quota.',$gpterm));
+ $r->print(&mt('If you enable the file repository for the '.$gpterm.', allocate a disk quota.'));
} else {
$r->print(&mt('Quota allocated to file repository:'));
}
- $r->print(' Mb');
+ $r->print(' '.&mt('[_1] Mb',''));
if ($action eq 'create') {
- $r->print(' '. - &mt('A total of [_1] Mb is shared between all [_2]s in the '. - '[_3], and [_4] Mb are currently unallocated.',$crsquota, - $gpterm,lc($crstype),$freespace)); + $r->print(' ' + .&mt('A total of [_1] Mb can be divided amongst all '.$gpterm.'s in the ' + .lc($crstype).', and [_2] Mb are currently unallocated.' + ,$crsquota,sprintf("%.2f",$freespace)) + ); } else { $r->print(' ('.&mt('The quota is currently [_1] Mb', $$stored{'quota'}).').'); - $r->print(' '.&mt('The quota can be increased to [_1] Mb, '. - 'by adding all unallocated space for [_2]s in the [_3].', - $maxposs,$gpterm,lc($crstype))); + $r->print(' ' + .&mt('The quota can be increased to [_1] Mb, ' + .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.' + ,sprintf("%.2f",$maxposs))); } $r->print(' |
@@ -1335,18 +1722,18 @@ sub get_quota_constraints {
}
sub membership_options {
- my ($r,$action,$state,$sectioncount,$image,$gpterm,$ucgpterm) = @_;
+ my ($r,$cdom,$cnum,$action,$state,$sectioncount,$image,$gpterm,$ucgpterm)=@_;
my $crstype = &Apache::loncommon::course_type();
my %lt = &Apache::lonlocal::texthash(
- 'pipa' => 'Pick parameters to generate membership list',
- 'gmem' => "$ucgpterm membership options",
+ 'pipa' => 'Build a list of users for selection of group members',
+ 'gmem' => "Group membership selection list criteria:",
'picr' => 'Pick the criteria to use to build a list of '.
lc($crstype).' users from which you will select ',
- 'meof' => "members of the new $gpterm.",
- 'admg' => "additional members of the $gpterm.",
+ 'meof' => "members of the new group.",
+ 'admg' => "additional members of the group.",
'ifno' => "If you do not wish to add members when you first ".
- "create the $gpterm, do not make any selections.",
- 'asub' => "A subsequent step will also allow you to specify automatic adding/dropping of $gpterm members triggered by specified role and section changes.",
+ "create the group, there is no need to pick any criteria.",
+ 'asub' => "A subsequent step will also allow you to specify automatic adding/dropping of group members triggered by specified user role and section changes in the course.",
'acty' => 'Access types',
'coro' => $crstype.' roles',
'cose' => $crstype.' sections',
@@ -1357,13 +1744,11 @@ sub membership_options {
future => &mt('Will have future access'),
);
- #FIXME need to plumb around for the various cr roles defined by the user
- my @roles = ('st','cc','in','ta','ep');
+ my @roles = ('st','cc','in','ta','ep','cr');
my @sections = keys(%{$sectioncount});
- &topic_bar($r,$image,$lt{'pipa'});
- $r->print('
+ $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'pipa'}).'
'.$lt{'gmem'}.'|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$lt{'acty'}.' | -'.$lt{'coro'}.' | '); - if (@sections >0) { - $r->print(' -'.$lt{'cose'}.' | '); - } - $r->print('|
|---|---|---|---|
| '); + | '.$lt{'coro'}.' | +'.$lt{'cose'}.' | +|
| '); $r->print(&Apache::lonhtmlcommon::status_select_row(\%status_types)); $r->print(' | '); - $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles)); + $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles,undef,undef,1,$cdom,$cnum)); if (@sections > 0) { @sections = sort {$a cmp $b} @sections; unshift(@sections,'none'); # Put 'no sections' next unshift(@sections,'all'); # Put 'all' at the front of the list - $r->print(' | '. - §ions_selection(\@sections,'sectionpick').' | '); + } else { + @sections = ('all','none'); } - $r->print(' + $r->print(''. + §ions_selection(\@sections,'sectionpick').' |
for different members:', - stda => 'Start date', + ygrs => "Your group selections - ", + tfwa => "The following settings will apply to the group:", + difn => 'Different collaborative tools
for different members:', + stda => 'Start date:', enda => 'End date:', ); my $showstart = &Apache::lonlocal::locallocaltime($startdate); @@ -1558,7 +1945,7 @@ sub print_current_settings { } if ($action eq 'create') { $r->print(' -
'.$lt{'ygrs'}.'
+
');
if (@{$available} > 0) {
- $r->print('Available:
-
'.$lt{'ygrs'}.'
'.$lt{'tfwa'}.'
');
}
@@ -1580,8 +1967,8 @@ sub print_current_settings {
'.$lt{'tfwa'}.'
'); } if (@{$unavailable} > 0) { - $r->print('Unavailable: -
$lt{'enda'} $showend
|
| ');
+ | ');
}
$r->print('
| '.&mt('Add?').' | -'.&mt('Name').' | -'.&mt('Username').' - | -'.&mt('Domain').' | -ID | -Section | +'.&mt('Add?').' + | '.&mt('Name').' + | '.&mt('Username').' + | '.&mt('Domain').' + | '.&mt('ID').' + | '.&mt('Section').' '); if (@{$available} > 0) { - $r->print(' | '.$lt{'func'}.' | '); + $r->print(''.$lt{'func'}.' | '); } - $r->print('
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - | |||||||||||||
| - | '. - $fullname.' | '.$uname.' | '. - $udom.' | '.$id.' | '. - ''.$section.' | '); + $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense'). + ''. + ' | '.$fullname.' | '. + ''.$uname.' | '. + ''.$udom.' | '. + ''.$id.' | '. + ''.$section.' | '); if (@{$available} > 0) { - $r->print(' | ');
+ $r->print(' | ');
}
- $r->print('
| - |
-');
if ($totalusers > 0) {
$r->print($lt{'nnew'}.' '.$lt{'yoma'}); } else { $r->print($lt{'nome'}); } - $r->print(' - |
- '.$lt{'func'}.' | - -|||||||||||
| '.$lt{'fixp'}.' | -|||||||||||||
| '.$lt{'oppr'}.' | -|||||||||||||
| '.$tool.' | -';
+ }
+ $dynamic .= '
|
- ');
+ $dynamic .= '||
'); return; + } sub display_defprivs { - my ($r,$tabcol,$rowColor1,$rowColor2,$tools,$toolprivs,$defprivs) = @_; + my ($r,$tools,$toolprivs,$defprivs) = @_; + my $function = &Apache::loncommon::get_users_function(); + my $tabcol = &Apache::loncommon::designparm($function.'.tabbg'); + my $rowColor1 = "#dddddd"; + my $rowColor2 = "#eeeeee"; my %lt = &Apache::lonlocal::texthash( 'priv' => 'Privileges', - 'func' => 'Function', + 'func' => 'Collaborative Tool', ); $r->print(&Apache::lonhtmlcommon::start_pick_box()); $r->print('
-
| - | '); + $r->print(&Apache::lonhtmlcommon::topic_bar(1,$lt{'grse'})); &print_current_settings($r,$action,$functions,$startdate,$enddate, $groupname,$description,$granularity,$quota, \@available,\@unavailable,$gpterm,$ucgpterm); -$r->print(' - | ||
| - | -'); - ¤t_membership($r,$cdom,$cnum,$formname,$tabcol,$rowColor1, - $rowColor2,$groupname,\@available,\@unavailable, - $fixedprivs,$granularity,$specificity); - $r->print(' | '); - &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext, - $$states{$action}[$page+1],$nexttext); - $r->print('||
|
|
END - $r->print(&Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row()); $r->print(<<"END"); -
| $lt{'actn'} | -$lt{'name'} | -$lt{'usnm'} - | -$lt{'doma'} | -ID | -$lt{'stda'} | -$lt{'enda'} | +$lt{'actn'} | +$lt{'name'} | +$lt{'usnm'} | +$lt{'doma'} | +ID | +$lt{'stda'} | +$lt{'enda'} | END my $colspan = 0; if ($hastools) { - $r->print(''.$lt{'curf'}.' | '); - $colspan ++; + $r->print(''.$lt{'curf'}.' | '); + $colspan++; } if ($addtools) { - $r->print('Additional Functionality | '); - $colspan ++; + $r->print(''.&mt('Additional Tools').' | '); + $colspan++; } - $r->print('|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
');
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').'
+ | ');
if ($$current{$user}{changestate} eq 'reenable') {
$r->print(' |
- '.
- $fullname.' | '.$uname.' | '.
- $udom.' | '.$id.' | '.$start.
- ' | '.$end.' | ');
+ | '.
+ ''.$fullname.' | '. + ''.$uname.' | '. + ''. $udom.' | '. + ''.$id.' | '. + ''.$start.' | '. + ''.$end.' | '); if ($hastools) { - $r->print(' | ');
+ $r->print(' | ');
}
if ($addtools) {
- $r->print('');
+ $r->print('| ');
if ($granularity eq 'Yes') {
foreach my $tool (@{$$current{$user}{newtools}}) {
$r->print(' | ');
+ $r->print(' | ');
}
- $r->print('
- |
');
}
sub change_privs_form {
- my ($r,$cdom,$cnum,$tabcol,$action,$formname,$page,$startdate,$enddate,
- $tools,$functions,$toolprivs,$fixedprivs,$userdata,$usertools,
- $memchg,$idx,$states,$stored,$sectioncount,$navbuttons,$rowColor1,
- $rowColor2,$gpterm,$ucgpterm) = @_;
+ my ($r,$cdom,$cnum,$action,$formname,$page,$startdate,$enddate,
+ $tools,$functions,$toolprivs,$fixedprivs,$userdata,$usertools,
+ $memchg,$idx,$states,$stored,$sectioncount,$navbuttons,$gpterm,
+ $ucgpterm) = @_;
my @regexps = ('userpriv_');
my $nexttext;
my %lt = &Apache::lonlocal::texthash(
@@ -2370,44 +2701,40 @@ sub change_privs_form {
} else {
$nexttext = $$navbuttons{'mose'};
}
- $r->print('||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
'.$lt{'tode'}.':
| |||
'.$lt{'toex'}.':
| |||
| '.$lt{'nome'}. - ' | |||
'); my @available = (); my @unavailable = (); @@ -2430,7 +2756,8 @@ sub add_members_form { &print_current_settings($r,$action,$functions,$startdate,$enddate, $groupname,$description,$granularity,$quota, \@available,\@unavailable,$gpterm,$ucgpterm); - &membership_options($r,$action,$formname,$sectioncount,1,$gpterm,$ucgpterm); + &membership_options($r,$cdom,$cnum,$action,$formname,$sectioncount,1,$gpterm, + $ucgpterm); my $nexttext = $$navbuttons{'gtns'}; my $prevtext = $$navbuttons{'gtpp'}; &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext, @@ -2439,10 +2766,10 @@ sub add_members_form { } sub choose_privs_form { - my ($r,$cdom,$cnum,$tabcol,$action,$formname,$page,$startdate,$enddate, - $tools,$functions,$toolprivs,$fixedprivs,$userdata,$usertools,$idx, - $states,$stored,$sectioncount,$navbuttons,$rowColor1,$rowColor2, - $gpterm,$ucgpterm,$crstype) = @_; + my ($r,$cdom,$cnum,$action,$formname,$page,$startdate,$enddate, + $tools,$functions,$toolprivs,$fixedprivs,$userdata,$usertools,$idx, + $states,$stored,$sectioncount,$navbuttons,$gpterm,$ucgpterm, + $crstype) = @_; my @regexps = ('userpriv_'); my $nexttext; @@ -2459,27 +2786,22 @@ sub choose_privs_form { $nexttext = $$navbuttons{'adme'}; } - $r->print('
');
- $r->print('
| ');
}
}
- $r->print(' | |||
'); - &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools, - $toolprivs,\@defprivs); + $r->print($lt{'forf'}.'
'); + &display_defprivs($r,$tools,$toolprivs,\@defprivs); } } else { if (keys(%{$usertools}) > 0) { - $r->print('
'); - &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools, - $toolprivs,\@defprivs); + $r->print($lt{'algr'}.'
'.$lt{'ifex'}.'
'); + &display_defprivs($r,$tools,$toolprivs,\@defprivs); } else { - $r->print('
'); + $r->print($lt{'asno'}.'
'); } } } else { - $r->print('
',$gpterm)); + $r->print('
'
+ .&mt('The value you entered for the quota for the file repository in this '.$gpterm
+ .' contained invalid characters, so it has been set to 0 Mb. You can change this by'
+ .' modifying the '.$gpterm.' settings.')
+ .'
');
}
if ($quota > $maxposs) {
$quota = $maxposs;
- $r->print(&mt('The value you entered for the quota for the file repository in this [_1] exceeded the maximum possible value, so it has been set to [_2] Mb (the maximum possible value).',$gpterm,$maxposs)); + $r->print('
'
+ .&mt('The value you entered for the quota for the file repository in this '.$gpterm
+ .' exceeded the maximum possible value, so it has been set to [_1] Mb '
+ .'(the maximum possible value).',sprintf("%.2f",$maxposs))
+ .'
');
}
my %groupinfo = (
description => $esc_description,
@@ -2882,12 +3198,65 @@ sub write_group_data {
my $result = &add_group_folder($cdom,$cnum,$now,$groupname,$action,
$description,$tools,\%groupinfo,
$gpterm,$ucgpterm,$crstype);
- if ($result ne 'ok') {
- $r->print(&mt('A problem occurred when creating folders for the new [_1]. [_2].',$gpterm,$result)); + if ($result eq 'ok') { + $r->print('
'
+ .&mt($ucgpterm.' [_1] was created.',''.$groupname.'')
+ .'
');
+ } else {
+ $r->print(''
+ .&mt('A problem occurred when creating folders for the new '.$gpterm.' [_1]:'
+ ,''.$groupname.'')
+ .'
'.$result + .'
');
+ }
+ } elsif ($action eq 'modify') {
+ my (@oldtools,@newtools);
+ if (ref($$stored{'tool'}) eq 'ARRAY') {
+ @oldtools = @{$$stored{'tool'}};
+ }
+ if (ref($tools) eq 'ARRAY') {
+ @newtools = @{$tools};
+ }
+ if (!grep(/^discussion$/,@oldtools) &&
+ grep(/^discussion$/,@newtools)) {
+ my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
+ my $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence';
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my $bbmapres = $navmap->getResourceByUrl($boardsmap);
+ undef($navmap);
+ if (!$bbmapres) {
+ my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
+ my $disctitle = &mt('Discussion Boards');
+ my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
+ $groupname.'.sequence','bbseq',
+ $disctitle,$grpmap);
+ my ($furl,$ferr) =
+ &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+ $navmap = Apache::lonnavmaps::navmap->new();
+ # modify parameter
+ if ($outcome eq 'ok') {
+ my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
+ $groupname);
+ if ($parm_result) {
+ $r->print(''.$result + .'
'
+ .&mt('An error occurred while setting parameters '
+ .'for Discussion Boards folder: '
+ .'[_1]',$parm_result)
+ .'
');
+ } else {
+ $r->print(''
+ .&mt('Discussion Boards Folder created.')
+ .'
');
+ }
+ } else {
+ $r->print($outcome);
+ }
+ undef($navmap);
+ }
}
- $r->print(&mt('[_1] [_2] was created.',$ucgpterm,$groupname)); - } else { - $r->print(&mt('[_1] [_2] was updated.
',$ucgpterm,$groupname)); + $r->print('
'
+ .&mt($ucgpterm.' [_1] was updated.',''.$groupname.'')
+ .'
');
}
} else {
my %actiontype = (
@@ -2897,8 +3266,10 @@ sub write_group_data {
&Apache::lonnet::logthis("Failed to store $gpterm $groupname ".
'in '.lc($crstype).': '.$cnum.
' in domain: '.$cdom);
- $r->print(&mt('An error occurred when [_1] the [_2]. '.
- 'Please try again.',$actiontype{$action},$gpterm));
+ $r->print(''
+ .&mt('An error occurred when [_1] the '.$gpterm.'. '
+ .'Please try again.',$actiontype{$action})
+ .'
');
}
return $result;
}
@@ -2917,6 +3288,7 @@ sub process_membership {
my %curr_start = ();
my %curr_end = ();
my %tooltype = ();
+ my $context = 'processgroupmembership';
foreach my $tool (@{$tools}) {
foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) {
@@ -2986,7 +3358,7 @@ sub process_membership {
$curr_privs{$user};
if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname,
$user,$now,$savestart,
- $curr_privs{$user}) eq 'ok') {
+ $curr_privs{$user},'',$context) eq 'ok') {
push(@{$added{'expired'}},$user);
$num_ok ++;
} else {
@@ -2997,7 +3369,7 @@ sub process_membership {
foreach my $user (@deletion) {
$usersettings{$groupname.':'.$user} = $now.':-1:';
if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname,
- $user,$now,'-1','')
+ $user,$now,'-1','','',$context)
eq 'ok') {
push(@{$added{'deleted'}},$user);
$num_ok ++;
@@ -3051,7 +3423,7 @@ sub process_membership {
$group_privs{$user};
if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname,
$user,$end,$start,
- $group_privs{$user}) eq 'ok') {
+ $group_privs{$user},'',$context) eq 'ok') {
push(@{$added{$type}},$user);
$num_ok ++;
} else {
@@ -3090,7 +3462,9 @@ sub process_membership {
}
if ($num_fail) {
foreach my $type (sort(keys(%failed))) {
- $r->print(&mt('The following users could not be [_1], because an error occurred:',$type)); + $r->print('
'
+ .&mt("The following users could not be $type, because an error occurred:")
+ .'
');
foreach my $user (@{$failed{$type}}) {
$r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.''); } @@ -3098,31 +3472,41 @@ sub process_membership { $r->print('
'); } if (@unchanged > 0) { - $r->print(&mt('No change occurred for the following users:
')); + $r->print(&mt('No change occurred for the following users:').'
'); foreach my $user (sort(@unchanged)) { $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'
'); } $r->print('
'); } if ($roster_result eq 'ok') { - $r->print('
'.&mt('[_1] membership list updated.',$ucgpterm)); - $r->print('
'.&mt("For full access to all of [_1]'s privileges, users will need to log out and log back in.",$groupname).'
'); - } else { - $r->print(''.&mt('An error occurred while updating the [_1] membership list -',$gpterm).$roster_result.'
'); + $r->print('
'
+ .&mt($ucgpterm.' membership list updated.')
+ .'
');
+ $r->print('' + .&mt('Any currently logged in course users affected by the changes you made' + .' to group membership or privileges for the [_1] group will need to log out' + .' and log back in for their LON-CAPA sessions to reflect these changes.' + ,''.$groupname.'') + .'
' + ); + } else { + $r->print(''
+ .&mt("An error occurred while updating the $gpterm membership list:")
+ .'
'.$roster_result + .'
');
}
return;
}
sub mapping_options {
- my ($r,$action,$formname,$page,$tabcol,$sectioncount,$states,$stored,
- $navbuttons,$img1,$img2,$rowColor1,$rowColor2,$gpterm,$ucgpterm,
- $crstype) = @_;
+ my ($r,$action,$formname,$page,$sectioncount,$states,$stored,
+ $navbuttons,$img1,$img2,$gpterm,$ucgpterm,$crstype,$cdom,$cnum) = @_;
my %lt = &Apache::lonlocal::texthash(
'auto' => "Settings for automatic $gpterm enrollment",
'gmma' => "$ucgpterm membership mapping to specific sections/roles",
'endi' => "Enable/disable automatic $gpterm enrollment for ".
"users in specified roles and sections",
- 'adds' => "If automatic $gpterm enrollment is enabled, when a user is assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.",
+ 'adds' => "If automatic $gpterm enrollment is enabled, when a user is newly assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.",
'drops' => "If automatic $gpterm disenrollment is enabled, when a user's role is expired, access to the $gpterm will be terminated unless the user continues to have other ".lc($crstype)."-wide or section-specific active or future roles which receive automatic membership in the $gpterm.",
'pirs' => "Pick roles and sections for automatic $gpterm enrollment",
'curr' => 'Currently set to',
@@ -3132,18 +3516,14 @@ sub mapping_options {
'auex' => "Automatically expire $gpterm membership when roles are removed?",
'mapr' => "Mapping of roles and sections affected by automatic $gpterm enrollment/disenrollment follows scheme chosen below.",
);
- &automapping($r,$action,$tabcol,$stored,\%lt,$img1);
- $r->print('
- '.$roster_result + .'
'.$$lt{'adds'}.'
'.$$lt{'drops'}.'
-
'.$$lt{'adds'}.'
'.$$lt{'drops'}.'
'.$$lt{'mapr'}); } sub mapping_settings { - my ($r,$tabcol,$rowColor1,$rowColor2,$sectioncount,$lt,$stored,$image, - $crstype) = @_; + my ($r,$sectioncount,$lt,$stored,$image,$crstype,$cdom,$cnum,$action) = @_; my @sections = keys(%{$sectioncount}); if (@sections > 0) { @sections = sort {$a cmp $b} @sections; unshift(@sections,'none'); # Put 'no sections' next unshift(@sections,'all'); # Put 'all' at the front of the list + } else { + @sections = ('all','none'); } - &topic_bar($r,$image,$$lt{'pirs'}); - $r->print(' -
| Function |
| Fixed |
| Optional |
| '. + &mt('Collaborative Tool').' | +
| '.&mt('Fixed').' | +
| '.&mt('Optional').' | +
| '.$tool.' |
| ');
} else {
- $r->print('
| ');
+ $r->print('
| ');
}
}
- $rowNum ++;
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
@@ -3396,11 +3744,11 @@ sub date_setting_table {
my $perpetual =
'||||
| '.&mt('Start:').' | '. + my $table = "
| '.&mt('Start:').' | '. ''.$startform.' | '. ''." |
| '.&mt('End:').' | '. + '||
| '.&mt('End:').' | '. ''.$endform.' | '. ''.$perpetual.' | '."
'
+ .&mt('Warning: failed to release lock for folder: [_1].',''.$folder_name.'')
+ .'
'
+ );
} else {
return 'ok';
}
@@ -3497,21 +3891,27 @@ sub map_updater {
my $newmapurl=&Apache::lonnet::finishuserfileupload($cnum,$cdom,$itemname,
$newfile);
if ($newmapurl !~ m|^/uploaded|) {
- $outcome = &mt('Error uploading new folder.')." ($newfile): $newmapurl".''; + $outcome = '
'
+ .&mt('Error uploading new folder.')." ($newfile): $newmapurl"
+ .'
';
return $outcome;
- }
- my ($errtext,$fatal)=&Apache::lonratedt::mapread($parentmap);
+ }
+ my ($errtext,$fatal)=&LONCAPA::map::mapread($parentmap);
if ($fatal) {
- $outcome = &mt('Error reading contents of parent folder')." ($parentmap): $errtext".''; + $outcome = '
'
+ .&mt('Error reading contents of parent folder.')." ($parentmap): $errtext"
+ .'
';
return $outcome;
} else {
- my $newidx=&Apache::lonratedt::getresidx($newmapurl);
- $Apache::lonratedt::resources[$newidx] = $itemtitle.':'.$newmapurl.
+ my $newidx=&LONCAPA::map::getresidx($newmapurl);
+ $LONCAPA::map::resources[$newidx] = $itemtitle.':'.$newmapurl.
':false:normal:res';
- $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
- my ($outtext,$errtext) = &Apache::lonratedt::storemap($parentmap,1);
+ $LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx;
+ my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1);
if ($errtext) {
- $outcome = &mt('Error storing updated parent folder')." ($parentmap): $errtext".''; + $outcome = '
'
+ .&mt('Error saving updated parent folder.')." ($parentmap): $errtext"
+ .'
';
return $outcome;
}
}
@@ -3545,18 +3945,26 @@ sub parm_setter {
},
);
my $res = $navmap->getResourceByUrl($url);
- my $symb = $res->symb();
- foreach my $level (keys(%hide_settings)) {
- my $parmresult = &Apache::lonparmset::storeparm_by_symb($symb,
+ if ($res) {
+ my $symb = $res->symb();
+ foreach my $level (keys(%hide_settings)) {
+ my $parmresult =
+ &Apache::lonparmset::storeparm_by_symb($symb,
'0_hiddenresource',
$hide_settings{$level}{'num'},
$hide_settings{$level}{'set'},
'string_yesno',undef,$cdom,
undef,undef,
$hide_settings{$level}{'extra'});
- if ($parmresult) {
- $allresults .= $level.': '.$parmresult;
+ if ($parmresult) {
+ $allresults .= $level.': '.$parmresult;
+ }
}
+ } else {
+ $allresults = ''
+ .&mt('Parameters not set for [_1] because the resource was not recognized'
+ .' as part of the course.',''.$url.'')
+ .'
';
}
return $allresults;
}
@@ -3620,7 +4028,12 @@ sub validate_groupname {
my ($groupname,$action,$cdom,$cnum,$gpterm,$ucgpterm,$crstype) = @_;
my %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
-
+ my %deleted_groups = &Apache::longroup::coursegroups($cdom,$cnum,undef,
+ 'deleted_groups');
+ if (my $tmp = &Apache::lonnet::error(%deleted_groups)) {
+ undef(%deleted_groups);
+ &Apache::lonnet::logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom);
+ }
my %lt = &Apache::lonlocal::texthash (
igna => "Invalid $gpterm name",
tgne => "The $gpterm name entered ",
@@ -3635,8 +4048,8 @@ sub validate_groupname {
"existing $gpterm",
);
- my $exitmsg = ''.$lt{'igna'}.''.$lt{'tgne'}.' "'. - $groupname.'" '; + my $exitmsg = ''.$lt{'igna'}.'
'. + $lt{'tgne'}.' "'.$groupname.'" '; my $dupmsg = $lt{'grna'}; my $earlyout; if (($groupname eq '') || ($groupname =~ /\W/)) { @@ -3647,12 +4060,14 @@ sub validate_groupname { return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}. '
'.$lt{'grna'}; } - if ($action eq 'create' - && exists($curr_groups{$groupname})) { - - return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm). - $lt{'inth'}.'
'.$lt{'grna'}; - + if ($action eq 'create') { + if (exists($curr_groups{$groupname})) { + return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm). + $lt{'inth'}.'.
'.$lt{'grna'}; + } elsif (exists($deleted_groups{$groupname})) { + return $exitmsg.$lt{'cnnb'}.&mt('a [_1] which previously existed',$gpterm). + $lt{'inth'}.'.
'.$lt{'grna'}; + } } elsif ($action eq 'modify') { unless(exists($curr_groups{$groupname})) { $earlyout = &mt('[_1] name:',$ucgpterm).' '.$groupname.$lt{'thgr'}. @@ -3663,17 +4078,6 @@ sub validate_groupname { return; } -sub topic_bar { - my ($r,$imgnum,$title) = @_; - $r->print(' -
- 
- '.$title.'
-
-');
- return;
-}
-
sub check_changes {
my ($member_changes,$memchg) = @_;
my %exclusions;
- '.$title.'
-