--- loncom/interface/loncoursegroups.pm 2006/07/07 16:48:21 1.40
+++ loncom/interface/loncoursegroups.pm 2006/07/20 22:17:14 1.55
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.40 2006/07/07 16:48:21 albertel Exp $
+# $Id: loncoursegroups.pm,v 1.55 2006/07/20 22:17:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,15 +59,13 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','refpage','state','groupname','branch']);
- my $function = &Apache::loncommon::get_users_function();
- my $tabcol = &Apache::loncommon::designparm($function.'.tabbg');
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $view_permission =
- &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
my $manage_permission =
- &Apache::lonnet::allowed('mdg',$env{'request.course.id'});
+ &Apache::lonnet::allowed('mdg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $gpterm = &Apache::loncommon::group_term();
@@ -91,22 +89,25 @@ sub handler {
$idx{uname} = &Apache::loncoursedata::CL_SNAME();
$idx{section} = &Apache::loncoursedata::CL_SECTION();
- my $rowColor1 = "#dddddd";
- my $rowColor2 = "#eeeeee";
-
my $action = $env{'form.action'};
my $state = $env{'form.state'};
- if ((!defined($action)) || ($action eq 'view')) {
+ if ((!defined($action)) || ($action eq 'view') || ($action eq 'modify')) {
if (!defined($state)) {
$state = 'view';
}
}
if ($action eq 'create' || $action eq 'modify' || $action eq 'view') {
if ($view_permission || $manage_permission) {
- &group_administration($r,$action,$state,$cdom,$cnum,$function,
- $tabcol,\%functions,\%idx,$view_permission,
- $manage_permission,$rowColor1,$rowColor2,
- $gpterm,$ucgpterm,$crstype);
+ if ($state eq 'view') {
+ &print_main_menu($r,$cdom,$cnum,\%functions,\%idx,
+ $view_permission,$manage_permission,
+ $action,$state,$gpterm,$ucgpterm,$crstype);
+ } else {
+ &group_administration($r,$action,$state,$cdom,$cnum,
+ \%functions,\%idx,$view_permission,
+ $manage_permission,$gpterm,$ucgpterm,
+ $crstype);
+ }
} else {
$r->print(&mt('You do not have [_1] administration '.
'privileges in this [_2]',$gpterm,lc($crstype)));
@@ -122,17 +123,21 @@ sub handler {
sub print_main_menu {
my ($r,$cdom,$cnum,$functions,$idx,$view_permission,$manage_permission,
$action,$state,$gpterm,$ucgpterm,$crstype) = @_;
- my $pagename = "$crstype $ucgpterm".'s';
my $jscript = qq|
function changeSort(caller) {
document.$state.sortby.value = caller;
document.$state.submit();
}\n|;
- $r->print(&header($pagename,$jscript,$action,$state));
+ $r->print(&header('Groups',$jscript,$action,$state));
+ if ($env{'form.refpage'} eq 'enrl') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/dropadd",
+ text=>"Enrollment Manager"});
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/coursegroups",
- text=>"$pagename"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($pagename));
+ text=>"Groups"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Groups'));
&display_groups($r,$cdom,$cnum,$functions,$idx,$view_permission,
$manage_permission,$action,$state,$gpterm,$ucgpterm,
$crstype);
@@ -147,7 +152,7 @@ sub display_groups {
my %grp_info = ();
my %actionlinks = (
modify => '<a href="/adm/coursegroups?action=modify&refpage='.
- $env{'form.refpage'}.'&groupname=',
+ $env{'form.refpage'}.'&state=pick_task&groupname=',
view => '<a href="/adm/'.$cdom.'/'.$cnum.'/',
delete => '<a href="/adm/coursegroups?action=delete&refpage='.
$env{'form.refpage'}.'&groupname=',
@@ -157,23 +162,23 @@ sub display_groups {
view => 'View',
delete => 'Delete',
act => 'Action',
- gname => "$ucgpterm Name",
- desc => 'Description',
+ gname => 'Group Name',
+ desc => 'Group Title',
crea => 'Creator',
crtd => 'Created',
last => 'Last Modified',
- func => 'Functionality',
+ func => 'Collaborative Tools',
quot => 'Quota (Mb)',
memb => 'Members',
file => 'Files',
dibd => 'Discussion Boards',
dius => 'Disk Use (%)',
- nogr => 'No '.$gpterm.'s exist.',
- crng => 'Create a new '.$gpterm,
+ nogr => 'No groups exist.',
+ crng => 'Create a new group',
alth => 'Although your current role has privileges'.
- ' to view any existing '.$gpterm.'s in this'.
+ ' to view any existing groups in this'.
lc($crstype).', you do not have privileges'.
- 'to create new '.$gpterm.'s.',
+ 'to create new groups.',
);
if ($view_permission) {
if (!defined($action)) {
@@ -182,7 +187,9 @@ sub display_groups {
my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
if (%curr_groups) {
if ($manage_permission) {
- $r->print('<br /><a href="/adm/coursegroups?action=create&refpage='.$env{'form.refpage'}.'">'.$lt{'crng'}.'</a>');
+ if (!exists($env{'form.refpage'})) {
+ $r->print('<br /><a href="/adm/coursegroups?action=create">'.$lt{'crng'}.'</a>');
+ }
}
$r->print('<br /><br />');
$r->print(&Apache::loncommon::start_data_table().
@@ -278,7 +285,10 @@ END
if ($action eq 'modify' || $action eq 'delete') {
$link .= $group;
} else {
- $link .= $group.'/grppg';
+ $link .= $group.'/smppg?ref=grouplist';
+ if (exists($env{'form.refpage'})) {
+ $link .= '&refpage='.$env{'form.refpage'};
+ }
}
$link .= '">'.$lt{$action}.'</a>';
if ($action eq 'view') {
@@ -317,7 +327,9 @@ END
} else {
$r->print($lt{'nogr'});
if ($manage_permission) {
- $r->print('<br /><br /><a href="/adm/coursegroups?action=create&refpage='.$env{'form.refpage'}.'">'.$lt{'crng'}.'</a>');
+ if (!exists($env{'form.refpage'})) {
+ $r->print('<br /><br /><a href="/adm/coursegroups?action=create">'.$lt{'crng'}.'</a>');
+ }
} else {
$r->print('<br /><br />'.$lt{'alth'});
@@ -334,8 +346,7 @@ END
$curr_groups{$group});
my $description = &unescape(
$group_info{description});
- my ($uname,$udom) = split(/:/,$group_info{creator});
- $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
+ $r->print('<font size="+1"><a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?ref=grouplist">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
}
}
} else {
@@ -348,14 +359,14 @@ END
}
sub group_administration {
- my ($r,$action,$state,$cdom,$cnum,$function,$tabcol,$functions,$idx,
- $view_permission,$manage_permission,$rowColor1,$rowColor2,$gpterm,
- $ucgpterm,$crstype) = @_;
+ my ($r,$action,$state,$cdom,$cnum,$functions,$idx,$view_permission,
+ $manage_permission,$gpterm,$ucgpterm,$crstype) = @_;
my %sectioncount = ();
my @tools = ();
my @types = ();
my @roles = ();
my @sections = ();
+ my @buildsections = ();
my %users = ();
my %userdata = ();
my @members = ();
@@ -407,8 +418,6 @@ sub group_administration {
if ($state eq '') {
if (defined($env{'form.groupname'})) {
$state = 'pick_task';
- } else {
- $state = 'pick_group';
}
} else {
%stored = &retrieve_settings($cdom,$cnum,$groupname);
@@ -502,11 +511,9 @@ sub group_administration {
(($action eq 'modify') && (($state eq 'change_settings') ||
($state eq 'add_members')))) {
%sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
- if (%sectioncount) {
- $elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox';
- $elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox';
- $elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox';
- }
+ $elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox';
+ $elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox';
+ $elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox';
}
if (($action eq 'create') ||
@@ -520,13 +527,15 @@ sub group_administration {
if (defined($env{'form.sectionpick'})) {
@sections=&Apache::loncommon::get_env_multiple('form.sectionpick');
if (grep/^all$/,@sections) {
- @sections = sort {$a cmp $b} keys(%sectioncount);
+ @buildsections = sort {$a cmp $b} keys(%sectioncount);
+ } else {
+ @buildsections = @sections;
}
}
}
if (($state eq 'pick_members') || ($state eq 'pick_privs') || ($state eq 'change_privs')) {
- &build_members_list($cdom,$cnum,\@types,\@roles,\@sections,\%users,
+ &build_members_list($cdom,$cnum,\@types,\@roles,\@buildsections,\%users,
\%userdata);
}
if ($state eq 'pick_members') {
@@ -562,7 +571,7 @@ sub group_administration {
$num_reenable ++;
next;
} elsif (($start > $now)) {
- $num_activate = 1;
+ $num_activate ++;
next;
} else {
$num_expire ++;
@@ -731,13 +740,13 @@ sub group_administration {
my $space_trim = '/^\s*|\s*\$/g,""';
my $float_check = '/^([0-9]*\.?[0-9]*)$/';
$validate_script = '
- var newquota = document.'.$state.'.quota.value;
+ var newquota = new String(document.'.$state.'.quota.value);
newquota.replace('.$space_trim.');
if (newquota == "" ) {
document.'.$state.'.quota.value = 0;
- newquota = 0;
+ newquota = "0";
}
- var maxposs = '.$maxposs.';
+ var maxposs = '.sprintf("%.2f",$maxposs).';
if (newquota > maxposs) {
alert("The file repository quota you entered for this group ("+newquota+" Mb) exceeds the maximum possible ("+maxposs+" Mb). Please enter a smaller number.");
return;
@@ -788,7 +797,7 @@ function changeSort(caller) {
my %states = ();
my %branchstates = ();
@{$states{'create'}} = ('pick_name','pick_members','pick_privs','result');
- @{$states{'modify'}} = ('pick_group','pick_task');
+ @{$states{'modify'}} = ('pick_task');
@{$branchstates{'noprivs'}} = ('result');
@{$branchstates{'settings'}} = ('change_settings','chgresult');
@{$branchstates{'members'}} = ('change_members','change_privs','memresult');
@@ -812,8 +821,7 @@ function changeSort(caller) {
}
my $loaditems = &onload_action($action,$state);
- my $crumbtitle = "$crstype $ucgpterm".'s';
- $r->print(&header("$crumbtitle Manager",
+ $r->print(&header("Groups Manager",
$jscript,$action,$state,$page,$loaditems));
if ($env{'form.refpage'} eq 'enrl') {
@@ -821,11 +829,22 @@ function changeSort(caller) {
({href=>"/adm/dropadd",
text=>"Enrollment Manager",
faq=>9,bug=>'Instructor Interface',});
- } else {
+ if ($action eq 'modify') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursegroups?refpage=enrl&action=modify",
+ text=>"Groups",
+ faq=>9,bug=>'Instructor Interface',});
+ }
+ } else {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursegroups",
- text=>"$crumbtitle",
- faq=>9,bug=>'Instructor Interface',});
+ ({href=>"/adm/coursegroups",
+ text=>"Groups",
+ faq=>9,bug=>'Instructor Interface',});
+ if ($env{'form.refpage'} eq 'grouplist') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/$cdom/$cnum/$env{'form.groupname'}/smppg?ref=grouplist",
+ text=>"Group: $description",});
+ }
}
my %trail = ();
@@ -836,7 +855,6 @@ function changeSort(caller) {
result => 'Creation Complete',
);
%{$trail{'modify'}} = &Apache::lonlocal::texthash(
- pick_group => $ucgpterm.'s',
pick_task => 'Choose Task',
change_settings => "$ucgpterm Settings",
change_members => 'Modify/Delete Members',
@@ -864,15 +882,15 @@ function changeSort(caller) {
&Apache::lonhtmlcommon::add_breadcrumb(
{text=>"$trail{$action}{$state}"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- ("$crumbtitle Manager"));
- &display_control($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ ("Groups Manager"));
+ &display_control($r,$cdom,$cnum,$action,$state,$page,
\%sectioncount,$groupname,$description,$functions,
\@tools,$toolprivs,$fixedprivs,$startdate,$enddate,
\%users,\%userdata,$idx,\%memchg,\%usertools,
- $function,$view_permission,$manage_permission,
+ $view_permission,$manage_permission,
\%stored,$granularity,$quota,$specificity,\@types,\@roles,
- \@sections,\%states,\%navbuttons,$rowColor1,$rowColor2,
- $gpterm,$ucgpterm,$crstype);
+ \@sections,\%states,\%navbuttons,$gpterm,$ucgpterm,
+ $crstype);
last;
} else {
if (($state eq 'result') && ($i > 0)) {
@@ -889,9 +907,8 @@ function changeSort(caller) {
} elsif (($action eq 'view') && ($view_permission)) {
&Apache::lonhtmlcommon::add_breadcrumb(
{text=>"View $gpterm".'s'});
- my $crumbtitle = "$crstype $ucgpterm".'s Manager';
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (&mt($crumbtitle)));
+ ('Groups Manager'));
&display_groups($r,$cdom,$cnum,$functions,$idx,$view_permission,
$manage_permission,$action,$state,$gpterm,$ucgpterm,
$crstype);
@@ -960,98 +977,86 @@ sub retrieve_settings {
}
sub display_control {
- my ($r,$cdom,$cnum,$tabcol,$action,$state,$page,$sectioncount,$groupname,
+ my ($r,$cdom,$cnum,$action,$state,$page,$sectioncount,$groupname,
$description,$functions,$tools,$toolprivs,$fixedprivs,$startdate,
- $enddate,$users,$userdata,$idx,$memchg,$usertools,$function,
+ $enddate,$users,$userdata,$idx,$memchg,$usertools,
$view_permission,$manage_permission,$stored,$granularity,$quota,
- $specificity,$types,$roles,$sections,$states,$navbuttons,$rowColor1,
- $rowColor2,$gpterm,$ucgpterm,$crstype) = @_;
+ $specificity,$types,$roles,$sections,$states,$navbuttons,
+ $gpterm,$ucgpterm,$crstype) = @_;
if ($action eq 'create') {
if ($state eq 'pick_name') {
- &general_settings_form($r,$cdom,$cnum,$action,$tabcol,$state,$page,
+ &general_settings_form($r,$cdom,$cnum,$action,$state,$page,
$functions,$tools,$toolprivs,$fixedprivs,
$sectioncount,$stored,$states,$navbuttons,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,
- $crstype);
+ $gpterm,$ucgpterm,$crstype);
} elsif ($state eq 'pick_members') {
- &choose_members_form($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &choose_members_form($r,$cdom,$cnum,$action,$state,$page,
$groupname,$description,$granularity,$quota,
$startdate,$enddate,$tools,$fixedprivs,
$toolprivs,$functions,$users,$userdata,$idx,
- $stored,$states,$navbuttons,$rowColor1,
- $rowColor2,$gpterm,$ucgpterm,$crstype);
+ $stored,$states,$navbuttons,$gpterm,$ucgpterm,
+ $crstype);
} elsif ($state eq 'pick_privs') {
- &choose_privs_form($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &choose_privs_form($r,$cdom,$cnum,$action,$state,$page,
$startdate,$enddate,$tools,$functions,
$toolprivs,$fixedprivs,$userdata,$usertools,
$idx,$states,$stored,$sectioncount,$navbuttons,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,
- $crstype);
+ $gpterm,$ucgpterm,$crstype);
} elsif ($state eq 'result') {
- &process_request($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &process_request($r,$cdom,$cnum,$action,$state,$page,
$groupname,$description,$specificity,$userdata,
$startdate,$enddate,$tools,$functions,
$toolprivs,$usertools,$idx,$types,$roles,
$sections,$states,$navbuttons,$memchg,
- $sectioncount,$stored,$rowColor1,$rowColor2,
- $gpterm,$ucgpterm,$crstype);
+ $sectioncount,$stored,$gpterm,$ucgpterm,$crstype);
}
} elsif ($action eq 'modify') {
my $groupname = $env{'form.groupname'};
- if ($state eq 'pick_group') {
- &display_groups($r,$cdom,$cnum,$functions,$idx,$view_permission,
- $manage_permission,$action,$state,$gpterm,
- $ucgpterm,$crstype);
- } elsif ($state eq 'pick_task') {
+ if ($state eq 'pick_task') {
&modify_menu($r,$groupname,$page,$gpterm);
} elsif ($state eq 'change_settings') {
- &general_settings_form($r,$cdom,$cnum,$action,$tabcol,$state,$page,
+ &general_settings_form($r,$cdom,$cnum,$action,$state,$page,
$functions,$tools,$toolprivs,$fixedprivs,
$sectioncount,$stored,$states,$navbuttons,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,
- $crstype);
+ $gpterm,$ucgpterm,$crstype);
} elsif ($state eq 'change_members') {
- &change_members_form($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &change_members_form($r,$cdom,$cnum,$action,$state,$page,
$groupname,$description,$startdate,$enddate,
$tools,$fixedprivs,$functions,$users,
$userdata,$granularity,$quota,$specificity,
- $idx,$states,$navbuttons,$rowColor1,$rowColor2,
- $gpterm,$ucgpterm);
+ $idx,$states,$navbuttons,$gpterm,$ucgpterm);
} elsif ($state eq 'add_members') {
- &add_members_form($r,$tabcol,$action,$state,$page,$startdate,
+ &add_members_form($r,$action,$state,$page,$startdate,
$enddate,$groupname,$description,$granularity,
$quota,$sectioncount,$tools,$functions,$stored,
- $states,$navbuttons,$rowColor1,$rowColor2,$gpterm,
- $ucgpterm);
+ $states,$navbuttons,$gpterm,$ucgpterm);
} elsif ($state eq 'pick_members') {
- &choose_members_form($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &choose_members_form($r,$cdom,$cnum,$action,$state,$page,
$groupname,$description,$granularity,$quota,
$startdate,$enddate,$tools,$fixedprivs,
$toolprivs,$functions,$users,$userdata,$idx,
- $stored,$states,$navbuttons,$rowColor1,
- $rowColor2,$gpterm,$ucgpterm,$crstype);
+ $stored,$states,$navbuttons,$gpterm,$ucgpterm,
+ $crstype);
} elsif ($state eq 'pick_privs') {
- &choose_privs_form($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &choose_privs_form($r,$cdom,$cnum,$action,$state,$page,
$startdate,$enddate,$tools,$functions,
$toolprivs,$fixedprivs,$userdata,$usertools,
$idx,$states,$stored,$sectioncount,$navbuttons,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,$crstype);
+ $gpterm,$ucgpterm,$crstype);
} elsif ($state eq 'change_privs') {
- &change_privs_form($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &change_privs_form($r,$cdom,$cnum,$action,$state,$page,
$startdate,$enddate,$tools,$functions,
$toolprivs,$fixedprivs,$userdata,$usertools,
$memchg,$idx,$states,$stored,$sectioncount,
- $navbuttons,$rowColor1,$rowColor2,$gpterm,
- $ucgpterm);
+ $navbuttons,$gpterm,$ucgpterm);
} elsif ($state eq 'chgresult' || $state eq 'memresult' ||
$state eq 'addresult') {
- &process_request($r,$cdom,$cnum,$tabcol,$action,$state,$page,
+ &process_request($r,$cdom,$cnum,$action,$state,$page,
$groupname,$description,$specificity,$userdata,
$startdate,$enddate,$tools,$functions,
$toolprivs,$usertools,$idx,$types,$roles,
$sections,$states,$navbuttons,$memchg,
- $sectioncount,$stored,$rowColor1,$rowColor2,
- $gpterm,$ucgpterm,$crstype);
+ $sectioncount,$stored,$gpterm,$ucgpterm,$crstype);
}
}
}
@@ -1092,8 +1097,7 @@ sub onload_action {
}
if (($action eq 'modify') &&
($state eq 'change_settings' || $state eq 'change_members' ||
- $state eq 'change_privs' || $state eq 'add_members' ||
- $state eq 'pick_members')) {
+ $state eq 'change_privs' || $state eq 'add_members')) {
$loaditems{'onload'} =
'javascript:setFormElements(document.'.$state.')';
}
@@ -1171,21 +1175,23 @@ sub group_members {
if ($totalmembers == 0) {
$$group_info{$group}{'totalmembers'} = 'None';
} else {
- $$group_info{$group}{'totalmembers'} = $active.' - active<br />'.$previous.' -previous<br />'.$future.' -future';
+ $$group_info{$group}{'totalmembers'} = '<nobr>'.$active.
+ ' - active</nobr><br /><nobr>'.$previous.
+ ' - previous</nobr><br /><nobr>'.$future.
+ ' - future</nobr>';
}
return 'ok';
}
sub general_settings_form {
- my ($r,$cdom,$cnum,$action,$tabcol,$formname,$page,$functions,$tools,
+ my ($r,$cdom,$cnum,$action,$formname,$page,$functions,$tools,
$toolprivs,$fixedprivs,$sectioncount,$stored,$states,$navbuttons,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,$crstype) = @_;
+ $gpterm,$ucgpterm,$crstype) = @_;
my ($nexttext,$prevtext);
- &groupsettings_options($r,$tabcol,$functions,$action,$formname,$stored,1,
+ &groupsettings_options($r,$functions,$action,$formname,$stored,1,
$gpterm,$ucgpterm,$crstype);
- &access_date_settings($r,$tabcol,$action,$formname,$stored,2,$gpterm,
- $ucgpterm);
+ &access_date_settings($r,$action,$formname,$stored,2,$gpterm,$ucgpterm);
if ($action eq 'create') {
&membership_options($r,$action,$formname,$sectioncount,3,$gpterm,
$ucgpterm);
@@ -1195,12 +1201,12 @@ sub general_settings_form {
my @unavailable = ();
&check_tools($functions,$tools,\@available,\@unavailable);
@{$tools} = sort(keys(%{$functions}));
- &privilege_specificity($r,$tabcol,$rowColor1,$rowColor2,$action,
- 3,$tools,$stored,$toolprivs,$fixedprivs,
- \@available,$formname,$gpterm,$ucgpterm);
- &mapping_options($r,$action,$formname,$page,$tabcol,$sectioncount,
- $states,$stored,$navbuttons,4,5,$rowColor1,
- $rowColor2,$gpterm,$ucgpterm,$crstype);
+ &privilege_specificity($r,$action,3,$tools,$stored,$toolprivs,
+ $fixedprivs,\@available,$formname,
+ $gpterm,$ucgpterm);
+ &mapping_options($r,$action,$formname,$page,$sectioncount,
+ $states,$stored,$navbuttons,4,5,
+ $gpterm,$ucgpterm,$crstype);
$nexttext = $$navbuttons{'mose'};
}
$prevtext = $$navbuttons{'gtpp'};
@@ -1210,32 +1216,29 @@ sub general_settings_form {
}
sub groupsettings_options {
- my ($r,$tabcol,$functions,$action,$formname,$stored,$image,$gpterm,
+ my ($r,$functions,$action,$formname,$stored,$image,$gpterm,
$ucgpterm,$crstype) = @_;
my %lt = &Apache::lonlocal::texthash(
- 'gdat' => "$ucgpterm open and close dates",
- 'sten' => "Set a start date/time and end date/time for the $gpterm",
- 'gfun' => "$ucgpterm functionality",
- 'gnde' => "$ucgpterm name, description and available functionality",
- 'desc' => 'Description',
- 'func' => 'Functionality',
- 'gnam' => "$ucgpterm Name",
- 'doyo' => "Do you want to assign different functionality ".
- "to different $gpterm members?",
+ 'gdat' => "Group access start and end dates",
+ 'gnde' => "Group name, title and available collaborative tools",
+ 'desc' => 'Group Title',
+ 'func' => 'Collaborative Tools',
+ 'gnam' => 'Group Name',
+ 'lett' => 'Letters, numbers and underscore only',
+ 'doyo' => 'Different subsets of the chosen collaborative tools '.
+ 'for different group members?',
);
my ($crsquota,$freespace,$maxposs) = &get_quota_constraints($action,$stored);
&topic_bar($r,$image,$lt{'gnde'});
$r->print('
- <tr>
- <td> </td>
- <td colspan="3">
- <table border="0" cellpadding="2" cellspacing="2">
+ <table class="LC_descriptive_input">
<tr>
- <td><b>'.$lt{'gnam'}.':</b></td>
+ <td class="LC_description">'.$lt{'gnam'}.':</td>
<td colspan="5">
');
if ($action eq 'create') {
- $r->print('<input type="text" name="groupname" size="25" />');
+ $r->print('<input type="text" name="groupname" size="25" /> ('.
+ $lt{'lett'}.')');
} else {
$r->print('<input type="hidden" name="groupname" value="'.
$env{'form.groupname'}.'" />'.$env{'form.groupname'});
@@ -1244,13 +1247,13 @@ sub groupsettings_options {
</td>
<tr>
<tr>
- <td><b>$lt{'desc'}:</b></td>
+ <td class="LC_description">$lt{'desc'}:</td>
<td colspan="5"><input type="text" name="description" size="40"
value="" />
</td>
<tr>
<tr>
- <td><b>$lt{'func'}:</b></td>
+ <td class="LC_description">$lt{'func'}:</td>
END
my $numitems = keys(%{$functions});
my $halfnum = int($numitems/2);
@@ -1284,7 +1287,7 @@ END
</td>
</tr>
<tr>
- <td><b>'.&mt('Granularity:').'</b></td>
+ <td class="LC_description">'.&mt('Granularity:').'</td>
<td colspan="10">'.$lt{'doyo'}.' <label><input type="radio" name="granularity" value="Yes" />'.&mt('Yes').'</label> <label><input type="radio" name="granularity" value="No" checked="checked" />'.&mt('No').'</label>');
if ($action eq 'modify') {
$r->print(' ('.&mt('Currently set to "[_1]"',
@@ -1294,7 +1297,7 @@ END
</td>
</tr>
<tr>
- <td valign="top">'.&mt('<b>Disk quota:</b> ').'</td><td colspan="10">');
+ <td class="LC_description">'.&mt('Disk quota: ').'</td><td colspan="10">');
if ($action eq 'create') {
$r->print(&mt('If you enable the file repository for the [_1], allocate a disk quota.',$gpterm));
} else {
@@ -1303,23 +1306,21 @@ END
$r->print(' <input type="text" name="quota" size="4" />Mb');
if ($action eq 'create') {
$r->print('<br />'.
- &mt('A total of [_1] Mb is shared between all [_2]s in the '.
+ &mt('A total of [_1] Mb can be divided amongst all [_2]s in the '.
'[_3], and [_4] Mb are currently unallocated.',$crsquota,
- $gpterm,lc($crstype),$freespace));
+ $gpterm,lc($crstype),sprintf("%.2f",$freespace)));
} else {
$r->print(' ('.&mt('The quota is currently [_1] Mb',
$$stored{'quota'}).').');
$r->print('<br />'.&mt('The quota can be increased to [_1] Mb, '.
'by adding all unallocated space for [_2]s in the [_3].',
- $maxposs,$gpterm,lc($crstype)));
+ sprintf("%.2f",$maxposs),$gpterm,lc($crstype)));
}
$r->print('
</td>
</tr>
</table>
- </td>
- </tr>
');
return;
}
@@ -1344,15 +1345,15 @@ sub membership_options {
my ($r,$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 <i>changes</i> in the course.",
'acty' => 'Access types',
'coro' => $crstype.' roles',
'cose' => $crstype.' sections',
@@ -1382,12 +1383,9 @@ sub membership_options {
<table class="LC_status_selector">
<tr>
<th>'.$lt{'acty'}.'</th>
- <th>'.$lt{'coro'}.'</th>');
- if (@sections >0) {
- $r->print('
- <th>'.$lt{'cose'}.'</th>');
- }
- $r->print('</tr><tr><td>');
+ <th>'.$lt{'coro'}.'</th>
+ <th>'.$lt{'cose'}.'</th>
+ </tr><tr><td>');
$r->print(&Apache::lonhtmlcommon::status_select_row(\%status_types));
$r->print('</td><td>');
$r->print(&Apache::lonhtmlcommon::role_select_row(\@roles));
@@ -1395,10 +1393,11 @@ sub membership_options {
@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('</td><td>'.
- §ions_selection(\@sections,'sectionpick').'</td>');
+ } else {
+ @sections = ('all','none');
}
- $r->print('
+ $r->print('</td><td>'.
+ §ions_selection(\@sections,'sectionpick').'</td>
</tr>
</table>');
return;
@@ -1413,7 +1412,7 @@ sub sections_selection {
}
foreach my $sec (@{$sections}) {
if ($sec eq 'all') {
- $section_sel .= ' <option value="'.$sec.'" selected="selected">'.&mt('all sections').'</option>'."\n";
+ $section_sel .= ' <option value="'.$sec.'">'.&mt('all sections').'</option>'."\n";
} elsif ($sec eq 'none') {
$section_sel .= ' <option value="'.$sec.'">'.&mt('no section').'</option>'."\n";
} else {
@@ -1428,7 +1427,7 @@ sub sections_selection {
}
sub access_date_settings {
- my ($r,$tabcol,$action,$formname,$stored,$image,$gpterm,$ucgpterm) = @_;
+ my ($r,$action,$formname,$stored,$image,$gpterm,$ucgpterm) = @_;
my %lt = &Apache::lonlocal::texthash(
'sten' => "Default start and end dates for $gpterm access",
);
@@ -1440,29 +1439,19 @@ sub access_date_settings {
$endtime = $$stored{'enddate'};
}
}
- my ($start_table,$end_table) = &date_setting_table
- ($starttime,$endtime,$formname);
+ my ($table) = &date_setting_table($starttime,$endtime,$formname);
&topic_bar($r,$image,$lt{'sten'});
$r->print('
- <tr>
- <td> </td>
- <td colspan="3">'.$start_table.'</td>
- <tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">'.$end_table.'</td>
- <tr>');
+ '.$table.'
+ ');
return;
}
sub choose_members_form {
- my ($r,$cdom,$cnum,$tabcol,$action,$formname,$page,$groupname,$description,
+ my ($r,$cdom,$cnum,$action,$formname,$page,$groupname,$description,
$granularity,$quota,$startdate,$enddate,$tools,$fixedprivs,$toolprivs,
$functions,$users,$userdata,$idx,$stored,$states,$navbuttons,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,$crstype) = @_;
+ $gpterm,$ucgpterm,$crstype) = @_;
my @regexps = ('user_','userpriv_','sec_');
my %origmembers;
$r->print(&Apache::lonhtmlcommon::echo_form_input(
@@ -1472,6 +1461,7 @@ sub choose_members_form {
my $earlyout = &validate_groupname($groupname,$action,$cdom,$cnum,$gpterm,
$ucgpterm,$crstype);
if ($earlyout) {
+ $r->print($earlyout);
&display_navbuttons($r,$formname,$$states{$action}[$page-1],
$$navbuttons{'gtps'});
return;
@@ -1503,13 +1493,12 @@ sub choose_members_form {
}
}
}
- &privilege_specificity($r,$tabcol,$rowColor1,$rowColor2,$action,
- $specimg,$tools,$stored,$toolprivs,
+ &privilege_specificity($r,$action,$specimg,$tools,$stored,$toolprivs,
$fixedprivs,\@available,$formname,$gpterm,$ucgpterm);
- my $newusers = &pick_new_members($r,$action,$formname,$tabcol,$rowColor1,
- $rowColor2,\@available,$idx,$stored,
- $memimg,$users,$userdata,$granularity,
- \%origmembers,$gpterm,$ucgpterm);
+ my $newusers = &pick_new_members($r,$action,$formname,\@available,$idx,
+ $stored,$memimg,$users,$userdata,
+ $granularity,\%origmembers,$gpterm,
+ $ucgpterm);
if ($newusers || $action eq 'create') {
&display_navbuttons($r,$formname,$$states{$action}[$page-1],
$$navbuttons{'gtps'},$$states{$action}[$page+1],
@@ -1523,13 +1512,7 @@ sub choose_members_form {
sub display_navbuttons {
my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_;
- $r->print('
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">');
+ $r->print('<div class="LC_navbuttons">');
if ($prev) {
$r->print('
<input type="button" name="previous" value = "'.$prevtext.'"
@@ -1541,10 +1524,7 @@ sub display_navbuttons {
<input type="button" name="next" value="'.$nexttext.'"
onclick="javascript:nextPage(document.'.$formname.','."'".$next."'".')" />');
}
- $r->print('
- </td>
- </tr>
-');
+ $r->print('</div>');
}
sub check_tools {
@@ -1564,15 +1544,15 @@ sub print_current_settings {
$granularity,$quota,$available,$unavailable,$gpterm,$ucgpterm) = @_;
my %lt = &Apache::lonlocal::texthash(
- grna => "$ucgpterm Name",
- desc => 'Description',
- grfn => "$ucgpterm Functions",
+ grna => 'Group Name',
+ desc => 'Group Title',
+ grfn => "Collaborative Tools",
gran => 'Granularity',
quot => 'File quota',
dfac => 'Default access dates',
- ygrs => "Your $gpterm selections",
- tfwa => "The following settings will apply to the $gpterm:",
- difn => 'Different functionality<br />for different members:',
+ ygrs => "Your group selections - ",
+ tfwa => "The following settings will apply to the group:",
+ difn => 'Different collaborative tools<br />for different members:',
stda => 'Start date',
enda => 'End date:',
);
@@ -1585,7 +1565,7 @@ sub print_current_settings {
}
if ($action eq 'create') {
$r->print('
-<div><span>'.$lt{'ygrs'}.'</span>
+<div><span style="font-size: larger">'.$lt{'ygrs'}.'</span>
<br />'.$lt{'tfwa'}.'
</div>');
}
@@ -1607,8 +1587,8 @@ sub print_current_settings {
<td>
');
if (@{$available} > 0) {
- $r->print('<b>Available:</b>
- <table cellpadding="" cellspacing="1"><tr>');
+ $r->print(&mt('<b>Available for assignment to members:</b>').
+ '<table class="LC_group_priv"><tr>');
my $rowcell = int(@{$available}/2) + @{$available}%2;
for (my $i=0; $i<@{$available}; $i++) {
if (@{$available} > 3) {
@@ -1625,8 +1605,8 @@ sub print_current_settings {
$r->print('</tr></table><br />');
}
if (@{$unavailable} > 0) {
- $r->print('<b>Unavailable:</b>
- <table cellpadding="0" cellspacing="1" border="0"><tr>');
+ $r->print(&mt('<b>Unavailable for assignment:</b>').
+ '<table class="LC_group_priv"><tr>');
my $rowcell = int(@{$unavailable}/2) + @{$unavailable}%2;
for (my $j=0; $j<@{$unavailable}; $j++) {
if (@{$unavailable} > 3) {
@@ -1656,18 +1636,18 @@ END
}
sub pick_new_members {
- my ($r,$action,$formname,$tabcol,$rowColor1,$rowColor2,$available,$idx,
- $stored,$img,$users,$userdata,$granularity,$origmembers,$gpterm,
- $ucgpterm) = @_;
+ my ($r,$action,$formname,$available,$idx,$stored,$img,$users,$userdata,
+ $granularity,$origmembers,$gpterm,$ucgpterm) = @_;
my %lt = &Apache::lonlocal::texthash(
- 'gpme' => "$ucgpterm membership",
+ 'gpme' => "Group membership",
'addm' => 'Add members',
- 'setf' => 'Set functionality',
- 'func' => 'Functionality',
- 'nome' => 'No members to add at this time.',
+ 'setf' => 'Assign collaborative tools',
+ 'func' => 'Tools',
+ 'nome' => 'No members to add at this time, as there are no users '.
+ 'matching the specified type(s), role(s) and section(s).',
'nnew' => "There are no users to add as new members, as all users".
- " matching the specified type(s), role(s), and/or ".
- "section(s) are already affiliated with this $gpterm.",
+ " matching the specified type(s), role(s), and ".
+ "section(s) are already affiliated with this group.",
'yoma' => 'You may need to use the '."'".'modify existing, past or '.
'future members'."'".' page if you need to re-enable '.
'or activate access for previous or future members.',
@@ -1697,59 +1677,48 @@ sub pick_new_members {
&topic_bar($r,$img,$lt{'gpme'});
if (keys(%members) > 0) {
$r->print('
- <tr>
- <td> </td>
- <td colspan="3">
<table>
<tr>');
&check_uncheck_buttons($r,$formname,'member',$lt{'addm'});
if (@{$available} > 0 && $granularity eq 'Yes') {
- $r->print('<td><nobr>
+ $r->print('<td>
<fieldset><legend><b>'.$lt{'setf'}.'</b></legend>
+ <nobr>
<input type="button" value="check all"
onclick="javascript:checkAllTools(document.'.$formname.')" />
<input type="button" value="uncheck all"
onclick="javascript:uncheckAllTools(document.'.$formname.')" />
- </fieldset></nobr></td>');
+ </nobr>
+ </fieldset></td>');
}
$r->print('</tr></table>
- </td>
- </tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">
');
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print('
- <table border="0" cellpadding="4" cellspacing="1">
- <tr bgcolor="'.$tabcol.'" align="center">
- <td><b>'.&mt('Add?').'</b></td>
- <td><b><a href="javascript:changeSort('."'fullname'".')">'.&mt('Name').'</a></b></td>
- <td><b><a href="javascript:changeSort('."'username'".')">'.&mt('Username').'</a></b>
- </td>
- <td><b><a href="javascript:changeSort('."'domain'".')">'.&mt('Domain').'</a></b></td>
- <td><b><a href="javascript:changeSort('."'id'".')">ID</a></b></td>
- <td><b><a href="javascript:changeSort('."'section'".')">Section</a></b></td>
+ <th>'.&mt('Add?').'</b></td>
+ <th><a href="javascript:changeSort('."'fullname'".')">'.&mt('Name').'</a></td>
+ <th><a href="javascript:changeSort('."'username'".')">'.&mt('Username').'</a></td>
+ <th><a href="javascript:changeSort('."'domain'".')">'.&mt('Domain').'</a></td>
+ <th><a href="javascript:changeSort('."'id'".')">'.&mt('ID').'</a></td>
+ <th><a href="javascript:changeSort('."'section'".')">'.&mt('Section').'</a></td>
');
if (@{$available} > 0) {
- $r->print('<td><b>'.$lt{'func'}.'</b></td>');
+ $r->print('<th>'.$lt{'func'}.'</th>');
}
- $r->print('</tr>');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
if (@{$available} > 0) {
if ($granularity eq 'Yes') {
- $r->print('<tr bgcolor="#cccccc">
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
<td colspan="6"> </td>
- <td align="center"><small><nobr><b>'.&mt('All:').'</b> ');
+ <td align="center"><nobr><b>'.&mt('All:').'</b> ');
foreach my $tool (@{$available}) {
$r->print('<label><input type="checkbox" name="togglefunc" '.
'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
' value="'.$tool.'">'.'<b>'.$tool.'</b></label> ');
}
- $r->print('</nobr></small></td></tr>');
+ $r->print('</nobr></td></tr>');
}
}
my %Sortby = ();
@@ -1768,27 +1737,22 @@ sub pick_new_members {
push(@{$Sortby{$members{$user}[$$idx{fullname}]}},$user);
}
}
- my $rowNum = 0;
- my $rowColor;
foreach my $key (sort(keys(%Sortby))) {
foreach my $user (@{$Sortby{$key}}) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
my $id = $members{$user}[$$idx{id}];
my $fullname = $members{$user}[$$idx{fullname}];
my $udom = $members{$user}[$$idx{udom}];
my $uname = $members{$user}[$$idx{uname}];
my $section = $members{$user}[$$idx{section}];
- $r->print('<tr bgcolor="'.$rowColor.'"><td align="right">
- <input type="checkbox" name="member" value="'.$user.'" /></td><td><small>'.
- $fullname.'</small></td><td><small>'.$uname.'</small></td><td><small>'.
- $udom.'</small></td><td><small>'.$id.'</small></td>'.
- '<td><small>'.$section.'</small></td>');
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').
+ '<td align="right"><input type="checkbox" name="member" value="'.$user.'" /></td>'.
+ '<td>'.$fullname.'</td>'.
+ '<td>'.$uname.'</td>'.
+ '<td>'.$udom.'</td>'.
+ '<td>'.$id.'</td>'.
+ '<td>'.$section.'</td>');
if (@{$available} > 0) {
- $r->print('<td align="center"><nobr><small>'.
+ $r->print('<td align="center"><nobr>'.
' ');
foreach my $tool (@{$available}) {
if ($granularity eq 'Yes') {
@@ -1799,66 +1763,55 @@ sub pick_new_members {
$tool.'" value="'.$user.'" />'.$tool.' ');
}
}
- $r->print('</small></nobr></td>');
+ $r->print('</nobr></td>');
}
- $r->print('</tr>'."\n");
- $rowNum ++;
+ $r->print(&Apache::loncommon::end_data_table_row()."\n");
}
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
- $r->print('
- </td>
- </tr>');
+ $r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print('
- <tr>
- <td> </td>
- <td colspan="3">
-');
if ($totalusers > 0) {
$r->print($lt{'nnew'}.'<br /><br />'.$lt{'yoma'});
} else {
$r->print($lt{'nome'});
}
- $r->print('
- </td>
- </tr>');
}
return $newusers;
}
sub privilege_specificity {
- my ($r,$tabcol,$rowColor1,$rowColor2,$action,$img,$tools,$stored,
- $toolprivs,$fixedprivs,$available,$formname,$gpterm,$ucgpterm) = @_;
+ my ($r,$action,$img,$tools,$stored,$toolprivs,$fixedprivs,$available,
+ $formname,$gpterm,$ucgpterm) = @_;
my %lt = &Apache::lonlocal::texthash (
- 'uprv' => 'User privileges',
- 'frty' => 'For each type of functionality you have chosen to include, '.
- 'there is a set of standard privileges which apply to all '.
- 'of those for whom the functionality is enabled.',
- 'thar' => 'There are also additional privileges which can be set for '.
- 'some, or all, members. Please choose one of the following:',
- 'fort' => 'For the types of functionality you have chosen to include '.
- 'there are no additional privileges which can be set for some '.
- 'or all members.',
- 'eaty' => 'Each of the types of functionality includes standard '.
- 'privileges which apply to members with access to that '.
- 'functionality, and may also include additional privileges '.
+ 'uprv' => 'User privileges for collaborative tools',
+ 'frty' => 'For each collaborative tool you have chosen to include, '.
+ 'there is a set of core privileges which all group members '.
+ 'assigned use of the tool will receive.',
+ 'thar' => 'For some tools there are also additional optional '.
+ 'privileges which can be set.',
+ 'plch' => 'Choose one of the following:',
+ 'fort' => 'For the collaborative tools you have chosen to include '.
+ 'only core privileges are available, '.
+ 'so there are no optional privileges to assign.',
+ 'eaty' => 'Each collaborative tool includes core '.
+ 'privileges assigned to all members with access to the '.
+ 'tool. Some tools may also feature additional privileges '.
'which can be set for specific members.',
- 'cutg' => "Currently the $gpterm is configured ",
- 'sdif' => "so different $gpterm members can receive different privileges.",
- 'sall' => "so all $gpterm members will receive the same privileges.",
- 'algm' => "All $gpterm members will receive the same privileges.",
- 'smgp' => "Some $gpterm members will receive different privileges from ".
- "others.",
- 'thwi' => "These will be the privileges all $gpterm members receive, ".
- "if you selected the first option above.",
+ 'cutg' => 'Currently the group is configured ',
+ 'sdif' => 'so different members can receive different optional privileges for a particular tool.',
+ 'sall' => 'so all members will receive the same optional privileges for a particular tool.',
+ 'algm' => 'All group members will receive the same privileges for any tool assigned to them, including the default set of optional privileges.',
+ 'smgp' => 'Different group members may receive different privileges from '.
+ 'others for the tools they have been assigned.',
+ 'thwi' => 'These will be the privileges all group members receive for a particular assigned tool, '.
+ 'if you selected the first option above.',
'thes' => "These will be the privileges given to members assigned ".
- "in the future, including via automatic $gpterm assignment ".
- "for specific sections/roles ",
- 'asyo' => "As you have chosen not to include any functionality in the ".
- "$gpterm, no default user privileges settings need to be set.",
- 'plin' => 'Please indicate which <b>optional</b> privileges members '.
- 'will receive by default.',
+ "in the future via automatic group assignment ".
+ "for users who receive specific sections/roles in the course ",
+ 'asyo' => "As you have chosen not to include any collaborative tools ".
+ "in the group, no default optional privileges need to be set.",
+ 'plin' => 'Indicate which <b>optional</b> privileges members '.
+ 'will receive by default for a specific tool.',
'oppr' => 'Optional privileges',
'defp' => 'The default privileges new members will receive are:',
);
@@ -1872,7 +1825,7 @@ sub privilege_specificity {
}
&topic_bar($r,$img,$lt{'uprv'});
if ((($action eq 'create') && (@{$available} > 0)) ||
- (($action eq 'modify') && ($formname eq 'change_settings'))) {
+ (($action eq 'modify') && ($formname eq 'change_settings'))) {
my %specific = (
'No' => 'checked="checked"',
'Yes' => '',
@@ -1880,7 +1833,7 @@ sub privilege_specificity {
if ($action eq 'create') {
$r->print($lt{'frty'}.'<br />');
if ($totaloptionalprivs) {
- $r->print($lt{'thar'});
+ $r->print($lt{'thar'}.'<br /><br />'.$lt{'plch'});
} else {
$r->print($lt{'fort'});
}
@@ -1896,16 +1849,16 @@ sub privilege_specificity {
}
if ($totaloptionalprivs) {
$r->print('
-<br /><br />
+<br />
<label><nobr><input type="radio" name="specificity" value="No" '.$specific{'No'}.' /> '.$lt{'algm'}.'</nobr></label><br />
-<label><nobr><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' /> '.$lt{'smgp'}.'</nobr></label>');
+<label><nobr><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' /> '.$lt{'smgp'}.'</nobr></label><br /><br />');
} else {
$r->print('<input type="hidden" name="specificity" value="No" />');
}
if ($totaloptionalprivs) {
$r->print($lt{'plin'});
if ($action eq 'create') {
- $r->print(' '.$lt{'thwi'});
+ $r->print('<br />'.$lt{'thwi'});
}
$r->print('<br />'.$lt{'thes'});
if ($action eq 'create') {
@@ -1924,11 +1877,12 @@ sub privilege_specificity {
} else {
$r->print($lt{'algm'}.'<br /><br />');
}
- &default_privileges($r,$action,$tabcol,$rowColor1,$rowColor2,
- $tools,$toolprivs,$fixedprivs,$available);
+ &default_privileges($r,$action,$tools,$toolprivs,$fixedprivs,
+ $available);
} else {
if ($action eq 'create') {
$r->print($lt{'asyo'});
+ $r->print('<input type="hidden" name="specificity" value="No" />');
} elsif ($action eq 'modify' && $formname eq 'pick_members') {
my @defprivs;
if (ref($$stored{'defpriv'}) eq 'ARRAY') {
@@ -1941,94 +1895,88 @@ sub privilege_specificity {
$r->print($lt{'sall'});
}
$r->print(' '.$lt{'defp'}.'<br /><br />');
- &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
- $toolprivs,\@defprivs);
+ &display_defprivs($r,$tools,$toolprivs,\@defprivs);
}
}
return;
}
sub default_privileges {
- my ($r,$action,$tabcol,$rowColor1,$rowColor2,$tools,$toolprivs,
- $fixedprivs,$available) = @_;
+ my ($r,$action,$tools,$toolprivs,$fixedprivs,$available) = @_;
my %lt = &Apache::lonlocal::texthash(
'addp' => 'Additional privileges',
'fixp' => 'Fixed privileges',
'oppr' => 'Optional privileges',
- 'func' => 'Function',
+ 'func' => 'Collaborative Tool',
);
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
- $r->print('<tr>
- <td bgcolor="'.$tabcol.'" valign="top">
- <table cellspacing="0" cellpadding="1">
- <tr>
- <td valign="top"><b>'.$lt{'func'}.'</b></td>
- </tr>
- <tr>
- <td valign="top"><b>'.$lt{'fixp'}.'</b></td>
- </tr>
- <tr>
- <td valign="top"><b>'.$lt{'oppr'}.'</b></td>
- </tr>
- </table>
- </td>
- ');
+ $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_group_priv_box').
+ &Apache::lonhtmlcommon::row_title($lt{'func'},undef,
+ 'LC_groups_functionality'));
+ $r->print(join('</td><td class="LC_groups_functionality">',@{$tools}));
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ my $fixed = '';
+ my $dynamic = '';
foreach my $tool (@{$tools}) {
- $r->print('<td align="center" valign="top">
- <table cellspacing="0" cellpadding="1">
- <tr bgcolor="#cccccc">
- <td colspan="2" align="center"><b>'.$tool.'</b></td>
- </tr>
- ');
my $privcount = 0;
- my $fixed = '';
- my $dynamic = '';
+ if ($dynamic ne '') {
+ $dynamic .= '</td><td class="LC_groups_optional">';
+ }
+ $dynamic .= '<table class="LC_group_priv"><tr>';
foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) {
if (exists($$fixedprivs{$tool}{$priv})) {
- $fixed .= '<input type="hidden" name="defpriv" value="'.$priv.'" />'.$$toolprivs{$tool}{$priv}.' ';
+ if ($fixed ne '') {
+ $fixed .= '</td><td class="LC_groups_fixed">';
+ }
+ $fixed .= '<input type="hidden" name="defpriv" value="'.$priv.'" /><nobr>'.$$toolprivs{$tool}{$priv}.' ';
if ($action eq 'modify') {
- if (grep/^$tool$/,@{$available}) {
+ if (grep(/^$tool$/,@{$available})) {
$fixed .= '<small>'.&mt('(on)').'<small> ';
} else {
$fixed .= '<small>'.&mt('(off)').'<small> ';
}
}
+ $fixed .= '</nobr>';
} else {
- $privcount ++;
+ $privcount++;
if ($privcount == 3) {
$dynamic .= '</tr>
- <tr bgcolor="'.$rowColor1.'">'."\n";
+ <tr>'."\n";
}
- $dynamic .= '<td><label><input type="checkbox" name="defpriv" value="'.$priv.'" />'.$$toolprivs{$tool}{$priv}.'</label></td>'."\n";
+ $dynamic .= '<td><nobr><label><input type="checkbox" name="defpriv" value="'.$priv.'" />'.$$toolprivs{$tool}{$priv}.'</label></nobr></td>'."\n";
}
}
- if ($dynamic eq '') {
- $dynamic = '<td>None</td>'."\n";
+ if ($privcount == 0) {
+ $dynamic .= '<td>None</td>'."\n";
}
if ($privcount < 3) {
- $dynamic .= '</tr>
- <tr bgcolor="'.$rowColor1.'">
- <td colspan="2"> </td>'."\n";
+ $dynamic .= '<td> </td>'."\n";
} elsif ($privcount%2) {
$dynamic = '<td> </td>'."\n";
}
- $r->print('<tr bgcolor="'.$rowColor2.'">
- <td colspan="2" align="center"><nobr>'.$fixed.'</nobr></td>
- </tr>
- <tr bgcolor="'.$rowColor1.'">'."\n".$dynamic.'</tr>'."\n".'</table>'."\n".'</td>
- ');
+ $dynamic .= '</tr></table>';
}
- $r->print('</tr>'."\n");
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print(&Apache::lonhtmlcommon::row_title($lt{'fixp'},undef,
+ 'LC_groups_fixed').
+ $fixed.
+ &Apache::lonhtmlcommon::row_closure(1));
+ $r->print(&Apache::lonhtmlcommon::row_title($lt{'oppr'},undef,
+ 'LC_groups_optional').
+ $dynamic.
+ &Apache::lonhtmlcommon::end_pick_box());
$r->print('<br />');
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('<tr>');
@@ -2038,7 +1986,7 @@ sub display_defprivs {
@{$currprivs{$tool}} = ();
foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) {
if (ref($defprivs) eq 'ARRAY') {
- if (grep/^\Q$priv\E$/,@{$defprivs}) {
+ if (grep(/^\Q$priv\E$/,@{$defprivs})) {
push(@{$currprivs{$tool}},$priv);
}
}
@@ -2094,10 +2042,10 @@ sub display_defprivs {
sub change_members_form {
- my ($r,$cdom,$cnum,$tabcol,$action,$formname,$page,$groupname,$description,
+ my ($r,$cdom,$cnum,$action,$formname,$page,$groupname,$description,
$startdate,$enddate,$tools,$fixedprivs,$functions,$users,$userdata,
- $granularity,$quota,$specificity,$idx,$states,$navbuttons,$rowColor1,
- $rowColor2,$gpterm,$ucgpterm) = @_;
+ $granularity,$quota,$specificity,$idx,$states,$navbuttons,$gpterm,
+ $ucgpterm) = @_;
my %lt = &Apache::lonlocal::texthash(
grse => "$ucgpterm settings",
mogm => "Modify $gpterm membership",
@@ -2115,38 +2063,27 @@ sub change_members_form {
my $prevtext = $$navbuttons{'gtpp'};
$r->print('
<br />
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
');
&topic_bar($r,1,$lt{'grse'});
- $r->print('
- <tr>
- <td> </td>
- <td colspan="3">
-');
&print_current_settings($r,$action,$functions,$startdate,$enddate,
$groupname,$description,$granularity,$quota,
\@available,\@unavailable,$gpterm,$ucgpterm);
-$r->print('
-</td></tr><tr><td colspan="4"> </td></tr>');
&topic_bar($r,2,$lt{'mogm'});
- $r->print('
- <tr>
- <td> </td>
- <td colspan="3">
-');
- ¤t_membership($r,$cdom,$cnum,$formname,$tabcol,$rowColor1,
- $rowColor2,$groupname,\@available,\@unavailable,
- $fixedprivs,$granularity,$specificity);
- $r->print('</td>');
- &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext,
- $$states{$action}[$page+1],$nexttext);
- $r->print('</table>');
+ my $numcurrent = ¤t_membership($r,$cdom,$cnum,$formname,$groupname,
+ \@available,\@unavailable,$fixedprivs,
+ $granularity,$specificity);
+ if ($numcurrent > 0) {
+ &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext,
+ $$states{$action}[$page+1],$nexttext);
+ } else {
+ &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext);
+ }
return;
}
sub current_membership {
- my ($r,$cdom,$cnum,$formname,$tabcol,$rowColor1,$rowColor2,$groupname,
- $available,$unavailable,$fixedprivs,$granularity,$specificity) = @_;
+ my ($r,$cdom,$cnum,$formname,$groupname,$available,$unavailable,
+ $fixedprivs,$granularity,$specificity) = @_;
my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum,
$groupname);
my %lt = &Apache::lonlocal::texthash(
@@ -2160,26 +2097,24 @@ sub current_membership {
'reen' => 'Re-enable',
'acti' => 'Activate',
'dele' => 'Delete',
- 'curf' => 'Current Functionality',
+ 'curf' => 'Current Tool Set',
'chpr' => 'Change Privileges'
);
- my ($current,$hastools,$addtools,$num_reenable,$num_activate,$num_expire) =
+ my ($current,$num_items,$hastools,$addtools) =
&Apache::longroup::group_memberlist($cdom,$cnum,$groupname,$fixedprivs,
$available);
- if (keys(%{$current}) > 0) {
+ my $numcurrent = scalar(keys(%{$current}));
+ if ($numcurrent > 0) {
$r->print('
- <tr>
- <td> </td>
- <td colspan="2">
<table>
<tr>');
- if ($num_expire) {
+ if ($num_items->{'active'}) {
&check_uncheck_buttons($r,$formname,'expire',$lt{'expi'});
}
- if ($num_reenable) {
+ if ($num_items->{'previous'}) {
&check_uncheck_buttons($r,$formname,'reenable',$lt{'reen'});
}
- if ($num_activate) {
+ if ($num_items->{'future'}) {
&check_uncheck_buttons($r,$formname,'activate',$lt{'acti'});
}
&check_uncheck_buttons($r,$formname,'deletion',$lt{'dele'});
@@ -2207,51 +2142,41 @@ sub current_membership {
$r->print(<<"END");
</tr>
</table>
- </td>
- <td width="100%"> </td>
- </tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">
+ <br />
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");
- <table border="0" cellpadding="4" cellspacing="1">
- <tr bgcolor="$tabcol" align="center">
- <td><b>$lt{'actn'}</b></td>
- <td><b><a href="javascript:changeSort('fullname')">$lt{'name'}</a></b></td>
- <td><b><a href="javascript:changeSort('username')">$lt{'usnm'}</a></b>
- </td>
- <td><b><a href="javascript:changeSort('domain')">$lt{'doma'}</a></b></td>
- <td><b><a href="javascript:changeSort('id')">ID</a></b></td>
- <td><b><a href="javascript:changeSort('start')">$lt{'stda'}</a></b></td>
- <td><b><a href="javascript:changeSort('end')">$lt{'enda'}</a></b></td>
+ <th>$lt{'actn'}</th>
+ <th><a href="javascript:changeSort('fullname')">$lt{'name'}</a></th>
+ <th><a href="javascript:changeSort('username')">$lt{'usnm'}</a></th>
+ <th><a href="javascript:changeSort('domain')">$lt{'doma'}</a></th>
+ <th><a href="javascript:changeSort('id')">ID</a></th>
+ <th><a href="javascript:changeSort('start')">$lt{'stda'}</a></th>
+ <th><a href="javascript:changeSort('end')">$lt{'enda'}</a></th>
END
my $colspan = 0;
if ($hastools) {
- $r->print('<td><b>'.$lt{'curf'}.'</b></td>');
- $colspan ++;
+ $r->print('<th>'.$lt{'curf'}.'</th>');
+ $colspan++;
}
if ($addtools) {
- $r->print('<td><b>Additional Functionality</b></td>');
- $colspan ++;
+ $r->print('<th>'.&mt('Additional Tools').'</th>');
+ $colspan++;
}
- $r->print('</tr>');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
if ($colspan) {
if ($granularity eq 'Yes') {
- $r->print('<tr bgcolor="#cccccc">
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
<td colspan="7"> </td>
- <td colspan="'.$colspan.'" align="center"><small><nobr><b>'.&mt('All:').
+ <td colspan="'.$colspan.'" align="center"><nobr><b>'.&mt('All:').
'</b> ');
foreach my $tool (@{$available}) {
$r->print('<label><input type="checkbox" name="togglefunc"'.
' onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
- ' value="'.$tool.'">'.'<b>'.$tool.'</b></label> ');
+ ' value="'.$tool.'" />'.'<b>'.$tool.'</b></label> ');
}
- $r->print('</nobr></small></td></tr>');
+ $r->print('</nobr></td></tr>');
}
}
my %Sortby = ();
@@ -2268,23 +2193,16 @@ END
push(@{$Sortby{$$current{$user}{fullname}}},$user);
}
}
- my $rowNum = 0;
- my $rowColor;
foreach my $key (sort(keys(%Sortby))) {
foreach my $user (@{$Sortby{$key}}) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
my $id = $$current{$user}{id};
my $fullname = $$current{$user}{fullname};
my $udom = $$current{$user}{udom};
my $uname = $$current{$user}{uname};
my $start = $$current{$user}{start};
my $end = $$current{$user}{end};
- $r->print('<tr bgcolor="'.$rowColor.'">
- <td><small>');
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').'
+ <td>');
if ($$current{$user}{changestate} eq 'reenable') {
$r->print('<nobr><label>'.
'<input type="checkbox" name="reenable" value="'.$user.'" />'.
@@ -2307,13 +2225,15 @@ END
'</label></nobr>');
}
$r->print('
- </td>
- <td><small>'.
- $fullname.'</small></td><td><small>'.$uname.'</small></td><td><small>'.
- $udom.'</small></td><td><small>'.$id.'</small></td><td><small>'.$start.
- '</small></td><td><small>'.$end.'</small></td>');
+ </td>'.
+ '<td>'.$fullname.'</td>'.
+ '<td>'.$uname.'</td>'.
+ '<td>'. $udom.'</td>'.
+ '<td>'.$id.'</td>'.
+ '<td>'.$start.'</td>'.
+ '<td>'.$end.'</td>');
if ($hastools) {
- $r->print('<td align="left"><small><nobr>'.
+ $r->print('<td align="left"><nobr>'.
' ');
foreach my $tool (@{$$current{$user}{currtools}}) {
if ($granularity eq 'Yes') {
@@ -2329,10 +2249,10 @@ END
}
$r->print(' ');
}
- $r->print('</nobr></small></td>');
+ $r->print('</nobr></td>');
}
if ($addtools) {
- $r->print('<td align="left"><small>');
+ $r->print('<td align="left">');
if ($granularity eq 'Yes') {
foreach my $tool (@{$$current{$user}{newtools}}) {
$r->print('<nobr><label><input type="checkbox"
@@ -2348,44 +2268,42 @@ END
'</nobr> ');
}
}
- $r->print('</small></td>');
+ $r->print('</td>');
}
- $r->print('</tr>'."\n");
- $rowNum ++;
+ $r->print(&Apache::loncommon::end_data_table_row()."\n");
}
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
- $r->print('
- </td>
- </tr>');
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&mt('There are no active, future or previous group members to modify.'));
}
- return;
+ return $numcurrent;
}
sub check_uncheck_buttons {
my ($r,$formname,$field,$title,$colspan) = @_;
$r->print('
<td '.$colspan.'>
- <nobr>
<fieldset>
<legend><b>'.$title.'</b></legend>
+ <nobr>
<input type="button" value="check all"
onclick="javascript:checkAll(document.'.$formname.'.'.$field.')" />
<input type="button" value="uncheck all"
onclick="javascript:uncheckAll(document.'.$formname.'.'.$field.')" />
- </fieldset>
</nobr>
+ </fieldset>
</td>
');
}
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(
@@ -2400,44 +2318,40 @@ sub change_privs_form {
} else {
$nexttext = $$navbuttons{'mose'};
}
- $r->print('<br /><table width="100%" cellpadding="0" cellspacing="0" border="0">');
&topic_bar($r,3,&mt('Members to delete or expire'));
my $exp_or_del = 0;
if (ref($$memchg{'deletion'}) eq 'ARRAY') {
if (@{$$memchg{'deletion'}} > 0) {
- $r->print('<tr><td> </td><td colspan="3"><b>'.$lt{'tode'}.':</b><br /><ul>');
+ $r->print('<b>'.$lt{'tode'}.':</b><br /><ul>');
foreach my $user (@{$$memchg{'deletion'}}) {
$r->print('<li>'.$$userdata{$user}[$$idx{fullname}].
' ('.$user.')</li>');
}
- $r->print('</ul></td><tr><td colspan="4"> </td></tr>');
+ $r->print('</ul>');
$exp_or_del += @{$$memchg{'deletion'}};
}
}
if (ref($$memchg{'expire'}) eq 'ARRAY') {
if (@{$$memchg{'expire'}} > 0) {
- $r->print('<tr><td> </td><td colspan="3"><b>'.$lt{'toex'}.':</b><br /><ul>');
+ $r->print('<b>'.$lt{'toex'}.':</b><br /><ul>');
foreach my $user (@{$$memchg{'expire'}}) {
$r->print('<li>'.$$userdata{$user}[$$idx{fullname}].
' ('.$user.')</li>');
}
- $r->print('</ul></td><tr><td colspan="4"> </td></tr>');
+ $r->print('</ul>');
$exp_or_del += @{$$memchg{'expire'}};
}
}
if (!$exp_or_del) {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'nome'}.
- '</td></tr><tr><td colspan="4"> </td></tr>');
+ $r->print($lt{'nome'}.'<br />');
}
- &topic_bar($r,4,&mt('[_1] member privileges',$ucgpterm));
+ &topic_bar($r,4,&mt('Setting optional privileges for specific group members'));
- my $numchgs = &member_privileges_form($r,$tabcol,$action,$formname,$tools,
+ my $numchgs = &member_privileges_form($r,$action,$formname,$tools,
$toolprivs,$fixedprivs,$userdata,
$usertools,$idx,$memchg,$states,
- $stored,$rowColor1,$rowColor2,
- $gpterm);
- $r->print('</td></tr><tr><td colspan="4"> </td></tr>');
+ $stored,$gpterm);
my $prevtext = $$navbuttons{'gtps'};
if ($numchgs || $exp_or_del) {
&display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext,
@@ -2445,14 +2359,13 @@ sub change_privs_form {
} else {
&display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext);
}
- $r->print('</table>');
return;
}
sub add_members_form {
- my ($r,$tabcol,$action,$formname,$page,$startdate,$enddate,$groupname,
+ my ($r,$action,$formname,$page,$startdate,$enddate,$groupname,
$description,$granularity,$quota,$sectioncount,$tools,$functions,
- $stored,$states,$navbuttons,$rowColor1,$rowColor2,$gpterm,$ucgpterm)=@_;
+ $stored,$states,$navbuttons,$gpterm,$ucgpterm)=@_;
$r->print(' <br />');
my @available = ();
my @unavailable = ();
@@ -2469,10 +2382,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;
@@ -2489,27 +2402,22 @@ sub choose_privs_form {
$nexttext = $$navbuttons{'adme'};
}
- $r->print('<br /><table width="100%" cellpadding="0" cellspacing="0" border="0">');
- &topic_bar($r,6,&mt('[_1] member privileges',$ucgpterm));
+ &topic_bar($r,6,&mt('Setting optional privileges for specific group members'));
- &member_privileges_form($r,$tabcol,$action,$formname,$tools,$toolprivs,
+ &member_privileges_form($r,$action,$formname,$tools,$toolprivs,
$fixedprivs,$userdata,$usertools,$idx,undef,
- $states,$stored,$rowColor1,$rowColor2,$gpterm);
+ $states,$stored,$gpterm);
- $r->print('</td></tr><tr><td colspan="4"> </td></tr>');
if ($action eq 'create') {
- if (keys(%{$sectioncount}) > 0) {
- my $img1 = 7;
- my $img2 = 8;
- &mapping_options($r,$action,$formname,$page,$tabcol,$sectioncount,
- $states,$stored,$navbuttons,$img1,$img2,
- $rowColor1,$rowColor2,$gpterm,$ucgpterm,$crstype);
- }
+ my $img1 = 7;
+ my $img2 = 8;
+ &mapping_options($r,$action,$formname,$page,$sectioncount,
+ $states,$stored,$navbuttons,$img1,$img2,
+ $gpterm,$ucgpterm,$crstype);
}
my $prevtext = $$navbuttons{'gtps'};
&display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext,
$$states{$action}[$page+1],$nexttext);
- $r->print('</table>');
return;
}
@@ -2572,26 +2480,28 @@ function uncheckAllTools(formname) {
}
sub member_privileges_form {
- my ($r,$tabcol,$action,$formname,$tools,$toolprivs,$fixedprivs,$userdata,
- $usertools,$idx,$memchg,$states,$stored,$rowColor1,$rowColor2,
- $gpterm) = @_;
+ my ($r,$action,$formname,$tools,$toolprivs,$fixedprivs,$userdata,
+ $usertools,$idx,$memchg,$states,$stored,$gpterm) = @_;
my %lt = &Apache::lonlocal::texthash(
'addp' => 'Additional privileges',
- 'fixp' => 'Fixed privileges',
+ 'fixp' => 'Core privileges',
'oppr' => 'Optional privileges',
- 'func' => 'Function',
- 'forf' => 'For the functionality you have chosen to include '.
- 'there are no optional privileges to set besides '.
- 'the standard privileges.',
- 'algr' => "All $gpterm members will receive the same privileges.",
- 'asno' => "As no $gpterm members are being added, ".
- "there are no specific user privileges to set.",
- 'asng' => "As no $gpterm tools will be made available to users, ".
- "there are no specific user privileges to set.",
- 'nogm' => "No $gpterm member privileges to display or set, ".
- "as you have not indicated that you will be activating,".
- " re-enabling, changing privileges, or adding/removing ".
- "functionality for any current members ",
+ 'func' => 'Tool',
+ 'forf' => 'For the collaborative tools included for group '.
+ 'members being added or modified, '.
+ 'there are no optional privileges to set '.
+ 'for specific members.',
+ 'algr' => 'All new group members will receive the same privileges.', 'ifex' => 'If previously expired members are being re-enabled, or '.
+ 'if access for future members is being activated now, '.
+ 'previously set privileges will be preserved.',
+ 'asno' => 'As no group members are being added, '.
+ 'there are no specific user privileges to set.',
+ 'asng' => 'As no group tools will be made available to users, '.
+ 'there are no specific user privileges to set.',
+ 'nogm' => 'No group member privileges to display or set, '.
+ 'as you have not indicated that you will be activating,'.
+ ' re-enabling, changing privileges, or adding/removing '.
+ 'tools for any current members.',
'full' => 'Fullname',
'user' => 'Username',
'doma' => 'Domain',
@@ -2635,7 +2545,7 @@ sub member_privileges_form {
}
$numchgs = @currmembers;
if (!$numchgs) {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'nogm'});
+ $r->print($lt{'nogm'});
return $numchgs;
}
}
@@ -2651,17 +2561,14 @@ sub member_privileges_form {
my %total;
if (keys(%{$usertools}) > 1) {
$r->print('
- <tr>
- <td> </td>
- <td colspan="3">
- <table border="0" cellspacing="2" cellpadding="2" border="0">
+ <table border="0" cellspacing="2" cellpadding="2">
<tr>
');
foreach my $tool (@{$tools}) {
if (@{$showboxes{$tool}} > 0) {
$r->print('<td valign="top">');
- $r->print('<table class="thinborder"><tr bgcolor="'.
- $tabcol.'"><th colspan="'.$colspan.'">'.
+ $r->print('<table class="thinborder"><tr>'.
+ '<th colspan="'.$colspan.'">'.
$tool.'</th></tr><tr>');
my $privcount = 0;
foreach my $priv (@{$showboxes{$tool}}) {
@@ -2699,59 +2606,44 @@ sub member_privileges_form {
$r->print('</tr></table></td><td> </td>');
}
}
- $r->print('</tr></table></td></tr>');
- $r->print('<tr><td colspan="4"> </td></tr>');
+ $r->print('</tr></table>');
}
- $r->print('<tr><td> </td><td colspan="3">');
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print(<<"END");
- <tr bgcolor="$tabcol">
- <th><b>$lt{'full'}</th>
- <th><b>$lt{'user'}</th>
+ <th>$lt{'full'}</th>
+ <th>$lt{'user'}</th>
<th>$lt{'doma'}</th>
<th colspan="$numtools">$lt{'addp'}</th>
- </tr>
END
- &member_privs_entries($r,$tabcol,$rowColor1,$rowColor2,
- $usertools,$toolprivs,$fixedprivs,
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ &member_privs_entries($r,$usertools,$toolprivs,$fixedprivs,
$userdata,$idx,\@showtools,\@defprivs,
\@excluded);
- $r->print('</td>');
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
- $r->print('</td></tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
-');
+ $r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'forf'}.
- '<br />');
- &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
- $toolprivs,\@defprivs);
+ $r->print($lt{'forf'}.'<br />');
+ &display_defprivs($r,$tools,$toolprivs,\@defprivs);
}
} else {
if (keys(%{$usertools}) > 0) {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'algr'}.
- '<br /><br />');
- &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
- $toolprivs,\@defprivs);
+ $r->print($lt{'algr'}.'<br />'.$lt{'ifex'}.'<br /><br />');
+ &display_defprivs($r,$tools,$toolprivs,\@defprivs);
} else {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'asno'}.
- '<br />');
+ $r->print($lt{'asno'}.'<br />');
}
}
} else {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'asng'});
+ $r->print($lt{'asng'});
}
return $numchgs;
}
sub process_request {
- my ($r,$cdom,$cnum,$tabcol,$action,$state,$page,$groupname,$description,
+ my ($r,$cdom,$cnum,$action,$state,$page,$groupname,$description,
$specificity,$userdata,$startdate,$enddate,$tools,$functions,$toolprivs,
$usertools,$idx,$types,$roles,$sections,$states,$navbuttons,$memchg,
- $sectioncount,$stored,$rowColor1,$rowColor2,$gpterm,$ucgpterm,
- $crstype) = @_;
+ $sectioncount,$stored,$gpterm,$ucgpterm,$crstype) = @_;
$r->print(&Apache::lonhtmlcommon::echo_form_input(
['origin','action','state','page','sortby']));
@@ -2847,7 +2739,7 @@ sub write_group_data {
}
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).<br />',$gpterm,$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).<br />',$gpterm,sprintf("%.2f",$maxposs)));
}
my %groupinfo = (
description => $esc_description,
@@ -3136,7 +3028,7 @@ sub process_membership {
}
if ($roster_result eq 'ok') {
$r->print('<br />'.&mt('[_1] membership list updated.',$ucgpterm));
- $r->print('<p>'.&mt("For full access to all of [_1]'s privileges, users will need to log out and log back in.",$groupname).'</p>');
+ $r->print('<p>'.&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).'</p>');
} else {
$r->print('<br />'.&mt('An error occurred while updating the [_1] membership list -',$gpterm).$roster_result.'<br />');
}
@@ -3144,15 +3036,14 @@ sub process_membership {
}
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) = @_;
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',
@@ -3162,18 +3053,13 @@ 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('
- <tr>
- <td colspan="4"> </td>
- </tr>');
- &mapping_settings($r,$tabcol,$rowColor1,$rowColor2,$sectioncount,\%lt,
- $stored,$img2,$crstype);
+ &automapping($r,$action,$stored,\%lt,$img1);
+ &mapping_settings($r,$sectioncount,\%lt,$stored,$img2,$crstype);
return;
}
sub automapping {
- my ($r,$action,$tabcol,$stored,$lt,$image) = @_;
+ my ($r,$action,$stored,$lt,$image) = @_;
my $add = 'off';
my $drop = 'off';
if (exists($$stored{'autoadd'})) {
@@ -3184,76 +3070,44 @@ sub automapping {
}
&topic_bar($r,$image,$$lt{'endi'});
$r->print('
- <tr>
- <td> </td>
- <td colspan="3">
- <b>'.$$lt{'gmma'}.':</b><br />'.$$lt{'adds'}.'<br />'.$$lt{'drops'}.'<br />
- </td>
- </tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">
+ <b>'.$$lt{'gmma'}.':</b><br />'.$$lt{'adds'}.'<br />'.$$lt{'drops'}.'<br /><br />
<nobr>'.$$lt{'auad'}.':
<label><input type="radio" name="autoadd" value="on" />on </label><label><input type="radio" name="autoadd" value="off" checked="checked" />off</label>');
if ($action eq 'modify') {
$r->print(' ('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
}
$r->print('
- </nobr>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">
+ </nobr><br />
<nobr>'.$$lt{'auex'}.':
<label><input type="radio" name="autodrop" value="on" />on </label><label><input type="radio" name="autodrop" value="off" checked="checked" />off</label>');
if ($action eq 'modify') {
$r->print(' ('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
}
- $r->print('</nobr>
- </td>
- </tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3">'.$$lt{'mapr'}.'
- </td>
- </tr>
-');
+ $r->print('</nobr><br /><br />'.$$lt{'mapr'});
}
sub mapping_settings {
- my ($r,$tabcol,$rowColor1,$rowColor2,$sectioncount,$lt,$stored,$image,
- $crstype) = @_;
+ my ($r,$sectioncount,$lt,$stored,$image,$crstype) = @_;
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('
- <tr>
- <td> </td>
- <td colspan="3">
-');
my @roles = &standard_roles();
my %customroles = &my_custom_roles();
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print('
- <tr bgcolor="'.$tabcol.'">
<th>'.&mt('Active?').'</th>
<th>'.&mt('Role').'</th>');
if (@sections > 0) {
- $r->print('<th>'.&mt('Sections').'</th></tr>'."\n");
+ $r->print('<th>'.&mt('Sections').'</th>');
}
- my $rowNum = 0;
- my $rowColor;
+ $r->print(&Apache::loncommon::end_data_table_header_row()."\n");
foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role,$crstype);
my $sections_sel;
@@ -3268,33 +3122,25 @@ sub mapping_settings {
'</td>';
}
}
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
- $r->print('<tr bgcolor="'.$rowColor.'"><td><input type="checkbox" '.
- 'name="autorole" value="'.$role.'"></td><td>'.$plrole.
- '</td>'.$sections_sel.'</tr>');
- $rowNum ++;
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<td><input type="checkbox" '.
+ 'name="autorole" value="'.$role.'" /></td><td>'.$plrole.
+ '</td>'.$sections_sel.
+ &Apache::loncommon::end_data_table_row());
}
foreach my $role (sort(keys(%customroles))) {
my $sections_sel;
if (@sections > 0) {
- $sections_sel = '<td>'.§ions_selection(\@sections,'sec_'.$role).
- '</td>';
+ $sections_sel =
+ '<td>'.§ions_selection(\@sections,'sec_'.$role).'</td>';
}
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
- $r->print('<tr bgcolor="'.$rowColor.'"><td><input type="checkbox" '.
- 'value="'.$role.'"></td><td>'.$role.'</td>'.
- $sections_sel.'</tr>');
- $rowNum ++;
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<td><input type="checkbox" '.
+ 'value="'.$role.'" /></td><td>'.&mt('Custom role: ').
+ '<i>'.$role.'</i></td>'.$sections_sel.
+ &Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print(&Apache::loncommon::end_data_table());
return;
}
@@ -3351,10 +3197,8 @@ sub modify_menu {
}
sub member_privs_entries {
- my ($r,$tabcol,$rowColor1,$rowColor2,$usertools,$toolprivs,
- $fixedprivs,$userdata,$idx,$showtools,$defprivs,$excluded) = @_;
- my $rowColor;
- my $rowNum = 0;
+ my ($r,$usertools,$toolprivs,$fixedprivs,$userdata,$idx,$showtools,
+ $defprivs,$excluded) = @_;
foreach my $user (sort(keys(%{$usertools}))) {
if (defined($excluded)) {
if (ref($excluded) eq 'ARRAY') {
@@ -3364,19 +3208,27 @@ sub member_privs_entries {
}
}
my ($uname,$udom) = split(/:/,$user);
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
- $r->print('<tr bgcolor="'.$rowColor.'">
+ $r->print(&Apache::loncommon::start_data_table_row().'
<td>'.$$userdata{$user}[$$idx{fullname}].'</td>
<td>'.$uname.'</td>
<td>'.$udom.'</td>
- <td valign="top"><table><tr><td><b>Function</b></td></tr><tr><td><b>Fixed</b></td></tr><tr><td><b>Optional</b></td></tr></table></td>');
+ <td valign="top">
+ <table>
+ <tr>
+ <td><b>'.
+ &mt('Collaborative Tool').'</b></td>
+ </tr>
+ <tr>
+ <td><b>'.&mt('Fixed').'</b></td>
+ </tr>
+ <tr>
+ <td><b>'.&mt('Optional').'</b></td>
+ </tr>
+ </table>
+ </td>');
foreach my $tool (@{$showtools}) {
if (exists($$usertools{$user}{$tool})) {
- $r->print('<td valign="top"><table><tr bgcolor="'.$tabcol.'"><td colspan="2" align="center"><b>'.$tool.'</b></td></tr>');
+ $r->print('<td valign="top"><table><tr><th colspan="2">'.$tool.'</th></tr>');
my $privcount = 0;
my $fixed = '';
my $dynamic = '';
@@ -3399,10 +3251,10 @@ sub member_privs_entries {
}
$r->print('<tr><td colspan="2"><nobr>'.$fixed.'</nobr></td></tr><tr>'.$dynamic.'</tr></table></td>');
} else {
- $r->print('<td valign="top"><table width="100%"><tr bgcolor="'.$tabcol.'"><td colspan="2" align="center"><b>'.$tool.'</b></td></tr><tr><td> </td></tr><tr><td> </td></tr></table></td>');
+ $r->print('<td valign="top"><table width="100%"><tr><th colspan="2">'.$tool.'</th></tr><tr><td> </td></tr><tr><td> </td></tr></table></td>');
}
}
- $rowNum ++;
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
@@ -3423,23 +3275,18 @@ sub date_setting_table {
'startdate',$starttime);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,
'enddate',$endtime);
- my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date" />
- no ending date</label></nobr>';
- my $start_table = '';
- $start_table .= "<table>\n";
- $start_table .= '<tr><td align="right">Default starting date for
- member access</td>'.
+ my $perpetual =
+ '<nobr><label><input type="checkbox" name="no_end_date" />'.
+ &mt('None').'</label></nobr>';
+ my $table = "<table class=\"LC_descriptive_input\">\n".
+ '<tr><td class="LC_description">'.&mt('Start:').'</td>'.
'<td>'.$startform.'</td>'.
- '<td> </td>'."</tr>\n";
- $start_table .= "</table>";
- my $end_table = '';
- $end_table .= "<table>\n";
- $end_table .= '<tr><td align="right">Default ending date for
- member access</td>'.
+ '<td> </td>'."</tr>\n".
+ '<tr><td class="LC_description">'.&mt('End:').'</td>'.
'<td>'.$endform.'</td>'.
- '<td>'.$perpetual.'</td>'."</tr>\n";
- $end_table .= "</table>\n";
- return ($start_table, $end_table);
+ '<td>'.$perpetual.'</td>'."</tr>\n".
+ "</table>\n";
+ return $table;
}
sub add_group_folder {
@@ -3451,31 +3298,31 @@ sub add_group_folder {
my ($outcome,$allgrpsmap,$grpmap,$boardsmap,$grppage);
my $navmap = Apache::lonnavmaps::navmap->new();
my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
- $allgrpsmap = $crspath.'default_0.sequence';
+ $allgrpsmap = $crspath.'group_allfolders.sequence';
my $topmap = $navmap->getResourceByUrl($allgrpsmap);
undef($navmap);
if ($action eq 'create') {
- # check if default_0.sequence exists.
+ # check if group_allfolders.sequence exists.
if (!$topmap) {
- my $grpstitle = &mt('[_1] [_2]',$crstype,$ucgpterm);
+ my $grpstitle = &mt('[_1] [_2]s',$crstype,$ucgpterm);
my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'};
$topmap_url =~ s|/+|/|g;
if ($topmap_url =~ m|^/uploaded|) {
- $outcome = &map_updater($cdom,$cnum,'default_0.sequence',
+ $outcome = &map_updater($cdom,$cnum,'group_allfolders.sequence',
'toplevelgroup',$grpstitle,$topmap_url);
if ($outcome ne 'ok') {
return $outcome;
}
} else {
- $outcome = &mt('Non-standard course - group folder not added.');
+ $outcome = &mt('Non-standard course - folder for all groups not added.');
return $outcome;
}
}
my $grpfolder = &mt('[_1] Folder -',$ucgpterm,).$description;
- $grppage='/adm/'.$cdom.'/'.$cnum.'/'.$groupname.'/grppg';
+ $grppage='/adm/'.$cdom.'/'.$cnum.'/'.$groupname.'/smppg';
my $grptitle = &mt('Group homepage').' - '.$description;
- my ($seqid,$discussions,$disctitle);
- my $outcome = &map_updater($cdom,$cnum,'default_'.$now.'.sequence',
+ my ($discussions,$disctitle);
+ my $outcome = &map_updater($cdom,$cnum,'group_folder_'.$groupname.'.sequence',
'grpseq',$grpfolder,$allgrpsmap,$grppage,
$grptitle);
if ($outcome ne 'ok') {
@@ -3484,16 +3331,15 @@ sub add_group_folder {
my $pageout = &create_homepage($cdom,$cnum,$groupname,$groupinfo,
$tools,$gpterm,$ucgpterm,$now);
# Link to folder for bulletin boards
- $grpmap = $crspath.'default_'.$now.'.sequence';
+ $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
if (grep/^discussion$/,@{$tools}) {
- $seqid = $now + 1;
$disctitle = &mt('Discussion Boards');
- my $outcome = &map_updater($cdom,$cnum,'default_'.$seqid.
+ my $outcome = &map_updater($cdom,$cnum,'group_boards_'.$groupname.
'.sequence','bbseq',$disctitle,$grpmap);
if ($outcome ne 'ok') {
return $outcome;
}
- $boardsmap = $crspath.'default_'.$seqid.'.sequence';
+ $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence';
}
} else {
#modify group folder if status of discussions tools is changed
@@ -3670,8 +3516,8 @@ sub validate_groupname {
"existing $gpterm",
);
- my $exitmsg = '<b>'.$lt{'igna'}.'</b><br /><br />'.$lt{'tgne'}.' "'.
- $groupname.'" ';
+ my $exitmsg = '<span class="LC_error">'.$lt{'igna'}.'</span><br /><br />'.
+ $lt{'tgne'}.' "'.$groupname.'" ';
my $dupmsg = $lt{'grna'};
my $earlyout;
if (($groupname eq '') || ($groupname =~ /\W/)) {
@@ -3702,8 +3548,9 @@ sub topic_bar {
my ($r,$imgnum,$title) = @_;
$r->print('
<div class="LC_topic_bar">
- <img src="/res/adm/pages/bl_step'.$imgnum.'.gif" />
- <span>'.$title.'<span>
+ <img alt="'.&mt('Step [_1]',$imgnum).
+ '"src="/res/adm/pages/bl_step'.$imgnum.'.gif" />
+ <span>'.$title.'</span>
</div>
');
return;