--- loncom/interface/lonsyllabus.pm 2008/12/24 08:10:09 1.69.2.1 +++ loncom/interface/lonsyllabus.pm 2009/02/19 17:32:39 1.77 @@ -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.77 2009/02/19 17:32:39 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,22 +242,12 @@ ENDSCRIPT if ($allowed) { my $protocol = $Apache::lonnet::protocol{$homeserver}; $protocol = 'http' if ($protocol ne 'https'); - $r->print('

'. -&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

'.&mt('This syllabus can be publicly viewed at') + $r->print('

'.&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'). - '

'); - } elsif ($privileged) { - if ($target ne 'tex') { - $r->print('

'. - &mt('Edit').''); - } - } + '

'.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'

'); + } if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; @@ -324,12 +315,25 @@ ENDSCRIPT :'') .'\\\\'); } + + if ($target ne 'tex') { + &Apache::lontemplate::print_start_page_functions($r); + if($allowed){ + &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); + }elsif($privileged){ + &Apache::lontemplate::print_functions_content($r,''.&mt('Edit').''); + } + &Apache::lontemplate::print_end_page_functions($r); + } + if ($allowed) { $r->print('
'. ''); } my @htmlids=(); - foreach my $field (sort(keys(%syllabusfields))) { + + 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 +359,7 @@ ENDSCRIPT } if ($allowed) { $r->print('

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

'. - '

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

'); + &Apache::loncommon::help_open_topic('Syllabus_URLs').''); } else { $r->print($message); } @@ -369,8 +371,10 @@ ENDSCRIPT } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'. - $message.'
'); + if($allowed){ + $r->print('

'); + } + &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 +382,14 @@ ENDSCRIPT push(@htmlids,$field); } if ($allowed) { - $r->print('
'); + if($target ne 'tex'){ + $r->print('

'); + } + &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); } } - } + } + if ($allowed) { $r->print('
'. &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));