--- loncom/interface/lonsyllabus.pm 2009/03/31 08:49:09 1.85 +++ loncom/interface/lonsyllabus.pm 2009/05/11 13:34:10 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.85 2009/03/31 08:49:09 bisitz Exp $ +# $Id: lonsyllabus.pm,v 1.89 2009/05/11 13:34:10 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,20 +69,20 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); - } + } # -------------------------------------------------- Let's see who handles this my $externalsyllabus=$courseenv{'externalsyllabus'}; if ($externalsyllabus=~/\w/) { - + if ($env{'form.wrapperdisplay'} eq 'menu') { $r->print(&Apache::lonwrapper::simple_menu()); - } else { + } else { $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", $externalsyllabus)); } return OK; - } + } # ------------------------------ The buck stops here: internal syllabus display # --------------------------------------------------------- The syllabus fields @@ -107,8 +107,8 @@ sub handler { if ($env{'form.forcestudent'}) { $forcestudent='student'; }; my $forceedit=''; if ($env{'form.forceedit'}) { $forceedit='edit'; } - -# ----------------------------------------------------------------- Make header + +# ----------------------------------------------------------------- Make header if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); my $js; @@ -139,7 +139,7 @@ function getIndexByName(item) { ENDSCRIPT } - my $start_page = + my $start_page = &Apache::loncommon::start_page("Syllabus", $rss_link.$js, {'function' => $forcestudent, 'domain' => $cdom, @@ -161,8 +161,8 @@ ENDSCRIPT ({href=>$r->uri, text=>"Course syllabus"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs()); - } - + } + } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); @@ -182,7 +182,7 @@ ENDSCRIPT $forcestudent='student'; } if ($forcestudent or $target eq 'tex') { $allowed=0; } - } + } if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; @@ -248,19 +248,40 @@ if( ($allowed) && ($target ne 'tex') ) { #-Print Help Text if ($target ne 'tex') { - if($allowed){ + if ($allowed) { $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); } } +#----------Print last update + my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); + my $who = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}); + if ($target ne 'tex') { + $r->print('
'.&mt('Last updated').': '. + $lastmod . ' '. + ($who ? &mt('by').' '.$who + : '' ) . + '
' ); + + } else { + $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. + ($who? &mt('by').'\\\\ '. + &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) + :'') + .'\\\\'); + } #--------Functions if ($target ne 'tex') { - if($allowed || $privileged){ + if( $allowed || $privileged) { $r->print(&Apache::lontemplate::start_functionslist()); - if($allowed){ + if ($allowed) { $r->print(&Apache::lontemplate::item_functionslist( ''.&mt('Show Public View').'' .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); - }elsif($privileged){ + } elsif ($privileged) { $r->print(&Apache::lontemplate::item_functionslist( ''.&mt('Edit').'')); } @@ -268,10 +289,10 @@ if ($target ne 'tex') { } } #----------------------------Print Headtitle -if($target ne 'tex'){ - $r->print('

'.$courseenv{'description'}.'

'); +if ($target ne 'tex') { + $r->print('

'.$courseenv{'description'}.'

'); $r->print('

'. &Apache::lonnet::domain($cdom,'description').'

'); -}else{ +} else { $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. &Apache::lonnet::domain($cdom,'description').'}\\\\'); } @@ -288,7 +309,7 @@ if($target ne 'tex'){ if ($target ne 'tex') { $r->print(&Apache::lonhtmlcommon::row_title($element)); } else { - $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); + $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } foreach (split(/\,/,$coursepersonnel{$element})) { my ($puname,$pudom)=split(/\:/,$_); @@ -318,82 +339,63 @@ if($target ne 'tex'){ } else { $r->print('\end{tabular}\\\\'); } -#----------Print last update - my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - my $who = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}); - if ($target ne 'tex') { - $r->print('
'.&mt('Last updated').':'. - $lastmod.''. - ($who ? &mt('by').' '.$who - : '' ). - '
'); - } else { - $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. - ($who? &mt('by').'\\\\ '. - &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) - :'') - .'\\\\'); - } # -------------------------------------------------------------- Announcements? my $day = &Apache::lonannounce::showday(time,2, &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { - if($allowed){ + if ($allowed) { &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html'; + $r->print( ''.&mt('New RSS Feed or Blog').''); &Apache::lontemplate::print_end_template($r); - } - elsif(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') { &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); &Apache::lontemplate::print_end_template($r); } - + } else { $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); - } + } # ---------------------------------------------------------------- Get syllabus - if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { + if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { $r->print('
'. ''); } 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 $urls=$message; + $message=''; + foreach my $filelink (split(/\n/,$urls)) { my $output=''; # embed style? - my ($curfext)=($filelink=~/\.([^\.]+)$/); - my $embstyle=&Apache::loncommon::fileembstyle($curfext); + 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') { + 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; @@ -402,9 +404,9 @@ if($target ne 'tex'){ } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - if($allowed){ + if ($allowed) { $r->print('

'); - } + } &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial'); } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. @@ -413,26 +415,26 @@ if($target ne 'tex'){ push(@htmlids,$field); } if ($allowed) { - if($target ne 'tex'){ + if ($target ne 'tex') { $r->print('

'); &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); } - + } } - } - + } + 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 ');} + if ($target ne 'tex') {$r->print('

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

');} } - if ($target ne 'tex') { + if ($target ne 'tex') { if ($env{'form.backto'} eq 'coursecatalog') { $r->print('
'. &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']). @@ -443,7 +445,7 @@ if($target ne 'tex'){ $r->print('\end{document}'); } return OK; -} +} 1; __END__