--- rat/lonpage.pm 2006/01/11 09:13:15 1.73
+++ rat/lonpage.pm 2007/05/22 00:26:31 1.77
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.73 2006/01/11 09:13:15 albertel Exp $
+# $Id: lonpage.pm,v 1.77 2007/05/22 00:26:31 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}//;
@@ -360,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
@@ -378,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(''.
+ $metainfo =''.
''.
'
'.
'';
}
$metainfo .= ''.
'
'.
'';
@@ -463,17 +449,17 @@ sub handler {
'___'.$resid.'___'.
&Apache::lonnet::declutter($hash{'src_'.$rid});
$metainfo.=
- ''.
'&command=submission">'.
'
'.
''.
- ''.
'&command=gradingmenu">'.
'
'.
''.
- ''.
'" >'.
'
'.
@@ -514,13 +500,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.'');
@@ -556,7 +540,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);
}