--- rat/lonpage.pm 2005/04/07 06:56:27 1.70 +++ rat/lonpage.pm 2007/06/22 21:24:54 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.70 2005/04/07 06:56:27 albertel Exp $ +# $Id: lonpage.pm,v 1.80 2007/06/22 21:24:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,9 @@ use Apache::lonmenu; use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # -------------------------------------------------------------- Module Globals my %hash; @@ -180,8 +183,10 @@ sub handler { for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { my @colcont=split(/\&/,$rows[$i]); - foreach (@colcont) { - $symbhash{$hash{'src_'.$_}}=['page','notasymb']; + foreach my $rid (@colcont) { + my ($mapid,$resid)=split(/\./,$rid); + $symbhash{$hash{'src_'.$rid}}= + [$hash{'src_'.$rid},$resid]; } } } @@ -235,6 +240,7 @@ sub handler { my $prefix=$_.'_'; my %posthash=('request.prefix' => $prefix, + 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); if ($env{'form.grade_target'} eq 'tex') { $posthash{'grade_target'}=$env{'form.grade_target'}; @@ -243,18 +249,28 @@ sub handler { $posthash{'latex_type'}=$env{'form.latex_type'}; $posthash{'rndseed'}=$env{'form.rndseed'}; } - if (($env{'form.'.$prefix.'submit'}) - || ($env{'form.all_submit'})) { - foreach (keys %env) { - if ($_=~/^form.$prefix/) { - my $name=$_; - $name=~s/^form.$prefix//; - $posthash{$name}=$env{$_}; - } - } + my $submitted=exists($env{'form.all_submit'}); + if (!$submitted) { + foreach my $key (keys(%env)) { + if ($key=~/^form.\Q$prefix\Esubmit_/) { + $submitted=1;last; + } + } + } + if ($submitted) { + foreach my $key (keys(%env)) { + if ($key=~/^form.\Q$prefix\E/) { + my $name=$key; + $name=~s/^form.\Q$prefix\E//; + $posthash{$name}=$env{$key}; + } + } + if (exists($env{'form.all_submit'})) { + $posthash{'all_submit'}='yes'; + } } my $output=Apache::lonnet::ssi($src,%posthash); - $output=~s|//(\s*)?\s||gs; + $output=~s|//(\s*)?\s||gs; if ($target eq 'tex') { $output =~ s/^([^&]+)\\begin{document}//; $output =~ s/\\end{document}//; @@ -322,7 +338,7 @@ sub handler { $output=~s/\]*\>//gsi; $output=~s/\<\/form[^\>]*\>//gsi; $output=~ - s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([\w\.\:]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; + s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; } $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { @@ -347,17 +363,11 @@ sub handler { unless ($contents) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(''."\n". - ''."\n". - &Apache::lonmenu::registerurl(1,undef)."\n". - ''."\n". - ''. - &Apache::lonmenu::menubuttons(undef,$target,1) - ); + $r->print(&Apache::loncommon::start_page(undef,undef, + {'force_register' => 1,})); $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); - $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').'.'); + $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course'). + &Apache::loncommon::end_page()); } else { # ------------------------------------------------------------------ Build page @@ -365,31 +375,20 @@ sub handler { unless ($target eq 'tex') { if ($isxml) { &Apache::loncommon::content_type($r,'text/xml'); - $r->send_http_header; - $r->print($xmlheader); } else { &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(''); } + $r->send_http_header; # ------------------------------------------------------------------------ Head - $r->print("\n\n".$allmeta); if ($allscript) { - $r->print("\n\n"); + $allscript .= + "\n\n"; } - $r->print(&Apache::lonmenu::registerurl(1,undef)); - $r->print("\n\n"); # ------------------------------------------------------------------ Start body - if ($isxml) { - $r->print($xmlbody); - } else { - $r->print( - ''. - &Apache::lonmenu::menubuttons(undef,$target,1) - ); - } + $r->print(&Apache::loncommon::start_page(undef,undef, + {'force_register' => 1, + 'bgcolor' => '#ffffff',})); # ------------------------------------------------------------------ Start form if ($nforms) { $r->print('
'); } +# which icons do we use? + my $extension='png'; + if ($env{'environment.icons'} eq 'classic') { $extension='gif'; } +# generate rows for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { unless ($target eq 'tex') { @@ -430,16 +433,16 @@ sub handler { $esrc=&Apache::lonenc::encrypted($esrc); } unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { - $metainfo =''. + $metainfo =''. ''. - ''. - ''; + ''. + ''; } $metainfo .= ''. - ''. - ''; + ''. + ''; if ( ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && @@ -450,21 +453,21 @@ sub handler { '___'.$resid.'___'. &Apache::lonnet::declutter($hash{'src_'.$rid}); $metainfo.= - ''. '&command=submission">'. - ''. - ''. - ''. + ''. + ''. '&command=gradingmenu">'. - ''. - ''. - ''. + ''. + ''. '" >'. - ''. - ''; + ''. + ''; } $metainfo.='

'; unless ($target eq 'tex') { @@ -501,13 +504,11 @@ sub handler { '.pageseparators'} eq 'yes') { unless($target eq 'tex') { $r->print('
'); - } else { - $r->print('\hline'); - } + } } } elsif ($cellemb{$rid} eq 'img') { $r->print('>'.$metainfo.''); + $hash{'src_'.$rid}.'" />'); } elsif ($cellemb{$rid} eq 'emb') { $r->print('>'.$metainfo.''); @@ -543,7 +544,8 @@ sub handler { (($nforms>1)?'submit':'hidden').'">
'); } unless ($target eq 'tex') { - $r->print(''.&Apache::lonxml::xmlend()); + $r->print(&Apache::loncommon::end_page({'discussion' + => 1,})); } else { $r->print('\end{document}'.$number_of_columns); }