--- loncom/interface/lonsyllabus.pm 2009/09/02 12:39:26 1.94 +++ loncom/interface/lonsyllabus.pm 2012/12/03 23:53:03 1.114 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.94 2009/09/02 12:39:26 droeschl Exp $ +# $Id: lonsyllabus.pm,v 1.114 2012/12/03 23:53:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,15 +52,21 @@ sub handler { my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']); + ($ENV{'QUERY_STRING'},['register','forceedit']); # ----------------------------------------------------- Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); 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; + } elsif (!&Apache::lonnet::is_course($cdom,$cnum)) { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::loncommon::simple_error_page($r,'No syllabus available', + 'The course/community for which the syllabus was requested does not exist.'); + return OK; } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); @@ -74,14 +80,8 @@ sub handler { my $externalsyllabus=$courseenv{'externalsyllabus'}; if ($externalsyllabus=~/\w/) { - - if ($env{'form.wrapperdisplay'} eq 'menu') { - $r->print(&Apache::lonwrapper::simple_menu()); - } else { - $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", - $externalsyllabus)); - } - return OK; + $r->print( Apache::lonwrapper::wrapper($externalsyllabus) ); + return OK; } # ------------------------------ The buck stops here: internal syllabus display @@ -103,11 +103,11 @@ sub handler { 'kkk_textbook' => 'Textbook', 'lll_includeurl' => 'URLs To Include in Syllabus'); # --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; }; - my $forceedit=''; - if ($env{'form.forceedit'}) { $forceedit='edit'; } - + my ($forceedit,$forcestudent); + if ($env{'form.forceedit'}) { $forceedit=1; } + if (!$forceedit) { + $forcestudent=1; + } # ----------------------------------------------------------------- Make header if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); @@ -139,34 +139,39 @@ function getIndexByName(item) { ENDSCRIPT } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js, - {'function' => $forcestudent, - 'domain' => $cdom, - 'force_register' => - $env{'form.register'},}); - - $r->print($start_page); + my $forcereg; + if ($env{'form.register'}) { + $forcereg = 1; + } + my $brcrum = []; if ($env{'form.backto'} eq 'coursecatalog') { &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog()", - text=>"Course Catalog"}); + $brcrum = [{href=>"javascript:ToCatalog();", + text=>&mt('Course/Community Catalog'), + no_mt=>1} + ]; if ($env{'form.coursenum'} ne '') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog('details')", - text=>"Course details"}); + push(@{$brcrum}, + {href=>"javascript:ToCatalog('details')", + text=>"Course details"}); } - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>$r->uri, - text=>"Course syllabus"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs()); + push(@{$brcrum}, + {href=>$r->uri, + text=>"Course syllabus"}); + } + my $args = {'function' => undef, + 'domain' => $cdom, + 'force_register' => $forcereg,}; + if (@{$brcrum} > 0) { + $args->{'bread_crumbs'} = $brcrum; } + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); + $r->print($start_page); } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); my $allowed=0; - my $privileged=0; # This handler might be called anonymously ... # ----------------------------------------------------- Only if not public call @@ -176,12 +181,9 @@ ENDSCRIPT && $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'; - } 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 +192,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=''; @@ -229,71 +232,72 @@ ENDSCRIPT } } -#--------Functions - if( ($allowed || $privileged) && $target ne 'tex') { - my $functions=&Apache::lonhtmlcommon::start_funclist(); - - if ($allowed) { - $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( - '' - .&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'); - $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].' - ,'','') - .'

' - ); - #-Print Help Text - $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 - : '' ) . - '
' ); - + if ($allowed) { +#---------------------------------- Print External URL Syllabus Info if editing + if ($target ne 'tex') { + 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 Configuration[_2].' + ,'','') + .'

' + .'
'); + } } else { - $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. - ($who? &mt('by').'\\\\ '. - &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) - :'') - .'\\\\'); +#--------------------------------------------- Print last update unless editing + my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); + my $who; + if ($syllabus{'uploaded.lastmodified'}) { + if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) { + $who = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}); + } else { +# Public user? +# Only display name of user, but no link to personal information page + $who = &Apache::loncommon::plainname( + $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'}) + :'') + .'\\\\'); + } } -#----------------------------Print Headtitle + +#-------------------------------------------------------------- Print Headtitle if ($target ne 'tex') { - $r->print('

'.$courseenv{'description'}.'

'); - $r->print('

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

'); + $r->print('
'. + '

'.$courseenv{'description'}.'

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

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

'. + '
'); +# Print Help Text if editing at right side of screen + $r->print('
'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')). + '

'); + } else { + $r->print('

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

'); + } } else { $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. &Apache::lonnet::domain($cdom,'description').'}\\\\'); @@ -313,22 +317,24 @@ ENDSCRIPT } else { $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } + my @coursepersonlist; foreach (split(/\,/,$coursepersonnel{$element})) { 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); + push(@coursepersonlist,$courseperson); } else { - $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson, + push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson, $puname,$pudom)); } } else { - $r->print(' '.&Apache::loncommon::plainname($puname, + push(@coursepersonlist,&Apache::loncommon::plainname($puname, $pudom).' '); } } + $r->print(join(", ",@coursepersonlist)); if ($target ne 'tex') { my $lastclose=$element eq $lastpers?1:0; $r->print(&Apache::lonhtmlcommon::row_closure($lastclose)); @@ -346,13 +352,13 @@ ENDSCRIPT &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { if ($allowed) { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); + &Apache::lontemplate::print_start_template($r,&mt('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'); + &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box'); $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); &Apache::lontemplate::print_end_template($r); } @@ -363,78 +369,63 @@ ENDSCRIPT # ---------------------------------------------------------------- Get syllabus 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 $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_Box'); - } 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); - } - } - } + $r->print(''. + ''); } + 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 ); + &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)); + &Apache::lonhtmlcommon::htmlareaselectactive()); } - # 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') { + $r->print('
'); if ($env{'form.backto'} eq 'coursecatalog') { $r->print('
'. &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).