--- loncom/interface/lonsimplepage.pm 2010/01/07 14:45:08 1.92 +++ loncom/interface/lonsimplepage.pm 2010/01/31 06:03:55 1.93 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.92 2010/01/07 14:45:08 wenzelju Exp $ +# $Id: lonsimplepage.pm,v 1.93 2010/01/31 06:03:55 faziophi Exp $ # # Copyright Michigan State University Board of Trustees # @@ -361,59 +361,26 @@ sub handler { else { $r->print($image); } - - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed) || - ($field eq 'abb_links' && $group ne '')) { - my $message=$syllabus{$field}; - if (!&Apache::lonfeedback::contains_block_html($message)) { - &Apache::lonfeedback::newline_to_br(\$message); - } - $message=~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - if ($target ne 'tex') { - $message=&Apache::lontexconvert::msgtexconverted($message); - } - if ($field eq 'abb_links' && $group ne '') { - $r->print('
'); - &display_group_links($r,$target,$group,'edit',$refarg, - %groupinfo); - $r->print('
'); - } elsif ($field eq 'aaa_title') { - next; - } else { - if ($target ne 'tex') { - if ($allowed) { - } else { - &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); - } - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); - $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); - } - if ($allowed) { - if ($target ne 'tex') { - #output of syllabusfields will be generated here. - &Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box'); - $r->print($message); - $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 { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); - } - } - } - } - } + + my $links_handler = sub { + my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_; + if ($group ne '') { + my %data = %{$data_ref}; + my %fields = %{$fields_ref}; + $r->print('
'); + &display_group_links($r, $target, $group, 'edit', $refarg, %groupinfo); + $r->print('
'); + } + }; + my $title_handler = sub {}; + my %custom_handlers = ( + 'abb_links' => $links_handler, + 'aaa_title' => $title_handler + ); + &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, + $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_handlers, $group); + if ($allowed && ($env{'form.grade_target'} ne 'tex')) { $r->print(&Apache::lonhtmlcommon::htmlareaselectactive ('bbb_content').'');