--- loncom/interface/lonsyllabus.pm 2003/02/10 15:19:43 1.10 +++ loncom/interface/lonsyllabus.pm 2003/06/20 13:31:46 1.20 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.10 2003/02/10 15:19:43 www Exp $ +# $Id: lonsyllabus.pm,v 1.20 2003/06/20 13:31:46 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,8 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; +use Apache::lonfeedback; +use Apache::lonannounce; sub handler { my $r = shift; @@ -45,13 +47,12 @@ sub handler { The LearningOnline Network with CAPA - ENDDOCUMENT my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { - $r->print('No syllabus available'); + $r->print('No syllabus available'); return OK; } # --------------------------------------------------------- The syllabus fields @@ -72,18 +73,44 @@ ENDDOCUMENT 'kkk_textbook' => 'Textbook', 'lll_includeurl' => 'URLs To Include in Syllabus'); -# --------------------------------------------------------------- Force Student +# ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent']); + ($ENV{'QUERY_STRING'},['forcestudent','register']); +# ----------------------------------------------------- Force menu registration + my $addentries=''; + if ($ENV{'form.register'}) { + $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). + '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; + $r->print(&Apache::lonmenu::registerurl(1)); + } +# --------------------------------------------------------------- Force Student my $forcestudent=''; if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - $r->print(&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,'','',$cdom)); + $r->print(''.&Apache::loncommon::bodytag + ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); $r->print('

'.$courseenv{'description'}.'

'. $Apache::lonnet::domaindescription{$cdom}.'

'); +# -------------------------------------------------------------- Announcements? + $r->print(&Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))); +# -------------------------------------------------------- Get course personnel + my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); + $r->print(''); + foreach (sort keys %coursepersonnel) { + $r->print(''); + } + $r->print('
'.$_.''); + foreach (split(/\,/,$coursepersonnel{$_})) { + my ($puname,$pudom)=split(/\:/,$_); + $r->print(' '.&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($puname, + $pudom),$puname,$pudom)); + } + $r->print('
'); +# ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); my $allowed=0; @@ -96,7 +123,8 @@ ENDDOCUMENT if ($forcestudent) { $allowed=0; } } if ($allowed) { - $r->print('

This syllabus can be publically viewed at http://'. + $r->print('

'. +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

This syllabus can be publicly viewed at http://'. $Apache::lonnet::hostname{$homeserver}.$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'

'. '

Show Student View'. @@ -107,8 +135,7 @@ ENDDOCUMENT foreach (keys %syllabusfields) { my $field=$ENV{'form.'.$_}; $field=~s/\s+$//s; - $field=~s/\/\>\;/g; + $field=&Apache::lonfeedback::clear_out_html($field,1); $syllabus{$_}=$field; if ($_ eq 'lll_includeurl') { # clean up included URLs my $field=''; @@ -171,11 +198,9 @@ ENDDOCUMENT # embed style? my ($curfext)=($filelink=~/\.([^\.]+)$/); my $embstyle=&Apache::loncommon::fileembstyle($curfext); - if ($embstyle eq 'ssi') { + if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) { # make ssi call and remove everything but the body contents - $output=&Apache::lonnet::ssi($filelink); - $output=~s/^.*\]*\>//si; - $output=~s/\<\/body\s*\>.*$//si; + $output=&Apache::lonnet::ssi_body($filelink); } elsif ($embstyle eq 'img') { # embed as an image $output=''; @@ -193,7 +218,7 @@ ENDDOCUMENT } else { $message=~s/\n/\
/g; $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; $message=&Apache::lontexconvert::msgtexconverted($message); $r->print('

'.$syllabusfields{$_}.'

'. $message.'
');