--- loncom/interface/lonsyllabus.pm 2008/10/22 08:56:35 1.68 +++ loncom/interface/lonsyllabus.pm 2008/12/12 17:02:47 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.68 2008/10/22 08:56:35 bisitz Exp $ +# $Id: lonsyllabus.pm,v 1.71 2008/12/12 17:02:47 raeburn 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,9 @@ ENDSCRIPT } else { $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); } - foreach my $element (sort keys %coursepersonnel) { + my @personnel=sort(keys(%coursepersonnel)); + my $lastpers=$personnel[$#personnel]; + foreach my $element (@personnel) { if ($target ne 'tex') { $r->print(&Apache::lonhtmlcommon::row_title($element)); } else { @@ -206,7 +209,8 @@ ENDSCRIPT } } if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::row_closure()); + my $lastclose=$element eq $lastpers?1:0; + $r->print(&Apache::lonhtmlcommon::row_closure($lastclose)); } else { $r->print('\\\\ \hline'); } @@ -350,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); @@ -364,8 +368,9 @@ ENDSCRIPT } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

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

'.$syllabusfields{$field}.'

'. +# $message.'
'); } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); @@ -373,9 +378,10 @@ ENDSCRIPT push(@htmlids,$field); } if ($allowed) { - $r->print('
'); + &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); +# $r->print('
'); } } }