');
return;
}
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",
@@ -1241,14 +1223,11 @@ sub groupsettings_options {
"to different $gpterm members?",
);
my ($crsquota,$freespace,$maxposs) = &get_quota_constraints($action,$stored);
- &topic_bar($r,$tabcol,$image,$lt{'gnde'});
+ &topic_bar($r,$image,$lt{'gnde'});
$r->print('
-
-
-
-
+
-
'.$lt{'gnam'}.':
+
'.$lt{'gnam'}.':
');
if ($action eq 'create') {
@@ -1261,13 +1240,13 @@ sub groupsettings_options {
-
$lt{'desc'}:
+
$lt{'desc'}:
-
$lt{'func'}:
+
$lt{'func'}:
END
my $numitems = keys(%{$functions});
my $halfnum = int($numitems/2);
@@ -1301,7 +1280,7 @@ END
-
'.&mt('Granularity:').'
+
'.&mt('Granularity:').'
'.$lt{'doyo'}.' ');
if ($action eq 'modify') {
$r->print(' ('.&mt('Currently set to "[_1]"',
@@ -1311,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 {
@@ -1335,8 +1314,6 @@ END
-
-
');
return;
}
@@ -1358,7 +1335,7 @@ sub get_quota_constraints {
}
sub membership_options {
- my ($r,$action,$state,$tabcol,$sectioncount,$image,$gpterm,$ucgpterm) = @_;
+ 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',
@@ -1385,12 +1362,9 @@ sub membership_options {
my @sections = keys(%{$sectioncount});
- &topic_bar($r,$tabcol,$image,$lt{'pipa'});
+ &topic_bar($r,$image,$lt{'pipa'});
$r->print('
-
');
$r->print(&Apache::lonhtmlcommon::role_select_row(\@roles));
if (@sections > 0) {
@sections = sort {$a cmp $b} @sections;
unshift(@sections,'none'); # Put 'no sections' next
unshift(@sections,'all'); # Put 'all' at the front of the list
- $r->print('
');
- &topic_bar($r,$tabcol,3,&mt('Members to delete or expire'));
+ &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) {
@@ -2503,7 +2375,7 @@ sub change_privs_form {
'
');
}
- &topic_bar($r,$tabcol,4,&mt('[_1] member privileges',$ucgpterm));
+ &topic_bar($r,4,&mt('[_1] member privileges',$ucgpterm));
my $numchgs = &member_privileges_form($r,$tabcol,$action,$formname,$tools,
$toolprivs,$fixedprivs,$userdata,
@@ -2526,34 +2398,18 @@ sub add_members_form {
my ($r,$tabcol,$action,$formname,$page,$startdate,$enddate,$groupname,
$description,$granularity,$quota,$sectioncount,$tools,$functions,
$stored,$states,$navbuttons,$rowColor1,$rowColor2,$gpterm,$ucgpterm)=@_;
- $r->print('
-
');
- &topic_bar($r,$tabcol,6,&mt('[_1] member privileges',$ucgpterm));
+ &topic_bar($r,6,&mt('[_1] member privileges',$ucgpterm));
&member_privileges_form($r,$tabcol,$action,$formname,$tools,$toolprivs,
$fixedprivs,$userdata,$usertools,$idx,undef,
@@ -3271,7 +3127,7 @@ sub automapping {
if (exists($$stored{'autodrop'})) {
$drop = $$stored{'autodrop'};
}
- &topic_bar($r,$tabcol,$image,$$lt{'endi'});
+ &topic_bar($r,$image,$$lt{'endi'});
$r->print('
@@ -3325,7 +3181,7 @@ sub mapping_settings {
unshift(@sections,'none'); # Put 'no sections' next
unshift(@sections,'all'); # Put 'all' at the front of the list
}
- &topic_bar($r,$tabcol,$image,$$lt{'pirs'});
+ &topic_bar($r,$image,$$lt{'pirs'});
$r->print('
@@ -3512,23 +3368,18 @@ sub date_setting_table {
'startdate',$starttime);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,
'enddate',$endtime);
- my $perpetual = '';
- my $start_table = '';
- $start_table .= "
\n";
- $start_table .= '
Default starting date for
- member access
'.
+ my $perpetual =
+ '';
+ my $table = "
\n".
+ '
'.&mt('Start:').'
'.
'
'.$startform.'
'.
- '
'."
\n";
- $start_table .= "
";
- my $end_table = '';
- $end_table .= "
\n";
- $end_table .= '
Default ending date for
- member access
'.
+ '
'."
\n".
+ '
'.&mt('End:').'
'.
'
'.$endform.'
'.
- '
'.$perpetual.'
'."
\n";
- $end_table .= "
\n";
- return ($start_table, $end_table);
+ '
'.$perpetual.'
'."
\n".
+ "
\n";
+ return $table;
}
sub add_group_folder {
@@ -3759,8 +3610,8 @@ sub validate_groupname {
"existing $gpterm",
);
- my $exitmsg = ''.$lt{'igna'}.'
'.$lt{'tgne'}.' "'.
- $groupname.'" ';
+ my $exitmsg = ''.$lt{'igna'}.'
'.
+ $lt{'tgne'}.' "'.$groupname.'" ';
my $dupmsg = $lt{'grna'};
my $earlyout;
if (($groupname eq '') || ($groupname =~ /\W/)) {
@@ -3788,22 +3639,12 @@ sub validate_groupname {
}
sub topic_bar {
- my ($r,$tabcol,$imgnum,$title) = @_;
+ my ($r,$imgnum,$title) = @_;
$r->print('
-