--- loncom/interface/lonsyllabus.pm 2007/07/27 00:21:39 1.61 +++ loncom/interface/lonsyllabus.pm 2010/01/28 17:25:10 1.69.4.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.61 2007/07/27 00:21:39 albertel Exp $ +# $Id: lonsyllabus.pm,v 1.69.4.2 2010/01/28 17:25:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -110,14 +110,58 @@ sub handler { # ----------------------------------------------------------------- Make header if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $js; + if ($env{'form.backto'} eq 'coursecatalog') { + $js .= <<"ENDSCRIPT"; + + + +ENDSCRIPT + } my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link, + &Apache::loncommon::start_page("Syllabus", $rss_link.$js, {'function' => $forcestudent, 'domain' => $cdom, 'force_register' => $env{'form.register'},}); - $r->print($start_page.'
'.$element.' | '); + $r->print(&Apache::lonhtmlcommon::row_title($element)); } else { $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } foreach (split(/\,/,$coursepersonnel{$element})) { my ($puname,$pudom)=split(/\:/,$_); if ($target ne 'tex') { - $r->print(' '.&Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($puname, - $pudom),$puname,$pudom)); + my $courseperson = &Apache::loncommon::plainname($puname,$pudom); + if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') || + ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) { + $r->print(' '.$courseperson); + } else { + $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson, + $puname,$pudom)); + } } else { $r->print(' '.&Apache::loncommon::plainname($puname, $pudom).' '); } } if ($target ne 'tex') { - $r->print(' |
'. -&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('This syllabus can be publicly viewed at') - .' http://'. +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&mt('This syllabus can be publicly viewed at') + .' '.$protocol.'://'. &Apache::lonnet::hostname($homeserver).$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'
'. - ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'. + ''. + &mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].', + '',''). + '
'. ''.
&mt('Show Public View').''.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
@@ -219,7 +276,7 @@ sub handler {
# get rid of leading and trailing spaces
$url=~s/^\s+//;
$url=~s/\s+$//;
- if ($url=~m|^http://([^/]+)/(.+)$|) {
+ if ($url=~m|^https?\://([^/]+)/(.+)$|) {
my $host = $1;
my $remainder=$2;
# remove the hostname from internal URLs
@@ -232,7 +289,7 @@ sub handler {
}
}
# norm internal URLs
- unless ($url=~/^http\:/) {
+ unless ($url=~/^https?\:/) {
$url=&Apache::lonnet::clutter($url);
}
# re-assemble field
@@ -308,8 +365,10 @@ sub handler {
$r->print($message);
}
} else {
- &Apache::lonfeedback::newline_to_br(\$message);
- $message =~s|(https*://[^\s]+)|$1|g;
+ if (!&Apache::lonfeedback::contains_block_html($message)) {
+ &Apache::lonfeedback::newline_to_br(\$message);
+ }
+ $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
if ($allowed) {
$message=&Apache::lonspeller::markeduptext($message);
}
@@ -326,7 +385,7 @@ sub handler {
if ($allowed) {
$r->print('
');
+ ' ');
}
}
}
@@ -337,10 +396,15 @@ sub handler {
if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');} - $r->print('No syllabus information provided.'); + $r->print(&mt('No syllabus information provided.')); if ($target ne 'tex') {$r->print('
');} } if ($target ne 'tex') { + if ($env{'form.backto'} eq 'coursecatalog') { + $r->print(''); + } $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}');