--- loncom/interface/lonsyllabus.pm 2009/05/15 13:43:46 1.90 +++ loncom/interface/lonsyllabus.pm 2009/09/20 22:04:57 1.97 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.90 2009/05/15 13:43:46 amueller Exp $ +# $Id: lonsyllabus.pm,v 1.97 2009/09/20 22:04:57 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,8 +58,8 @@ 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', - 'No syllabus available'); + &Apache::loncommon::simple_error_page($r,'No syllabus available', + 'No syllabus available'); return OK; } # ------------------------------------- There is such a course, get environment @@ -68,7 +68,7 @@ sub handler { # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { - $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } # -------------------------------------------------- Let's see who handles this my $externalsyllabus=$courseenv{'externalsyllabus'}; @@ -76,10 +76,10 @@ sub handler { if ($externalsyllabus=~/\w/) { if ($env{'form.wrapperdisplay'} eq 'menu') { - $r->print(&Apache::lonwrapper::simple_menu()); + $r->print(&Apache::lonwrapper::simple_menu()); } else { - $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", - $externalsyllabus)); + $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", + $externalsyllabus)); } return OK; } @@ -110,7 +110,7 @@ sub handler { # ----------------------------------------------------------------- Make header if ($target ne 'tex') { - my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); my $js; if ($env{'form.backto'} eq 'coursecatalog') { $js .= <<"ENDSCRIPT"; @@ -139,14 +139,14 @@ function getIndexByName(item) { ENDSCRIPT } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js, - {'function' => $forcestudent, - 'domain' => $cdom, - 'force_register' => - $env{'form.register'},}); + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link.$js, + {'function' => undef, + 'domain' => $cdom, + 'force_register' => + $env{'form.register'},}); - $r->print($start_page); + $r->print($start_page); if ($env{'form.backto'} eq 'coursecatalog') { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb @@ -162,7 +162,6 @@ ENDSCRIPT text=>"Course syllabus"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs()); } - } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); @@ -174,54 +173,54 @@ ENDSCRIPT if ($env{'user.environment'}) { # does this user have privileges to post, etc? if ($env{'request.course.id'} - && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'} - && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) { + && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'} + && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); - $privileged=$allowed; - if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; - } + $privileged=$allowed; + if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { + $forcestudent='student'; + } if ($forcestudent or $target eq 'tex') { $allowed=0; } } if (($allowed) && ($env{'form.storesyl'})) { - foreach my $syl_field (keys(%syllabusfields)) { + foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; - chomp($field); + chomp($field); $field=~s/\s+$//s; - $field=~s/^\s+//s; - $field=~s/\$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$syl_field}=$field; + $field=~s/^\s+//s; + $field=~s/\$//s; + $field=&Apache::lonfeedback::clear_out_html($field,1); + $syllabus{$syl_field}=$field; if ($syl_field eq 'lll_includeurl') { # clean up included URLs my $field=''; - foreach my $value (split(/\n/,$syllabus{$syl_field})) { - my $url=$value; + foreach my $value (split(/\n/,$syllabus{$syl_field})) { + my $url=$value; # get rid of leading and trailing spaces $url=~s/^\s+//; $url=~s/\s+$//; if ($url=~m|^https?\://([^/]+)/(.+)$|) { - my $host = $1; + my $host = $1; my $remainder=$2; # remove the hostname from internal URLs - my $hostname = &Apache::lonnet::hostname($host); - my %all_hostnames = &Apache::lonnet::all_hostnames(); - foreach my $possible_host (keys(%all_hostnames)) { + my $hostname = &Apache::lonnet::hostname($host); + my %all_hostnames = &Apache::lonnet::all_hostnames(); + foreach my $possible_host (keys(%all_hostnames)) { if ($possible_host =~ /\Q$hostname\E/i) { - $url=$remainder; - } - } - } + $url=$remainder; + } + } + } # norm internal URLs unless ($url=~/^https?\:/) { - $url=&Apache::lonnet::clutter($url); + $url=&Apache::lonnet::clutter($url); } # re-assemble field if ($url) { - $field.=$url."\n"; + $field.=$url."\n"; } - } + } $syllabus{$syl_field}=$field; - } + } } $syllabus{'uploaded.domain'}=$env{'user.domain'}; $syllabus{'uploaded.name'}=$env{'user.name'}; @@ -230,28 +229,60 @@ ENDSCRIPT } } -#---------------------Print External URL Syllabus Info +#--------Functions + if( ($allowed || $privileged) && $target ne 'tex') { + my $functions=&Apache::lonhtmlcommon::start_funclist(); + if ($allowed) { + #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) { + 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(); + $r->print(&Apache::loncommon::head_subbox($functions)); + } + +#---------------------Print External URL Syllabus Info and Help Text if( ($allowed) && ($target ne 'tex') ) { - my $protocol = $Apache::lonnet::protocol{$homeserver}; - $protocol = 'http' if ($protocol ne 'https'); + my $protocol = $Apache::lonnet::protocol{$homeserver}; + $protocol = 'http' if ($protocol ne 'https'); $r->print('

