--- loncom/interface/lonsyllabus.pm 2008/11/07 18:06:19 1.69 +++ loncom/interface/lonsyllabus.pm 2008/12/16 10:03:56 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.69 2008/11/07 18:06:19 bisitz Exp $ +# $Id: lonsyllabus.pm,v 1.72 2008/12/16 10:03:56 schualex Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,6 +29,7 @@ package Apache::lonsyllabus; use strict; +use Apache::lontemplate; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; @@ -183,7 +184,7 @@ ENDSCRIPT } else { $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); } - my @personnel=sort keys %coursepersonnel; + my @personnel=sort(keys(%coursepersonnel)); my $lastpers=$personnel[$#personnel]; foreach my $element (@personnel) { if ($target ne 'tex') { @@ -353,8 +354,8 @@ ENDSCRIPT } if ($allowed) { $r->print('

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

'. - '

'.&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Syllabus_URLs').''. + '

'.&mt('Show Public View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } else { $r->print($message); @@ -366,9 +367,19 @@ ENDSCRIPT $message=&Apache::lonspeller::markeduptext($message); } $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'. - $message.'
'); + + &Apache::lontemplate::start_columnSection($r); + &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + + if ($target ne 'tex') { + &Apache::lontemplate::start_ContentBox($r); + &Apache::lontemplate::end_ContentBox($r); + &Apache::lontemplate::end_columnSection($r); + &Apache::lontemplate::start_columnSection($r); + &Apache::lontemplate::start_ContentBox($r); + &Apache::lontemplate::end_ContentBox($r); + &Apache::lontemplate::end_columnSection($r); + } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); @@ -376,9 +387,10 @@ ENDSCRIPT push(@htmlids,$field); } if ($allowed) { - $r->print('
'); + &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); +# $r->print('
'); } } }