--- rat/lonpage.pm 2006/04/04 19:54:51 1.74
+++ rat/lonpage.pm 2007/05/23 17:04:57 1.79
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.74 2006/04/04 19:54:51 albertel Exp $
+# $Id: lonpage.pm,v 1.79 2007/05/23 17:04:57 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;
@@ -267,7 +270,7 @@ sub handler {
}
}
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}//;
@@ -408,6 +411,10 @@ sub handler {
} else {
$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') {
@@ -426,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'})) &&
@@ -446,21 +453,21 @@ sub handler {
'___'.$resid.'___'.
&Apache::lonnet::declutter($hash{'src_'.$rid});
$metainfo.=
- ''.
'&command=submission">'.
- ''.
- ''.
- ''.
+ ''.
+ ''.
'&command=gradingmenu">'.
- ''.
- ''.
- ''.
+ ''.
+ ''.
'" >'.
- ''.
- '';
+ ''.
+ '';
}
$metainfo.='
';
unless ($target eq 'tex') {
@@ -497,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.'');
@@ -539,7 +544,8 @@ sub handler {
(($nforms>1)?'submit':'hidden').'">');
}
unless ($target eq 'tex') {
- $r->print(&Apache::loncommon::end_page());
+ $r->print(&Apache::loncommon::end_page({'discussion'
+ => 1,}));
} else {
$r->print('\end{document}'.$number_of_columns);
}