--- loncom/interface/loncoursegroups.pm 2006/07/07 16:48:21 1.40
+++ loncom/interface/loncoursegroups.pm 2006/07/07 19:50:21 1.44
@@ -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.44 2006/07/07 19:50:21 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1182,10 +1182,9 @@ sub general_settings_form {
$toolprivs,$fixedprivs,$sectioncount,$stored,$states,$navbuttons,
$rowColor1,$rowColor2,$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);
@@ -1198,9 +1197,9 @@ sub general_settings_form {
&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);
+ &mapping_options($r,$action,$formname,$page,$sectioncount,
+ $states,$stored,$navbuttons,4,5,
+ $gpterm,$ucgpterm,$crstype);
$nexttext = $$navbuttons{'mose'};
}
$prevtext = $$navbuttons{'gtpp'};
@@ -1210,7 +1209,7 @@ 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",
@@ -1226,12 +1225,9 @@ sub groupsettings_options {
my ($crsquota,$freespace,$maxposs) = &get_quota_constraints($action,$stored);
&topic_bar($r,$image,$lt{'gnde'});
$r->print('
-
-
-
-
+
-
'.$lt{'gnam'}.':
+
'.$lt{'gnam'}.':
');
if ($action eq 'create') {
@@ -1244,13 +1240,13 @@ sub groupsettings_options {
-
$lt{'desc'}:
+
$lt{'desc'}:
-
$lt{'func'}:
+
$lt{'func'}:
END
my $numitems = keys(%{$functions});
my $halfnum = int($numitems/2);
@@ -1284,7 +1280,7 @@ END
-
'.&mt('Granularity:').'
+
'.&mt('Granularity:').'
'.$lt{'doyo'}.' ');
if ($action eq 'modify') {
$r->print(' ('.&mt('Currently set to "[_1]"',
@@ -1294,7 +1290,7 @@ END
-
'.&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));
} else {
@@ -1318,8 +1314,6 @@ END
-
-
');
return;
}
@@ -1428,7 +1422,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,21 +1434,11 @@ 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('
-
-
-
'.$start_table.'
-
-
-
-
-
-
-
'.$end_table.'
-
');
+ '.$table.'
+ ');
return;
}
@@ -1472,6 +1456,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;
@@ -1506,10 +1491,10 @@ sub choose_members_form {
&privilege_specificity($r,$tabcol,$rowColor1,$rowColor2,$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 +1508,7 @@ sub choose_members_form {
sub display_navbuttons {
my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_;
- $r->print('
-
-
-
-
-
-
');
+ $r->print('
');
if ($prev) {
$r->print('
');
}
- $r->print('
-
-
-');
+ $r->print('');
}
sub check_tools {
@@ -1585,7 +1561,7 @@ sub print_current_settings {
}
if ($action eq 'create') {
$r->print('
-
'.$lt{'ygrs'}.'
+
'.$lt{'ygrs'}.' '.$lt{'tfwa'}.'
');
}
@@ -1656,9 +1632,8 @@ 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",
'addm' => 'Add members',
@@ -1697,9 +1672,6 @@ sub pick_new_members {
&topic_bar($r,$img,$lt{'gpme'});
if (keys(%members) > 0) {
$r->print('
-
'.$$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;
@@ -3237,23 +3132,17 @@ sub mapping_settings {
unshift(@sections,'all'); # Put 'all' at the front of the list
}
&topic_bar($r,$image,$$lt{'pirs'});
- $r->print('
-
-
-
-');
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('
-
'.&mt('Active?').'
'.&mt('Role').'
');
if (@sections > 0) {
- $r->print('
'.&mt('Sections').'
'."\n");
+ $r->print('
'.&mt('Sections').'
');
}
- 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 +3157,25 @@ sub mapping_settings {
'';
}
}
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
- $r->print('