--- loncom/interface/lontemplate.pm 2008/12/17 14:56:51 1.13 +++ loncom/interface/lontemplate.pm 2012/05/15 22:52:56 1.45.6.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.13 2008/12/17 14:56:51 harmsja Exp $ +# $Id: lontemplate.pm,v 1.45.6.2 2012/05/15 22:52:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,11 +26,11 @@ # http://www.lon-capa.org/ # - package Apache::lontemplate; use strict; +use utf8; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; @@ -43,94 +43,157 @@ use Apache::lonlocal; use Apache::lonmsgdisplay(); use HTML::Entities(); +use constant { + RICH_TEXT_ALWAYS_ON => 'LC_richAlwaysOn', + RICH_TEXT_ALWAYS_OFF => 'LC_richAlwaysOff', + RICH_TEXT_DEFAULT_ON => 'LC_richDefaultOn', + RICH_TEXT_DETECT_HTML => 'LC_richDetectHtml', + RICH_TEXT_DEFAULT_OFF => 'LC_richDefaultOff' +}; -sub start_columnSection{ +sub start_columnSection { my ($r) = @_; $r->print('
'); } -sub end_columnSection{ +sub end_columnSection { my ($r) = @_; $r->print('
'); } -sub print_content_template{ +sub print_aboutme_content_template { my ($r,$allowed,$target,$syllabusfields_ref,$syllabus_ref) = @_; my %syllabusfields = %{$syllabusfields_ref}; my %syllabus = %{$syllabus_ref}; - &start_ContentBox($r,$allowed); + foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if (!&Apache::lonfeedback::contains_block_html($message)) { + &Apache::lonfeedback::newline_to_br(\$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') { - if($allowed){ - $r->print('

'); - } - &print_template($r,$syllabusfields{$field},$message,$allowed); + if($field eq 'aaa_contactinfo') { + $r->print('

 
'); + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); + } else { + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); + } + if($allowed) { + &print_editbox_template($r,$syllabus{$field},$field); + } + } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } - if ($allowed) { - &print_editbox_template($r,$syllabus{$field},$field); - if($target ne 'tex'){ - $r->print('

'); - } - } } } - &end_ContentBox($r); -} -sub start_ContentBox{ - my ($r,$allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } } -sub end_ContentBox{ - my ($r) = @_; - $r->print('
'); +sub send_message { + my ($r,$cnum,$cdom) = @_; + my $linktext = &mt('Send message to [_1]', + &Apache::loncommon::plainname($cnum,$cdom)); + my $image = qq{Send message symbol}; + return &Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper($linktext,$cnum,$cdom); } -sub send_message{ - my ($r,$cnum,$cdom) = @_; - my $image = qq{}; - $r->print('
'); - $r->print(&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&mt('Send me a message')); +sub print_template { + my ($r,$topic,$content, $allowed,$boxclass) = @_; + $r->print('
'); + $r->print('

'.$topic.'

'); + $r->print($content); $r->print('
'); } -sub print_template -{ - my ($r,$topic,$content, $allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } +sub print_start_template { + my ($r,$topic,$boxclass) = @_; + $r->print('
'); $r->print('

'.$topic.'

'); - $r->print('
'.$content.'
'); +} + +sub print_end_template { + my ($r) = @_; $r->print('
'); } -sub print_editbox_template -{ +sub print_editbox_template { my ($r,$content,$field) = @_; $r->print(''); } +sub print_textarea_template { + my ($r, $content, $field, $wysiwyg) = @_; + $r->print('
'); +} + +sub print_saveall_template { + my ($r) = @_; + $r->print(''); +} + +sub print_template_fields { + my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_; + my @html_ids = (); + my %data = %{$data_ref}; + my %fields = %{$fields_ref}; + my %custom_handlers = %{$custom_handlers_ref}; + + foreach my $field (sort(keys(%fields))) { + my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed)); + if ((%custom_handlers) && ($custom_handlers{$field})) { + $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed); + } else { + if (($data{$field}=~/\w/) || ($allowed)) { + 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,$fields{$field},'LC_Box'); + $r->print($message); + if ($allowed) { + $r->print("
"); + &Apache::lontemplate::print_textarea_template($r, $data{$field}, + $field, $default_rich_text); + &Apache::lontemplate::print_saveall_template($r); + $r->print("
"); + } + &Apache::lontemplate::print_end_template($r); + } else { + my $safeinit; + if ($fields{$field}=~/\w/) { + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$fields{$field}.'

')); + } else { + $r->print(&Apache::lonxml::xmlparse($r,'tex','
')); + } + $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); + } + push(@html_ids,$field); + } + } + } + + return @html_ids; +} + 1;