--- loncom/interface/lonsyllabus.pm 2009/05/19 10:07:54 1.91 +++ loncom/interface/lonsyllabus.pm 2010/01/28 17:22:34 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.91 2009/05/19 10:07:54 amueller Exp $ +# $Id: lonsyllabus.pm,v 1.105 2010/01/28 17:22:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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')", @@ -162,7 +162,6 @@ ENDSCRIPT text=>"Course syllabus"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs()); } - } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); @@ -183,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}; @@ -191,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=''; @@ -230,7 +231,41 @@ 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'); @@ -240,18 +275,16 @@ ENDSCRIPT .' '.&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')); @@ -273,21 +306,6 @@ ENDSCRIPT :'') .'\\\\'); } -#--------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()); - } - } #----------------------------Print Headtitle if ($target ne 'tex') { $r->print('

'.$courseenv{'description'}.'

'); @@ -344,13 +362,13 @@ ENDSCRIPT &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { if ($allowed) { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); + &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_ContentBoxSpecial'); + &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); } @@ -361,7 +379,7 @@ ENDSCRIPT # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { - $r->print('
'. + $r->print(''. ''); } my @htmlids=(); @@ -391,35 +409,50 @@ ENDSCRIPT } } if ($allowed) { - $r->print('

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

'); + &Apache::lonfeedback::newline_to_br(\$urls); + &Apache::lontemplate::print_start_template($r,$syllabusfields{$field}. + &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box'); + $r->print($urls); + $r->print("
"); + &Apache::lontemplate::print_textarea_template($r, $syllabus{$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); } } else { - &Apache::lonfeedback::newline_to_br(\$message); - $message =~s|(https?\://[^\s]+)|$1|g; + if (!&Apache::lonfeedback::contains_block_html($message)) { + &Apache::lonfeedback::newline_to_br(\$message); + } else { + $message = &Apache::lonfeedback::tidy_html($message); + } + $message=&Apache::lonhtmlcommon::raw_href_to_link($message); + if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { + #output of syllabusfields will be generated here. + &Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box'); + $r->print($message); if ($allowed) { - $r->print('

'); - } - &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial'); + $r->print("

"); + &Apache::lontemplate::print_textarea_template($r, $syllabus{$field}, + $field, Apache::lontemplate->RICH_TEXT_DETECT_HTML); + &Apache::lontemplate::print_saveall_template($r); + $r->print("
"); + } + &Apache::lontemplate::print_end_template($r); } 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); - } - } } } if ($allowed) {