--- loncom/interface/lonsyllabus.pm 2002/08/27 20:29:54 1.6 +++ loncom/interface/lonsyllabus.pm 2003/03/10 14:20:07 1.16 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.6 2002/08/27 20:29:54 www Exp $ +# $Id: lonsyllabus.pm,v 1.16 2003/03/10 14:20:07 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; +use Apache::lonfeedback; sub handler { my $r = shift; @@ -45,12 +46,12 @@ sub handler { The LearningOnline Network with CAPA - ENDDOCUMENT my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # Is this even a course? - if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { - $r->print('No syllabus available'); + my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); + if ($homeserver eq 'no_host') { + $r->print('No syllabus available'); return OK; } # --------------------------------------------------------- The syllabus fields @@ -58,22 +59,37 @@ ENDDOCUMENT 'aaa_instructorinfo' => 'Instructor Information', 'bbb_description' => 'Course Description', 'ccc_prereq' => 'Prerequisites', + 'cdc_classhours' => 'Class Hours', 'ddd_officehours' => 'Office Hours', 'eee_helproom' => 'Helproom Hours', + 'efe_projectinfo' => 'Project Information', 'fff_examinfo' => 'Exam Information', + 'fgf_deadlines' => 'Deadlines', 'ggg_grading' => 'Grading Information', - 'hhh_readings' => 'Readings'); + 'hhh_readings' => 'Readings', + 'iii_coursepack' => 'Coursepack', + 'jjj_weblinks' => 'Web Links', + '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}.'

'); my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); @@ -88,20 +104,47 @@ ENDDOCUMENT if ($forcestudent) { $allowed=0; } } if ($allowed) { - $r->print( - '

Show Student View

'); + $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'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). + '

'); } if (($allowed) && ($ENV{'form.storesyl'})) { foreach (keys %syllabusfields) { my $field=$ENV{'form.'.$_}; $field=~s/\s+$//s; - $field=~s/\/\>\;/g; - if ($field) { - $syllabus{$_}=$field; - } else { - delete $syllabus{$_}; - } + $field=&Apache::lonfeedback::clear_out_html($field,1); + $syllabus{$_}=$field; + if ($_ eq 'lll_includeurl') { # clean up included URLs + my $field=''; + foreach (split(/\n/,$syllabus{$_})) { + my $url=$_; +# get rid of leading and trailing spaces + $url=~s/^\s+//; + $url=~s/\s+$//; + if ($url=~/^http\:\/\/([^\/]+)\/(.+)$/) { + my $remainder=$2; +# remove the hostname from internal URLs + foreach (keys %Apache::lonnet::hostname) { + if ($1=~/$Apache::lonnet::hostname{$_}/i) { + $url=$remainder; + } + } + } +# norm internal URLs + unless ($url=~/^http\:/) { + $url=&Apache::lonnet::clutter($url); + } +# re-assemble field + if ($url) { + $field.=$url."\n"; + } + } + $syllabus{$_}=$field; + } } $syllabus{'uploaded.domain'}=$ENV{'user.domain'}; $syllabus{'uploaded.name'}=$ENV{'user.name'}; @@ -111,11 +154,16 @@ ENDDOCUMENT } # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { + my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=($lastmod?localtime($lastmod):'never'); + $r->print('
Uploaded:'. + &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, $syllabus{'uploaded.domain'}). - '
Last updated'. - localtime($syllabus{'uploaded.lastmodified'}). + '
Last updated:'. + $lastmod. '

'); if ($allowed) { $r->print('

'); @@ -123,12 +171,39 @@ ENDDOCUMENT foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { my $message=$syllabus{$_}; - $message=~s/\n/\
/g; - $message + if ($_ eq 'lll_includeurl') { # this is the "included" field + my $urls=$message; + $message=''; + foreach my $filelink (split(/\n/,$urls)) { + my $output=''; +# embed style? + my ($curfext)=($filelink=~/\.([^\.]+)$/); + my $embstyle=&Apache::loncommon::fileembstyle($curfext); + if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) { +# make ssi call and remove everything but the body contents + $output=&Apache::lonnet::ssi_body($filelink); + } elsif ($embstyle eq 'img') { +# embed as an image + $output=''; + } + $message.='

'.$output.'

'; + } + if ($allowed) { + $r->print('

'.$syllabusfields{$_}. + &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'. + '

Show Student View'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); + } else { + $r->print($message); + } + } else { + $message=~s/\n/\
/g; + $message =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - $message=&Apache::lontexconvert::msgtexconverted($message); - $r->print('

'.$syllabusfields{$_}.'

'. + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print('

'.$syllabusfields{$_}.'

'. $message.'
'); + } if ($allowed) { $r->print('