--- loncom/interface/lonsyllabus.pm 2002/09/13 19:40:48 1.8 +++ loncom/interface/lonsyllabus.pm 2003/09/17 19:45:39 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.8 2002/09/13 19:40:48 www Exp $ +# $Id: lonsyllabus.pm,v 1.23 2003/09/17 19:45:39 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,9 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; +use Apache::lonfeedback; +use Apache::lonannounce; +use Apache::lonlocal; sub handler { my $r = shift; @@ -45,17 +48,16 @@ sub handler { <html> <head> <title>The LearningOnline Network with CAPA</title> -</head> 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('<body>No syllabus available</body>'); + $r->print('</head><body>'.&mt('No syllabus available').'</body></html>'); return OK; } # --------------------------------------------------------- The syllabus fields - my %syllabusfields=( + my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_instructorinfo' => 'Instructor Information', 'bbb_description' => 'Course Description', 'ccc_prereq' => 'Prerequisites', @@ -69,20 +71,47 @@ ENDDOCUMENT 'hhh_readings' => 'Readings', 'iii_coursepack' => 'Coursepack', 'jjj_weblinks' => 'Web Links', - 'kkk_textbook' => 'Textbook'); + '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('</head>'.&Apache::loncommon::bodytag + ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'. $Apache::lonnet::domaindescription{$cdom}.'</h3>'); +# -------------------------------------------------------------- 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('<table border="2">'); + foreach (sort keys %coursepersonnel) { + $r->print('<tr><td>'.$_.'</td><td>'); + foreach (split(/\,/,$coursepersonnel{$_})) { + my ($puname,$pudom)=split(/\:/,$_); + $r->print(' '.&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($puname, + $pudom),$puname,$pudom)); + } + $r->print('</td></tr>'); + } + $r->print('</table>'); +# ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); my $allowed=0; @@ -91,21 +120,52 @@ ENDDOCUMENT if ($ENV{'user.environment'}) { # does this user have privileges to post, etc? if ($ENV{'request.course.id'}) { - $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); + $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); if ($forcestudent) { $allowed=0; } } if ($allowed) { - $r->print('<p>This syllabus can be publically viewed at <tt>http://'. - $Apache::lonnet::hostname{$homeserver}.$r->uri.'</tt></p>'. - '<p><a href="'.$r->uri.'?forcestudent=1">Show Student View</a></p>'); + $r->print('<p>'. +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p>'.&mt('This syllabus can be publicly viewed at') + .' <tt>http://'. + $Apache::lonnet::hostname{$homeserver}.$r->uri.'</tt>'. + &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'. + '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Public View</font></a>'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). + '</p>'); } if (($allowed) && ($ENV{'form.storesyl'})) { foreach (keys %syllabusfields) { my $field=$ENV{'form.'.$_}; $field=~s/\s+$//s; - $field=~s/\</\<\;/g; - $field=~s/\>/\>\;/g; + $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'}; @@ -118,7 +178,7 @@ ENDDOCUMENT my $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?localtime($lastmod):'never'); - $r->print('<table><tr><td>Uploaded:</td><td>'. + $r->print('<table><tr><td>'.&mt('Uploaded').':</td><td>'. &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($syllabus{'uploaded.name'}, $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, @@ -132,12 +192,39 @@ ENDDOCUMENT foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { my $message=$syllabus{$_}; - $message=~s/\n/\<br \/\>/g; - $message - =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g; - $message=&Apache::lontexconvert::msgtexconverted($message); - $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'. + 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='<img src="'.$filelink.'" />'; + } + $message.='<p>'.$output.'</p>'; + } + if ($allowed) { + $r->print('<h3>'.$syllabusfields{$_}. + &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'. + '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Public View</font></a>'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>'); + } else { + $r->print($message); + } + } else { + $message=~s/\n/\<br \/\>/g; + $message + =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g; + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'. $message.'</blockquote>'); + } if ($allowed) { $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'. $syllabus{$_}.