--- loncom/interface/lonsyllabus.pm 2009/09/07 18:31:50 1.96 +++ 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.96 2009/09/07 18:31:50 raeburn 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; } @@ -141,7 +141,7 @@ ENDSCRIPT } my $start_page = &Apache::loncommon::start_page("Syllabus", $rss_link.$js, - {'function' => $forcestudent, + {'function' => undef, 'domain' => $cdom, 'force_register' => $env{'form.register'},}); @@ -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=''; @@ -232,17 +234,31 @@ ENDSCRIPT #--------Functions if( ($allowed || $privileged) && $target ne 'tex') { my $functions=&Apache::lonhtmlcommon::start_funclist(); - if ($allowed) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( + #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')); + } else { + $functions.=&Apache::lonhtmlcommon::add_item_funclist( '' .&mt('Show Public View').'' .&Apache::loncommon::help_open_topic( 'Uploaded_Templates_PublicView')); + } } elsif ($privileged) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( + if($env{'form.register'} == 1) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Edit').''); + } else { + $functions.=&Apache::lonhtmlcommon::add_item_funclist( '' .&mt('Edit').''); + } } $functions.=&Apache::lonhtmlcommon::end_funclist(); @@ -260,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 @@ -367,64 +383,53 @@ ENDSCRIPT ''); } my @htmlids=(); - - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}=~/\w/) || ($allowed)) { - my $message=$syllabus{$field}; - if ($field 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=''; - } - if ($output ne '') { - if ($target ne 'tex') { - $message.='

'.$output.'

'; - } else { - $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

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

'.$syllabusfields{$field}. - &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'); - } else { - $r->print($message); - } - } else { - &Apache::lonfeedback::newline_to_br(\$message); - $message =~s|(https?\://[^\s]+)|$1|g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - push(@htmlids,$field); - } - if ($allowed) { - if ($target ne 'tex') { - &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); - } - } - } - } + 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=''; + } + if ($output ne '') { + if ($target ne 'tex') { + $message.='

'.$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("
"); + &Apache::lontemplate::print_textarea_template($r, $data{$field}, + $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF); + &Apache::lontemplate::print_saveall_template($r); + $r->print("
"); + &Apache::lontemplate::print_end_template($r); + + } else { + $r->print($message); + } + }; + my %custom_hash = ( 'lll_includeurl' => $url_include_handler ); + @htmlids = &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, + $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash); if ($allowed) { $r->print(''. &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); } - # if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} } else { if ($target ne 'tex') {$r->print('

');} else {$r->print('\par ');} $r->print(&mt('No syllabus information provided.'));