' .&mt('This syllabus can be publicly viewed at [_1]' ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'') .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') .'

' .'

' - .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Parameters[_2].' - ,'','') + .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].' + ,'','') .'

' ); + #-Print Help Text + $r->print(&Apache::loncommon::help_open_topic( + 'Uploaded_Templates_TextBoxes', + &mt('Help with filling in text boxes'))); } -#-Print Help Text - if ($target ne 'tex') { - 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')); @@ -260,177 +291,158 @@ ENDSCRIPT $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, $syllabus{'uploaded.domain'}); if ($target ne 'tex') { - $r->print('
'.&mt('Last updated').': '. - $lastmod . ' '. - ($who ? &mt('by').' '.$who + $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) { - $r->print(&Apache::lontemplate::start_functionslist()); - if ($allowed) { - $r->print(&Apache::lontemplate::item_functionslist( - ''.&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); - } elsif ($privileged) { - $r->print(&Apache::lontemplate::item_functionslist( - ''.&mt('Edit').'')); - } - $r->print(&Apache::lontemplate::end_functionslist()); - } + $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. + ($who? &mt('by').'\\\\ '. + &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) + :'') + .'\\\\'); } #----------------------------Print Headtitle if ($target ne 'tex') { - $r->print('

'.$courseenv{'description'}.'

'); - $r->print('

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

'); + $r->print('

'.$courseenv{'description'}.'

'); + $r->print('

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

'); } else { - $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. - &Apache::lonnet::domain($cdom,'description').'}\\\\'); + $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. + &Apache::lonnet::domain($cdom,'description').'}\\\\'); } # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); } else { - $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); + $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); } my @personnel=sort(keys(%coursepersonnel)); my $lastpers=$personnel[$#personnel]; foreach my $element (@personnel) { - if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::row_title($element)); - } else { - $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); - } + if ($target ne 'tex') { + $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') { + my ($puname,$pudom)=split(/\:/,$_); + if ($target ne 'tex') { 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); + $r->print(' '.$courseperson); } else { $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson, $puname,$pudom)); } - } else { - $r->print(' '.&Apache::loncommon::plainname($puname, + } else { + $r->print(' '.&Apache::loncommon::plainname($puname, $pudom).' '); - } - } - if ($target ne 'tex') { + } + } + if ($target ne 'tex') { my $lastclose=$element eq $lastpers?1:0; $r->print(&Apache::lonhtmlcommon::row_closure($lastclose)); - } else { - $r->print('\\\\ \hline'); - } + } else { + $r->print('\\\\ \hline'); + } } if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::end_pick_box()); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); } else { - $r->print('\end{tabular}\\\\'); + $r->print('\end{tabular}\\\\'); } # -------------------------------------------------------------- Announcements? my $day = &Apache::lonannounce::showday(time,2, - &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { - if ($allowed) { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); - $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 '') { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); - &Apache::lontemplate::print_end_template($r); - } + if ($allowed) { + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); + $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 '') { + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + &Apache::lontemplate::print_end_template($r); + } } else { - $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { - $r->print('
'. - ''); + $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 $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') { - if ($allowed) { - $r->print('

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

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

');} + 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 ($env{'form.backto'} eq 'coursecatalog') { @@ -438,9 +450,9 @@ ENDSCRIPT &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']). ''); } - $r->print(&Apache::loncommon::end_page()); + $r->print(&Apache::loncommon::end_page()); } else { - $r->print('\end{document}'); + $r->print('\end{document}'); } return OK; }