--- loncom/interface/lonsyllabus.pm 2008/10/22 08:56:35 1.68 +++ loncom/interface/lonsyllabus.pm 2008/12/16 20:00:11 1.73 @@ -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.73 2008/12/16 20:00:11 ehlerst 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'); } @@ -236,16 +240,15 @@ ENDSCRIPT if ($forcestudent or $target eq 'tex') { $allowed=0; } } if ($allowed) { - $r->print('
'. + $r->print('
'. +&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). + '
'. &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&mt('This syllabus can be publicly viewed at') .' http://'. &Apache::lonnet::hostname($homeserver).$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'
'. - ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'. - ''. -&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). - '
'); + ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'); } elsif ($privileged) { if ($target ne 'tex') { $r->print(''.
@@ -324,7 +327,9 @@ ENDSCRIPT
'');
}
my @htmlids=();
- foreach my $field (sort(keys(%syllabusfields))) {
+ &Apache::lontemplate::start_columnSection($r);
+ &Apache::lontemplate::start_ContentBox($r, $allowed);
+ foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}=~/\w/) || ($allowed)) {
my $message=$syllabus{$field};
if ($field eq 'lll_includeurl') { # this is the "included" field
@@ -350,9 +355,7 @@ ENDSCRIPT
}
if ($allowed) {
$r->print(' '.&mt('Show Public View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').' '.&mt('Show Public View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').''.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'
'.
- ''.$syllabusfields{$field}.'
'.
- $message.'
');
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
+
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -373,12 +376,16 @@ ENDSCRIPT
push(@htmlids,$field);
}
if ($allowed) {
- $r->print('
');
+ &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
}
}
}
+ if ($allowed) {
+ $r->print('