--- loncom/interface/lonsyllabus.pm 2009/09/20 22:04:57 1.97
+++ loncom/interface/lonsyllabus.pm 2010/01/31 06:03:55 1.106
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.97 2009/09/20 22:04:57 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.106 2010/01/31 06:03:55 faziophi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,7 +58,7 @@ sub handler {
if ($homeserver eq 'no_host') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- &Apache::loncommon::simple_error_page($r,'No syllabus available',
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
'No syllabus available');
return OK;
}
@@ -151,7 +151,7 @@ ENDSCRIPT
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog()",
- text=>"Course Catalog"});
+ text=>"Course/Community Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('details')",
@@ -182,6 +182,7 @@ ENDSCRIPT
}
if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
+ #store what the user typed in
if (($allowed) && ($env{'form.storesyl'})) {
foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
@@ -190,6 +191,7 @@ ENDSCRIPT
$field=~s/^\s+//s;
$field=~s/\
$//s;
$field=&Apache::lonfeedback::clear_out_html($field,1);
+ #here it will be stored
$syllabus{$syl_field}=$field;
if ($syl_field eq 'lll_includeurl') { # clean up included URLs
my $field='';
@@ -236,7 +238,7 @@ ENDSCRIPT
#if you have the register flag, keep it
if($env{'form.register'} == 1) {
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
+ ''
.&mt('Show Public View').''
.&Apache::loncommon::help_open_topic(
'Uploaded_Templates_PublicView'));
@@ -250,7 +252,7 @@ ENDSCRIPT
} elsif ($privileged) {
if($env{'form.register'} == 1) {
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
+ ''
.&mt('Edit').'');
} else {
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
@@ -274,7 +276,7 @@ ENDSCRIPT
.'
' .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].' - ,'','') + ,'','') .'
' ); #-Print Help Text @@ -381,64 +383,53 @@ ENDSCRIPT ''); } my @htmlids=(); + my $url_include_handler = sub { + my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_; + my %data = %{$data_ref}; + my %fields = %{$fields_ref}; + 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=''.$output.'
'; + } else { + $message.=' '.&Apache::lonxml::xmlparse($r,'tex',''.$output.'
').' '; + } + } + } + if ($allowed) { + &Apache::lonfeedback::newline_to_br(\$urls); + &Apache::lontemplate::print_start_template($r,$fields{$field}. + &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box'); + $r->print($urls); + $r->print("'.$output.'
'; - } else { - $message.=' '.&Apache::lonxml::xmlparse($r,'tex',''.$output.'
').' '; - } - } - } - if ($allowed) { - $r->print('');} else {$r->print('\par ');} $r->print(&mt('No syllabus information provided.'));