--- loncom/interface/lonsyllabus.pm 2008/07/15 19:50:39 1.65 +++ loncom/interface/lonsyllabus.pm 2008/12/17 00:44:53 1.74 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.65 2008/07/15 19:50:39 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.74 2008/12/17 00:44:53 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; @@ -179,14 +180,15 @@ ENDSCRIPT # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { - $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); } 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::loncommon::start_data_table_row(). - '
'. + $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(''.
@@ -325,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
@@ -351,9 +355,7 @@ ENDSCRIPT
}
if ($allowed) {
$r->print(' '.&mt('Show Public View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').' ');
+ }
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -374,12 +378,19 @@ ENDSCRIPT
push(@htmlids,$field);
}
if ($allowed) {
- $r->print(' '.&mt('Show Public View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').''.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'
'.
- ''.$syllabusfields{$field}.'
'.
- $message.'
');
+ if($allowed){
+ $r->print('
');
+ if($target ne 'tex'){
+ $r->print('