version 1.437, 2006/07/25 15:52:58
|
version 1.440, 2006/08/02 20:18:10
|
Line 2875 sub bodytag {
|
Line 2875 sub bodytag {
|
'alink' => &designparm($function.'.alink',$domain), |
'alink' => &designparm($function.'.alink',$domain), |
'vlink' => &designparm($function.'.vlink',$domain), |
'vlink' => &designparm($function.'.vlink',$domain), |
'link' => &designparm($function.'.link',$domain),); |
'link' => &designparm($function.'.link',$domain),); |
@$addentries{keys(%design)} = @design{keys(%design)}; |
@design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; |
|
|
# role and realm |
# role and realm |
my ($role,$realm) = split(/\./,$env{'request.role'},2); |
my ($role,$realm) = split(/\./,$env{'request.role'},2); |
Line 2900 sub bodytag {
|
Line 2900 sub bodytag {
|
my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } |
if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } |
|
|
my $extra_body_attr = &make_attr_string($forcereg,$addentries); |
my $extra_body_attr = &make_attr_string($forcereg,\%design); |
|
|
# construct main body tag |
# construct main body tag |
my $bodytag = "<body $extra_body_attr>". |
my $bodytag = "<body $extra_body_attr>". |
Line 3200 form, .inline { display: inline; }
|
Line 3200 form, .inline { display: inline; }
|
.LC_success { |
.LC_success { |
color: green; |
color: green; |
} |
} |
|
.LC_icon { |
|
border: 0px; |
|
} |
|
|
table#LC_top_nav, table#LC_menubuttons { |
table#LC_top_nav, table#LC_menubuttons { |
width: 100%; |
width: 100%; |
Line 3327 td.LC_menubuttons_img {
|
Line 3330 td.LC_menubuttons_img {
|
font-weight: bold; |
font-weight: bold; |
} |
} |
|
|
|
table.LC_aboutme_port { |
|
border: 0px; |
|
border-collapse: collapse; |
|
border-spacing: 0px; |
|
} |
table.LC_data_table, table.LC_mail_list { |
table.LC_data_table, table.LC_mail_list { |
border: 1px solid #000000; |
border: 1px solid #000000; |
border-collapse: separate; |
border-collapse: separate; |
Line 3340 table.LC_data_table tr th, table.LC_cale
|
Line 3348 table.LC_data_table tr th, table.LC_cale
|
background-color: $data_table_head; |
background-color: $data_table_head; |
font-size: smaller; |
font-size: smaller; |
} |
} |
table.LC_data_table tr td { |
table.LC_data_table tr td, |
|
table.LC_aboutme_port tr td { |
background-color: $data_table_light; |
background-color: $data_table_light; |
padding: 2px; |
padding: 2px; |
} |
} |
table.LC_data_table tr.LC_even_row td { |
table.LC_data_table tr.LC_even_row td, |
|
table.LC_aboutme_port tr.LC_even_row td { |
background-color: $data_table_dark; |
background-color: $data_table_dark; |
} |
} |
table.LC_data_table tr.LC_data_table_highlight td { |
table.LC_data_table tr.LC_data_table_highlight td { |
Line 4342 sub get_course_users {
|
Line 4352 sub get_course_users {
|
} |
} |
} |
} |
if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) { |
if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) { |
my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum); |
my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); |
foreach my $person (@coursepersonnel) { |
my $now = time; |
|
foreach my $person (sort(keys(%coursepersonnel))) { |
my $match = 0; |
my $match = 0; |
my $secmatch = 0; |
my $secmatch = 0; |
|
my $status; |
my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/); |
my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/); |
$user =~ s/:$//; |
$user =~ s/:$//; |
if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) { |
my ($end,$start) = split(/:/,$coursepersonnel{$person}); |
|
if ($end == -1 || $start == -1) { |
|
next; |
|
} |
|
if (($role) && ((grep(/^\Q$role\E$/,@{$roles})) || |
|
(grep(/^cr$/,@{$roles}) && $role =~ /^cr\//))) { |
my ($uname,$udom) = split(/:/,$user); |
my ($uname,$udom) = split(/:/,$user); |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if (grep(/^all$/,@{$sections})) { |
if (grep(/^all$/,@{$sections})) { |
Line 4370 sub get_course_users {
|
Line 4387 sub get_course_users {
|
$usec = 'none'; |
$usec = 'none'; |
} |
} |
if ($uname ne '' && $udom ne '') { |
if ($uname ne '' && $udom ne '') { |
my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role, |
if ($end < $now) { |
$usec); |
$status = 'previous'; |
|
} elsif ($start > $now) { |
|
$status = 'future'; |
|
} else { |
|
$status = 'active'; |
|
} |
foreach my $type (keys(%{$types})) { |
foreach my $type (keys(%{$types})) { |
if ($status eq $type) { |
if ($status eq $type) { |
if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) { |
if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) { |
Line 4396 sub get_course_users {
|
Line 4418 sub get_course_users {
|
my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum); |
my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum); |
if ( defined($csettings{'internal.courseowner'}) ) { |
if ( defined($csettings{'internal.courseowner'}) ) { |
my $owner = $csettings{'internal.courseowner'}; |
my $owner = $csettings{'internal.courseowner'}; |
@{$$users{'ow'}{$owner.':'.$cdom}} = 'any'; |
if ($owner !~ /^[^:]+:[^:]+$/) { |
|
$owner = $owner.':'.$cdom; |
|
} |
|
@{$$users{'ow'}{$owner}} = 'any'; |
if (defined($userdata) && |
if (defined($userdata) && |
!exists($$userdata{$owner.':'.$cdom})) { |
!exists($$userdata{$owner.':'.$cdom})) { |
&get_user_info($cdom,$owner,\%idx,$userdata); |
&get_user_info($cdom,$owner,\%idx,$userdata); |