--- loncom/interface/loncreateuser.pm 2006/11/22 21:55:53 1.136
+++ loncom/interface/loncreateuser.pm 2006/11/23 00:04:09 1.137
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.136 2006/11/22 21:55:53 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.137 2006/11/23 00:04:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -623,7 +623,6 @@ END
# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=
($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/);
- my $bgcol='ffffff';
my $allowed=0;
my $delallowed=0;
my $sortkey=$role_code;
@@ -664,9 +663,6 @@ END
}
}
# Compute the background color based on $area
- $bgcol=$1.'_'.$2;
- $bgcol=~s/[^7-9a-e]//g;
- $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
$carea.='
Section: '.$3;
$sortkey.="\0$3";
@@ -706,9 +702,8 @@ END
$allowed=0;
}
}
- $bgcol='77FF77';
my $row = '';
- $row.='
';
+ $row.= ' | ';
my $active=1;
$active=0 if (($role_end_time) && ($now>$role_end_time));
if (($active) && ($allowed)) {
@@ -745,7 +740,7 @@ END
: ' ' ).
' | '.($role_end_time ?localtime($role_end_time)
: ' ' )
- ." |
\n";
+ ."";
$sortrole{$sortkey}=$envkey;
$roletext{$envkey}=$row;
$roleclass{$envkey}=$class;
@@ -758,30 +753,35 @@ END
$output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
- $output{$type}.=$roletext{$sortrole{$which}};
+ $output{$type}.=
+ &Apache::loncommon::start_data_table_row().
+ $roletext{$sortrole{$which}}.
+ &Apache::loncommon::end_data_table_row();
}
}
unless($output{$type} eq '') {
- $output{$type} = "".
- "".&mt($type)." | ".
+ $output{$type} = '
'.
+ "".&mt($type)." |
".
$output{$type};
$rolesdisplay = 1;
}
}
if ($rolesdisplay == 1) {
- $r->print(<print('
-$lt{'rer'}
-
-$lt{'rev'} | $lt{'ren'} | $lt{'del'} | $lt{'rol'} | $lt{'e
-xt'} | $lt{'sta'} | $lt{'end'} |
-END
+'.$lt{'rer'}.'
'.
+&Apache::loncommon::start_data_table("LC_createuser").
+&Apache::loncommon::start_data_table_header_row().
+''.$lt{'rev'}.' | '.$lt{'ren'}.' | '.$lt{'del'}.
+' | '.$lt{'rol'}.' | '.$lt{'ext'}.
+' | '.$lt{'sta'}.' | '.$lt{'end'}.' | '.
+&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
if ($output{$type}) {
$r->print($output{$type}."\n");
}
}
- $r->print('
---|
');
+ $r->print(&Apache::loncommon::end_data_table());
}
} # End of unless
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
@@ -1774,8 +1774,9 @@ sub course_level_table {
if (%sections_count) {
my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
$table .=
- ''.
- ''.$lt{'exs'}.' '.
+ ' | '.
+ '
+ '.$lt{'exs'}.' '.
$currsec.' | '.
' | '.
' '.$lt{'new'}.' '.
| | |