--- loncom/interface/lonsyllabus.pm 2008/12/24 08:10:09 1.69.2.1 +++ loncom/interface/lonsyllabus.pm 2009/02/13 17:26:55 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.69.2.1 2008/12/24 08:10:09 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.76 2009/02/13 17:26:55 neumanie 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') { @@ -241,16 +242,15 @@ ENDSCRIPT if ($allowed) { my $protocol = $Apache::lonnet::protocol{$homeserver}; $protocol = 'http' if ($protocol ne 'https'); - $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') .' '.$protocol.'://'. &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(''.
@@ -329,7 +329,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
@@ -355,9 +357,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,$allowed,'LC_ContentBoxSpecial');
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -378,12 +380,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('