--- loncom/interface/lonsimplepage.pm 2003/09/17 19:45:39 1.13 +++ loncom/interface/lonsimplepage.pm 2004/04/30 23:13:52 1.17 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.13 2003/09/17 19:45:39 www Exp $ +# $Id: lonsimplepage.pm,v 1.17 2004/04/30 23:13:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,8 @@ use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonlocal; +use Apache::lonprintout; +use Apache::lonxml; sub handler { my $r = shift; @@ -43,16 +45,24 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ 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'}) { - $r->print('Not in a course'); - return OK; + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print('Not in a course'); + return OK; + } else { + $r->print('\textbf{Not in a course}\end{document}'); + } } $marker=~s/\D//g; @@ -74,7 +84,7 @@ ENDDOCUMENT # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register']); + ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']); # ----------------------------------------------------- Force menu registration my $addentries=''; if ($ENV{'form.register'}) { @@ -84,30 +94,45 @@ ENDDOCUMENT } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($ENV{'form.forcestudent'} ||$ENV{'form.grade_target'} eq 'tex' ) { $forcestudent='student'; }; + my $forceedit=''; + if ($ENV{'form.forceedit'}) { $forceedit='edit'; } my %syllabus=&Apache::lonnet::dump('smppage_'.$marker,$dom,$crs); # --------------------------------------- There is such a user, get environment - $r->print(''.&Apache::loncommon::bodytag - ("Course Page",$forcestudent,$addentries,'',$dom,$ENV{'form.register'})); + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print(''.&Apache::loncommon::bodytag + ("Course Page",$forcestudent,$addentries,'',$dom,$ENV{'form.register'})); + } my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + my $privileged=$allowed; + if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { + $forcestudent='student'; + } if ($forcestudent) { $allowed=0; } - if ($allowed) { - $r->print('

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

'); - } + if ($ENV{'form.grade_target'} ne 'tex') { + 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) { + $r->print(''.&mt('Edit').''); + } + } 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,'simplepage'); } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); @@ -126,13 +151,17 @@ ENDDOCUMENT # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($syllabus{'uploaded.photourl'}) { - $r->print(''); + if ($ENV{'form.grade_target'} ne 'tex') { + &Apache::lonnet::allowuploaded('/adm/smppg', + $syllabus{'uploaded.photourl'}); + $r->print(''); + } } - if ($allowed) { + if ($allowed && ($ENV{'form.grade_target'} ne 'tex')) { $r->print( '
'. + ''. '

Upload a Photo

'. ''. ''. @@ -147,34 +176,63 @@ ENDDOCUMENT $message=&Apache::lontexconvert::msgtexconverted($message); unless ($_ eq 'aaa_title') { if (($_ ne 'bbb_content') || ($allowed)) { - $r->print('

'.$syllabusfields{$_}.'

'); + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print('

'.$syllabusfields{$_}.'

'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$_}.'

')); + } + } + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print('
'. + $message.'
'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); } - $r->print('
'. - $message.'
'); if ($allowed) { - $r->print('
'); + ''); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + } } } else { - $r->print('

'.$message.'

'); + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print('

'.$message.'

'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); + } if ($allowed) { - $r->print( - '
Title
'); + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print( + '
Title
'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + } } } } } - if ($allowed) { + if ($allowed && ($ENV{'form.grade_target'} ne 'tex')) { $r->print('
'); } - $r->print('

'); + if ($ENV{'form.grade_target'} ne 'tex') {$r->print('

');} } else { $r->print('

No page information provided.

'); } - $r->print(''); + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print(''); + } else { + $r->print('\end{document}'); + } return OK; }