--- loncom/interface/loncommon.pm 2006/04/21 22:00:56 1.346 +++ loncom/interface/loncommon.pm 2006/04/22 16:26:31 1.348 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.346 2006/04/21 22:00:56 albertel Exp $ +# $Id: loncommon.pm,v 1.348 2006/04/22 16:26:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2605,11 +2605,13 @@ sub maketime { ######################################### sub findallcourses { - my %courses=(); + my %courses; my $now=time; - foreach (keys %env) { - if ($_=~/^user\.role\.\w+\.\/(\w+)\/(\w+)/) { - my ($starttime,$endtime)=$env{$_}; + foreach my $key (keys(%env)) { + if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) { + my ($role,$domain,$id) = ($1,$2,$3); + next if ($role eq 'ca' || $role eq 'aa'); + my ($starttime,$endtime)=$env{$key}; my $active=1; if ($starttime) { if ($now<$starttime) { $active=0; } @@ -2617,10 +2619,10 @@ sub findallcourses { if ($endtime) { if ($now>$endtime) { $active=0; } } - if ($active) { $courses{$1.'_'.$2}=1; } + if ($active) { $courses{$domain.'_'.$id}=1; } } } - return keys %courses; + return keys(%courses); } ############################################### @@ -3054,6 +3056,9 @@ sub standard_css { my $vlink = &designparm($function.'.vlink',$domain); my $link = &designparm($function.'.link',$domain); my $sans = 'Arial,Helvetica,sans-serif'; + my $data_table_head = '#CCCCFF'; + my $data_table_light = '#EEEEEE'; + my $data_table_dark = '#DDD'; return < h1, h2, h3, th { font-family: $sans } @@ -3112,6 +3117,24 @@ td.LC_menubuttons_img { font-family: $sans; font-weight: bold; } + +table.LC_data_table { + border: 1px solid #000000; + border-collapse: seperate; +} +table.LC_data_table tr th { + background-color: $data_table_head; +} +table.LC_data_table tr td { + background-color: $data_table_light; +} +table.LC_data_table tr.LC_even_row td { + background-color: $data_table_dark; +} +table.LC_data_table tr.LC_empty td { + background-color: #FFFFFF; +} + END } @@ -3456,6 +3479,29 @@ sub simple_error_page { } return $page; } + +{ + my $row_count; + sub start_data_table { + undef($row_count); + return ''; + } + + sub end_data_table { + undef($row_count); + return '
'; + } + + sub start_data_table_row { + $row_count++; + return ''; + } + + sub end_data_table_row { + return ''; + } +} + ############################################### =pod