@@ -319,23 +329,31 @@ END
if (!$functionality) {
$functionality = &mt('None available');
}
- my $link = $actionlinks{$action};
+ my $link;
if ($action eq 'modify' || $action eq 'delete' ||
$action eq 'reenable') {
- $link .= $group;
+ $link = ''.$lt{$action}.'';
} else {
- $link .= $group.'/smppg?ref=grouplist';
- if (exists($env{'form.refpage'})) {
- $link .= '&refpage='.$env{'form.refpage'};
+ $link =
+ &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap,
+ $view_permission);
+ if ($link) {
+ $link = ''.$lt{$action}.'';
}
}
- $link .= '">'.$lt{$action}.'';
if ($action eq 'view') {
if ($manage_permission) {
- $link .= ' '.$actionlinks{'modify'}.
- $group.'">'.$lt{'modify'}.''.
- ' '.$actionlinks{'delete'}.
- $group.'">'.$lt{'delete'}.'';
+ $link .= ' '.$lt{'modify'}.''.$lt{'delete'}.'';
}
}
$r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').
@@ -383,19 +401,60 @@ END
} else {
my @coursegroups = split(/:/,$env{'request.course.groups'});
if (@coursegroups > 0) {
+ my $numlinks = 0;
$r->print('
');
my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
if (%curr_groups) {
+ my $navmap=Apache::lonnavmaps::navmap->new();
+ if (!defined($navmap)) {
+ $r->print('
'.
+ &mt('An error occurred retrieving information about resources in the course.').' '.
+ &mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this page.','','').
+ '
');
+ return;
+ }
foreach my $group (@coursegroups) {
my %group_info = &Apache::longroup::get_group_settings(
$curr_groups{$group});
my $description = &unescape(
$group_info{description});
- $r->print(''.$group,' '.$description.'
'
+ .&mt('You do not currently have access to any '.$gpterm.'s'
+ .' in this '.lc($crstype).'.')
+ .'
'
+ );
+ }
} else {
- $r->print(&mt('You are not currently a member of any active '.$gpterm.'s in this '.lc($crstype).'.'));
+ $r->print(
+ '
'
+ .&mt('You are not currently a member of any active '.$gpterm.'s'
+ .' in this '.lc($crstype).'.')
+ .'
'
+ );
}
}
return;
@@ -785,7 +844,7 @@ sub group_administration {
}
var maxposs = '.sprintf("%.2f",$maxposs).';
if (newquota > maxposs) {
- alert("The group portfolio quota you entered for this group ("+newquota+" Mb) exceeds the maximum possible ("+maxposs+" Mb). Please enter a smaller number.");
+ alert("The group portfolio quota you entered for this group ("+newquota+" MB) exceeds the maximum possible ("+maxposs+" MB). Please enter a smaller number.");
return;
}
var re_quota = '.$float_check.';
@@ -804,7 +863,7 @@ sub group_administration {
}
}
if (warn_zero == 1) {
- alert("You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 Mb.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.");
+ alert("You have indicated that the group portfolio should be enabled, but you have set the repository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.");
return;
}
}
@@ -870,7 +929,7 @@ function changeSort(caller) {
faq=>9,bug=>'Instructor Interface',});
if ($action eq 'modify' || $action eq 'delete') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursegroups?refpage=cusr&action=$action",
+ ({href=>"/adm/coursegroups?refpage=cusr&action=$action",
text=>"Groups",
faq=>9,bug=>'Instructor Interface',});
}
@@ -1210,12 +1269,12 @@ sub delete_group {
if ($result eq 'ok') {
my $outcome = &modify_folders($cdom,$cnum,$groupname,$crstype);
if ($outcome eq '') {
- $r->print('
');
- if ($crstype eq 'Comunity') {
+ if ($crstype eq 'Community') {
$r->print(&mt("Although the group was deleted, an error occurred when removing the group's folder from the 'Community Groups' folder: [_1]",$outcome));
} else {
$r->print(&mt("Although the group was deleted, an error occurred when removing the group's folder from the 'Course Groups' folder: [_1]",$outcome));
@@ -1223,9 +1282,9 @@ sub delete_group {
$r->print('
');
}
} else {
- $r->print('
'
- .&mt('Group deletion failed.')
- .'
');
+ my $msg = &Apache::lonhtmlcommon::confirm_success(&mt('Group deletion failed.'),1);
+ $msg = &Apache::loncommon::confirmwrapper($msg);
+ $r->print($msg);
}
}
return;
@@ -1255,7 +1314,7 @@ sub reenable_folder {
$LONCAPA::map::resources[$idx] = $foldertitle.':'.$mapurl.
':false:normal:res';
$LONCAPA::map::order[1+$#LONCAPA::map::order]=$idx;
- my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1);
+ my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1,1);
if ($errtext) {
$outcome='
'
.&mt('An error occurred when saving updated parent folder to group:'
@@ -1320,7 +1379,7 @@ sub modify_folders {
$LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
}
$#LONCAPA::map::order--;
- my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+ my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,1);
if ($errtext) {
$outcome='
'
.&mt('An error occurred when saving updated parent folder to group:')
@@ -1437,12 +1496,12 @@ $context) eq 'ok') {
}
my $outcome = &reenable_folder($cdom,$cnum,$groupname,$description,$crstype);
if ($outcome eq '') {
- $r->print('
');
- if ($crstype eq 'Comunity') {
+ if ($crstype eq 'Community') {
$r->print(&mt("Although the group was re-enabled, an error occurred when adding the group's folder to the 'Community Groups' folder: [_1]",$outcome));
} else {
$r->print(&mt("Although the group was re-enabled, an error occurred when adding the group's folder to the 'Course Groups' folder: [_1]",$outcome));
@@ -1450,9 +1509,9 @@ $context) eq 'ok') {
$r->print('
');
}
} else {
- $r->print('
'
- .&mt('Re-enabling group failed.')
- .'
');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling group failed.'),1);
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
}
return;
}
@@ -1466,7 +1525,7 @@ sub header {
{'add_entries' => $loaditems,});
my $output = <<"END";
$start_page
-