[LON-CAPA-cvs] cvs: rat / lonambiguous.pm lonpageflip.pm lonwrapper.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Sun, 19 Mar 2006 23:06:04 -0000
albertel Sun Mar 19 18:06:04 2006 EDT
Modified files:
/rat lonambiguous.pm lonpageflip.pm lonwrapper.pm
Log:
- start_page
Index: rat/lonambiguous.pm
diff -u rat/lonambiguous.pm:1.17 rat/lonambiguous.pm:1.18
--- rat/lonambiguous.pm:1.17 Tue Feb 7 14:46:08 2006
+++ rat/lonambiguous.pm Sun Mar 19 18:06:00 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to resolve ambiguous file locations
#
-# $Id: lonambiguous.pm,v 1.17 2006/02/07 19:46:08 albertel Exp $
+# $Id: lonambiguous.pm,v 1.18 2006/03/19 23:06:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,11 +54,9 @@
$errmsg=&mt($errmsg);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(
- '<head><title>Unknown Error</title></head>'.
- &Apache::loncommon::bodytag('Could not handle ambiguous resource reference').
- $errmsg.
- '</body></html>');
+ $r->print(&Apache::loncommon::start_page('Could not handle ambiguous resource reference').
+ $errmsg.
+ (&Apache::loncommon::end_page());
}
# ================================================================ Main Handler
@@ -189,11 +187,10 @@
# ----------------------------------------------- Okay, really multiple choices
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $bodytag=
- &Apache::loncommon::bodytag('Pick Instance of Resource');
+ my $start_page=
+ &Apache::loncommon::start_page('Pick Instance of Resource');
$r->print(<<ENDSTART);
-<head><title>Choose Location</title></head>
-$bodytag
+$start_page
The resource you had been accessing appears more than once in this course,
and LON-CAPA has insufficient session information to determine which instance
of the resource you meant.
@@ -213,7 +210,7 @@
&Apache::lonnet::gettitle($mapurl).' '.
'</td></tr>');
} @possibilities;
- $r->print('</table></body></html>');
+ $r->print('</table>'.&Apache::loncommon::end_page());
untie(%bighash);
return OK;
}
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.66 rat/lonpageflip.pm:1.67
--- rat/lonpageflip.pm:1.66 Mon Mar 6 18:41:07 2006
+++ rat/lonpageflip.pm Sun Mar 19 18:06:00 2006
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.66 2006/03/06 23:41:07 albertel Exp $
+# $Id: lonpageflip.pm,v 1.67 2006/03/19 23:06:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -207,10 +207,7 @@
&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $html=&Apache::lonxml::xmlbegin();
- $r->print("$html<head>\n");
- $r->print('</head>'.
- &Apache::loncommon::bodytag('Launched'));
+ $r->print(&Apache::loncommon::start_page('Launched'));
$r->print(<<ENDNAV);
<p><a href="/adm/flip?postdata=firstres%3a">Goto first resource</a></p>
<script type="text/javascript">
@@ -222,7 +219,7 @@
</script>
<p><a href="javascript:collapse();">Collapse external navigation window</a></p>
ENDNAV
- $r->print(&Apache::loncommon::endbodytag().'</html>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler
@@ -440,11 +437,10 @@
'titleheader' => 'Title',
'type' => 'Type');
if ($#possibilities>0) {
- my $bodytag=
- &Apache::loncommon::bodytag('Multiple Resources');
+ my $start_page=
+ &Apache::loncommon::start_page('Multiple Resources');
$r->print(<<ENDSTART);
-<head><title>Choose Next Location</title></head>
-$bodytag
+$start_page
<h3>$lt{'wherenext'}</h3>
<p>
$lt{'pick'}:
@@ -465,10 +461,10 @@
}
$r->print('</table>');
} else {
- my $bodytag=&Apache::loncommon::bodytag('No Resource');
+ my $start_page=
+ &Apache::loncommon::start_page('No Resource');
$r->print(<<ENDNONE);
-<head><title>No Resource</title></head>
-$bodytag
+$start_page
<h3>$lt{'title'}</h3>
<p>$lt{'explain'}</p>
ENDNONE
@@ -477,8 +473,9 @@
<ul>
<li><a href="/adm/flip?postdata=return:">$lt{'back'}</a></li>
<li><a href="/adm/navmaps">$lt{'nav'}</a></li>
-</ul></body></html>
+</ul>
ENDMENU
+ $r->print(&Apache::loncommon::end_page());
return OK;
}
} else {
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.19 rat/lonwrapper.pm:1.20
--- rat/lonwrapper.pm:1.19 Fri Feb 10 16:44:02 2006
+++ rat/lonwrapper.pm Sun Mar 19 18:06:00 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.19 2006/02/10 21:44:02 albertel Exp $
+# $Id: lonwrapper.pm,v 1.20 2006/03/19 23:06:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -100,7 +100,7 @@
<head>
$script
</head>
-<frameset rows="180,*" border=0 $events>
+<frameset rows="180,*" border="0" $events>
<frame src="$orgurl">
<frame src="$url">
</frameset>
@@ -115,7 +115,7 @@
<head>
$script
</head>
-<frameset rows="1,*" border=0 $events>
+<frameset rows="1,*" border="0" $events>
<frame src="/adm/rat/empty.html">
<frame src="$url">
</frameset>