--- loncom/interface/lonbulletin.pm 2004/02/13 15:01:29 1.19 +++ loncom/interface/lonbulletin.pm 2004/05/10 14:10:03 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network # Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.19 2004/02/13 15:01:29 www Exp $ +# $Id: lonbulletin.pm,v 1.23 2004/05/10 14:10:03 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,13 +41,21 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; + my $target=$ENV{'form.grade_target'}; + &Apache::lonnet::logthis("MY TARGET IS DEFINED AS $target"); + +# &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']); # ------------------------------------------------------------ Print the screen - $r->print(<print(< The LearningOnline Network with CAPA ENDDOCUMENT +} else { + $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + } my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri); # Is this even in a course? unless ($ENV{'request.course.id'}) { @@ -91,11 +99,11 @@ ENDDOCUMENT my %syllabus=&Apache::lonnet::dump('bulletinpage_'.$marker,$dom,$crs); # --------------------------------------- There is such a user, get environment - - $r->print(''.&Apache::loncommon::bodytag - ("Bulletin Board/Discussion",$forcestudent,$addentries,'',$dom, - $ENV{'form.register'})); - + if ($target ne 'tex') { + $r->print(''.&Apache::loncommon::bodytag + ("Bulletin Board/Discussion",$forcestudent,$addentries,'',$dom, + $ENV{'form.register'})); + } my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); my $privileged=$allowed; @@ -103,14 +111,14 @@ ENDDOCUMENT $forcestudent='student'; } - if ($forcestudent) { $allowed=0; } + if ($forcestudent or $target eq 'tex') { $allowed=0; } - if ($allowed) { + if ($allowed) { $r->print( '

'. &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('Show Student View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } elsif ($privileged) { + } elsif ($privileged and $target ne 'tex') { $r->print('' .&mt('Edit').''); } @@ -118,8 +126,11 @@ ENDDOCUMENT if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.storeupl'}) && ($allowed)) { if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1); + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',1,'bulletin'); } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); @@ -138,9 +149,10 @@ ENDDOCUMENT # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($syllabus{'uploaded.photourl'}) { - $r->print(''); + &Apache::lonnet::allowuploaded('/adm/syllabus', + $syllabus{'uploaded.photourl'}); + $r->print(''); } if ($allowed) { $r->print( @@ -160,17 +172,29 @@ ENDDOCUMENT $message=&Apache::lontexconvert::msgtexconverted($message); unless ($_ eq 'aaa_title') { if (($_ ne 'bbb_content') || ($allowed)) { - $r->print('

'.$syllabusfields{$_}.'

'); + if ($target ne 'tex') { + $r->print('

'.$syllabusfields{$_}.'

'); + } else { + $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'); + } + } + if ($target ne 'tex') { + $r->print('
'. + $message.'
'); + } else { + $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$message).' '); } - $r->print('
'. - $message.'
'); if ($allowed) { $r->print('
'); } } else { - $r->print('

'.$message.'

'); + if ($target ne 'tex') { + $r->print('

'.$message.'

'); + } else { + $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$message).'}\\\\'); + } if ($allowed) { $r->print( '
'.&mt('Topic').'