--- loncom/interface/lonsyllabus.pm 2002/09/13 19:40:48 1.8 +++ loncom/interface/lonsyllabus.pm 2003/02/28 16:16:59 1.14 @@ -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.14 2003/02/28 16:16:59 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,7 +46,6 @@ sub handler {
This syllabus can be publically viewed at http://'. - $Apache::lonnet::hostname{$homeserver}.$r->uri.'
'. - ''); + $r->print(''. +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
This syllabus can be publically 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; - $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'}; @@ -132,12 +171,39 @@ ENDDOCUMENT foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { my $message=$syllabus{$_}; - $message=~s/\n/\'.$output.'
'; + } + if ($allowed) { + $r->print('Show Student View'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'
'); + } else { + $r->print($message); + } + } else { + $message=~s/\n/\'. + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print(''.$syllabusfields{$_}.'
'. $message.''); + } if ($allowed) { $r->print('