--- loncom/interface/loncoursegroups.pm 2006/02/21 18:56:00 1.6
+++ loncom/interface/loncoursegroups.pm 2006/04/10 19:59:53 1.13
@@ -102,8 +102,7 @@ sub handler {
sub print_main_menu {
my ($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,$view_permission,
$manage_permission,$action,$rowColor1,$rowColor2) = @_;
- $r->print(&header('Course Groups',&mt('LON-CAPA Course Groups'),
- undef,undef,undef,undef,$function));
+ $r->print(&header('Course Groups',undef,undef,undef,undef,$function));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/coursegroups",
text=>"Course Groups",});
@@ -145,14 +144,20 @@ sub display_groups {
file => 'Files',
dibd => 'Discussion Boards',
dius => 'Disk Use',
- );
- $r->print('
');
+ nogr => 'No groups exist.',
+ crng => 'Create a new group',
+ alth => 'Although your current role has privileges'.
+ ' to view any existing groups in this course,'.
+ ' you do not have privileges to create new'.
+ ' groups.',
+ );
if ($view_permission) {
if (!defined($action)) {
$action = 'view';
}
my %curr_groups;
if (&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum)) {
+ $r->print('
');
$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(<<"END");
@@ -251,11 +256,18 @@ END
$r->print('
');
$r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('No groups exist');
+ $r->print($lt{'nogr'});
+ if ($manage_permission) {
+ $r->print('
'.$lt{'crng'}.'');
+ } else {
+ $r->print('
'.$lt{'crng'});
+
+ }
}
} else {
my @coursegroups = split(/:/,$env{'request.course.groups'});
if (@coursegroups > 0) {
+ $r->print('
');
my %curr_groups;
if (&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum)) {
foreach my $group (@coursegroups) {
@@ -452,7 +464,8 @@ sub group_administration {
}
}
- if ($action eq 'create') {
+ if (($action eq 'create') ||
+ ($action eq 'modify' && $state eq 'pick_members')) {
if (defined($env{'form.types'})) {
@types=&Apache::loncommon::get_env_multiple('form.types');
}
@@ -473,6 +486,9 @@ sub group_administration {
}
if ($state eq 'pick_members') {
if ((keys(%users) > 0) && (@tools > 0)) {
+ if ($granularity eq 'Yes') {
+ $elements{$action}{'pick_members'}{'togglefunc'} = 'checkbox';
+ }
foreach my $tool (@tools) {
if ($granularity eq 'Yes') {
$elements{$action}{'pick_members'}{'user_'.$tool} = 'checkbox';
@@ -527,6 +543,9 @@ sub group_administration {
$elements{$action}{'change_members'}{'reenable'} = 'checkbox';
}
if ($numusers) {
+ if ($granularity eq 'Yes') {
+ $elements{$action}{'change_members'}{'togglefunc'} = 'checkbox';
+ }
foreach my $tool (@tools) {
if ($granularity eq 'Yes') {
$elements{$action}{'change_members'}{'user_'.$tool} = 'checkbox';
@@ -702,8 +721,8 @@ function changeSort(caller) {
}
my $loaditems = &onload_action($action,$state);
- $r->print(&header('Course Groups Manager',&mt('LON-CAPA Groups Manager'),
- $jscript,$action,$state,$page,$function,$loaditems));
+ $r->print(&header('Course Groups Manager',
+ $jscript,$action,$state,$page,$function,$loaditems));
if ($env{'form.refpage'} eq 'enrl') {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -763,7 +782,7 @@ function changeSort(caller) {
\@sections,\%states,\%navbuttons,$rowColor1,$rowColor2);
last;
} else {
- if (($state =~ /^\w+result$/) && ($i > 0)) {
+ if (($state eq 'result') && ($i > 0)) {
&Apache::lonhtmlcommon::add_breadcrumb(
{href=>"javascript:backPage(document.$state,'$states{$action}[0]')",
text=>"$trail{$action}{$states{$action}[$i]}"});
@@ -932,19 +951,16 @@ sub display_control {
}
sub header {
- my ($bodytitle,$title,$jscript,$action,$state,$page,$function,$loaditems) = @_;
- my $html=&Apache::lonxml::xmlbegin();
- my $bodytag=&Apache::loncommon::bodytag($bodytitle,$function,$loaditems);
+ my ($bodytitle,$jscript,$action,$state,$page,$function,$loaditems) = @_;
+ my $start_page=
+ &Apache::loncommon::start_page($bodytitle,
+ '',
+ {'function' => $function,
+ 'add_entries' => $loaditems,});
my $output = <<"END";
-$html
-
-$title
-
-
-$bodytag
-
-