--- loncom/interface/lonsimplepage.pm 2003/09/09 19:39:04 1.12 +++ loncom/interface/lonsimplepage.pm 2005/06/06 02:29:46 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.12 2003/09/09 19:39:04 www Exp $ +# $Id: lonsimplepage.pm,v 1.26 2005/06/06 02:29:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,24 +34,36 @@ use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; +use Apache::lonlocal; +use Apache::lonprintout; +use Apache::lonxml; sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - + my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - $r->print(< + if ($target ne 'tex') { + my $html=&Apache::lonxml::xmlbegin(); + $r->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; + unless ($env{'request.course.id'}) { + if ($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; @@ -61,11 +73,11 @@ ENDDOCUMENT return OK; } - my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; - my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; # --------------------------------------------------------- The syllabus fields - my %syllabusfields=( + my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_title' => 'Page Title', 'bbb_content' => 'Content', 'ccc_webreferences' => 'Web References'); @@ -73,107 +85,164 @@ 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'}) { + if ($env{'form.register'}) { $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; $r->print(&Apache::lonmenu::registerurl(1)); } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($env{'form.forcestudent'} || $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 ($target ne 'tex') { + $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). + ''.&Apache::loncommon::bodytag + ("Course Page",$forcestudent,$addentries,'',$dom,$env{'form.register'})); + } - my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + 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.uploaddoc.filename'}) && - ($ENV{'form.storeupl'}) && ($allowed)) { - if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1); - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); - } - if (($allowed) && ($ENV{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$_}=$field; - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); - } + if ($forcestudent or $target eq 'tex') { $allowed=0; } + + 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 and $target ne 'tex') { + $r->print(''.&mt('Edit').''); + } + if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && + ($env{'form.storeupl'}) && ($allowed)) { + if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + 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); + } + if (($allowed) && ($env{'form.storesyl'})) { + foreach (keys %syllabusfields) { + my $field=$env{'form.'.$_}; + chomp($field); + $field=~s/\s+$//s; + $field=~s/^\s+//s; + $field=~s/\$//s; + $field=&Apache::lonfeedback::clear_out_html($field,1); + $syllabus{$_}=$field; + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); + } # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - if ($syllabus{'uploaded.photourl'}) { - $r->print(''); - } - if ($allowed) { - $r->print( - '
'. - '

Upload a Photo

'. - ''. - ''. - '
'); - } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; - $message=~s/\n/\
/g; - $message - =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($_ eq 'aaa_title') { - if (($_ ne 'bbb_content') || ($allowed)) { - $r->print('

'.$syllabusfields{$_}.'

'); + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::allowuploaded('/adm/smppg', + $syllabus{'uploaded.photourl'}); + + my $image=''; + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); + } + $r->print($image); + } + if ($allowed) { + $r->print( + ''. + ''. + '

Upload a Photo

'. + ''. + ''. + '
'); + } + foreach (sort keys %syllabusfields) { + if (($syllabus{$_}) || ($allowed)) { + my $message=$syllabus{$_}; + &Apache::lonfeedback::newline_to_br(\$message); + $message + =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + $message=&Apache::lontexconvert::msgtexconverted($message); + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } + unless ($_ eq 'aaa_title') { + if (($_ ne 'bbb_content') || ($allowed)) { + if ($target ne 'tex') { + $r->print('

'.$syllabusfields{$_}.'

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

'.$syllabusfields{$_}.'

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

'.$message.'

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

'.$message.'

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

'.$message.'

'); - if ($allowed) { - $r->print( - '
Title
'); - } - } - } - } - if ($allowed) { - $r->print(''); - } - $r->print('

'); + } + } + if ($allowed && ($env{'form.grade_target'} ne 'tex')) { + $r->print(&Apache::lonhtmlcommon::htmlareaselectactive + ('bbb_content').''); + } + if ($env{'form.grade_target'} ne 'tex') {$r->print('

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

No page information provided.

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

No page information provided.

'); + $r->print('\end{document}'); } - $r->print(''); return OK; }