--- loncom/interface/lonmsgdisplay.pm 2006/04/25 23:13:25 1.17
+++ loncom/interface/lonmsgdisplay.pm 2006/04/26 14:10:58 1.18
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.17 2006/04/25 23:13:25 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.18 2006/04/26 14:10:58 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1291,8 +1291,8 @@ sub display_blocker_status {
'modi' => 'Modify',
'canc' => 'Cancel',
);
+ $r->print(&Apache::loncommon::start_data_table());
$r->print(<<"END");
-
$$ltext{'dura'} |
$$ltext{'setb'} |
@@ -1300,26 +1300,27 @@ sub display_blocker_status {
$$ltext{'actn'}? |
END
- foreach (sort keys %{$records}) {
- my $iter = $parmcount%2;
+ foreach my $record (sort(keys(%{$records}))) {
my $onchange = 'onFocus="javascript:window.document.forms['.
"'blockform'].elements['modify_".$parmcount."'].".
'checked=true;"';
- my ($start,$end) = split/____/,$_;
+ my ($start,$end) = split(/____/,$record);
my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
- my ($setuname,$setudom,$title) = &parse_block_record($$records{$_});
+ my ($setuname,$setudom,$title) =
+ &parse_block_record($$records{$record});
+ $title = &HTML::Entities::encode($title,'"<>');
my $settername = &Apache::loncommon::plainname($setuname,$setudom);
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");
-
$$ltext{'star'}: $startform $$ltext{'endd'}: $endform |
$settername |
- |
+ |
- |
END
- $parmcount ++;
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $parmcount++;
}
$r->print(<<"END");
@@ -1358,19 +1359,23 @@ sub display_addblocker_table {
);
$r->print(<<"END");
$lt{'addn'}
-
END
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
return;
}
@@ -1428,31 +1433,35 @@ sub build_block_table {
'cour' => 'Course',
'dura' => 'Duration',
'blse' => 'Block set by'
- );
+ );
+ $r->print(<<"END");
+
$lt{'cacb'}:
+END
+ $r->print(&Apache::loncommon::start_data_table());
$r->print(<<"END");
-
$lt{'cacb'}:
-
$lt{'cour'} |
$lt{'dura'} |
$lt{'blse'} |
END
- foreach (keys %{$setters}) {
- my %courseinfo=&Apache::lonnet::coursedescription($_);
- for (my $i=0; $i<@{$$setters{$_}{staff}}; $i++) {
- my ($uname,$udom) = @{$$setters{$_}{staff}[$i]};
+ foreach my $course (keys(%{$setters})) {
+ my %courseinfo=&Apache::lonnet::coursedescription($course);
+ for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+ my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
my $fullname = &Apache::loncommon::plainname($uname,$udom);
- my ($openblock,$closeblock) = @{$$setters{$_}{times}[$i]};
+ my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
$openblock = &Apache::lonlocal::locallocaltime($openblock);
$closeblock= &Apache::lonlocal::locallocaltime($closeblock);
- $r->print(''.$courseinfo{'description'}.' | '.
+ $r->print(&Apache::loncommon::start_data_table_row().
+ ''.$courseinfo{'description'}.' | '.
''.$openblock.' to '.$closeblock.' | '.
''.$fullname.' ('.$uname.':'.$udom.
- ') |
');
+ ')'.
+ &Apache::loncommon::end_data_table_row());
}
}
- $r->print('
');
+ $r->print(&Apache::loncommon::end_data_table());
}
# ----------------------------------------------------------- Display a message