--- loncom/interface/lonsyllabus.pm 2004/05/10 14:12:14 1.31
+++ loncom/interface/lonsyllabus.pm 2004/06/11 16:28:14 1.36
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.31 2004/05/10 14:12:14 sakharuk Exp $
+# $Id: lonsyllabus.pm,v 1.36 2004/06/11 16:28:14 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonannounce;
use Apache::lonlocal;
+use Apache::lonhtmlcommon;
sub handler {
my $r = shift;
@@ -98,7 +99,8 @@ ENDDOCUMENT
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
if ($target ne 'tex') {
- $r->print(''.&Apache::loncommon::bodytag
+ $r->print(&Apache::lonhtmlcommon::htmlareaheaders().
+ ''.&Apache::loncommon::bodytag
("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
$r->print('
'.$courseenv{'description'}.'
'.
$Apache::lonnet::domaindescription{$cdom}.'
');
@@ -107,8 +109,14 @@ ENDDOCUMENT
$Apache::lonnet::domaindescription{$cdom}.'}\\\\');
}
# -------------------------------------------------------------- Announcements?
- $r->print(&Apache::lonannounce::showday(time,2,
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonannounce::showday(time,2,
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum)));
+ } else {
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',
+ &Apache::lonannounce::showday(time,2,
+ &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))));
+ }
# -------------------------------------------------------- Get course personnel
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
if ($target ne 'tex') {
@@ -116,13 +124,13 @@ ENDDOCUMENT
} else {
$r->print('\begin{tabular}{|c|c|}\hline');
}
- foreach (sort keys %coursepersonnel) {
+ foreach my $element (sort keys %coursepersonnel) {
if ($target ne 'tex') {
- $r->print(''.$_.' | ');
+ $r->print(' |
'.$element.' | ');
} else {
- $r->print(' '.$_.'\\\\ ');
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
- foreach (split(/\,/,$coursepersonnel{$_})) {
+ foreach (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$_);
if ($target ne 'tex') {
$r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -180,8 +188,11 @@ ENDDOCUMENT
if (($allowed) && ($ENV{'form.storesyl'})) {
foreach (keys %syllabusfields) {
my $field=$ENV{'form.'.$_};
+ chomp($field);
$field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $field=~s/^\s+//s;
+ $field=~s/\ $//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
$syllabus{$_}=$field;
if ($_ eq 'lll_includeurl') { # clean up included URLs
my $field='';
@@ -238,8 +249,9 @@ ENDDOCUMENT
$r->print('');
+ $r->print(''.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
}
if ($target ne 'tex') {$r->print('');} else {$r->print('\\\\');}
} else {
- $r->print('No syllabus information provided. ');
+ if ($target ne 'tex') {$r->print('');} else {$r->print('\par ');}
+ $r->print('No syllabus information provided.');
+ if ($target ne 'tex') {$r->print(' ');}
}
if ($target ne 'tex') {$r->print(' |