[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm lonxml.pm
www
lon-capa-cvs@mail.lon-capa.org
Sun, 10 Jul 2005 21:43:39 -0000
www Sun Jul 10 17:43:39 2005 EDT
Modified files:
/loncom/xml londefdef.pm lonxml.pm
Log:
Bug #3750:
View HTML/XML/... ignored bodytag settings, forced style.
Double DTD entry, because lonxml now produces one itself.
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.277 loncom/xml/londefdef.pm:1.278
--- loncom/xml/londefdef.pm:1.277 Thu Jul 7 06:09:50 2005
+++ loncom/xml/londefdef.pm Sun Jul 10 17:43:35 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.277 2005/07/07 10:09:50 foxr Exp $
+# $Id: londefdef.pm,v 1.278 2005/07/10 21:43:35 www Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -535,23 +535,21 @@
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
';'.$onUnload;
- if ($env{'request.state'} ne 'construct') {
- $currentstring .= '<'.$token->[1];
- }
+ $currentstring .= '<'.$token->[1];
foreach (keys %{$token->[2]}) {
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
}
- if ($env{'request.state'} ne 'construct') {
- $currentstring.='>';
- }
+ $currentstring.='>';
if ($env{'request.state'} ne 'published') {
- my $remote=($env{'environment.remote'} ne 'off');
- $currentstring=&Apache::loncommon::bodytag(undef,undef,
- $currentstring,$remote);
+ if ($env{'environment.remote'} eq 'off') {
+ $currentstring.=
+ &Apache::lonmenu::constspaceform().
+ &Apache::lonmenu::menubuttons(1,'web',1);
+ }
$currentstring.=(<<EDITBUTTON);
- <form method="post">
- <input type="submit" name="editmode" accesskey="e" value="Edit" />
- </form>
+<form method="post">
+<input type="submit" name="editmode" accesskey="e" value="Edit" />
+</form>
EDITBUTTON
} else {
$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.380 loncom/xml/lonxml.pm:1.381
--- loncom/xml/lonxml.pm:1.380 Fri Jul 8 06:39:49 2005
+++ loncom/xml/lonxml.pm Sun Jul 10 17:43:35 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.380 2005/07/08 10:39:49 www Exp $
+# $Id: lonxml.pm,v 1.381 2005/07/10 21:43:35 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1148,7 +1148,6 @@
my $title=&mt('Title of document goes here');
my $body=&mt('Body of document goes here');
my $filecontents=(<<SIMPLECONTENT);
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml/11/DTD/xhtml11.dtd">
<html>
<head>
<title>$title</title>
@@ -1337,7 +1336,7 @@
} else {
unless ($env{'request.state'} eq 'published') {
if ($filecontents=~/BEGIN LON-CAPA Internal/) {
- &Apache::lonxml::error(&mt('This file appears to be a rendering of a Lon-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'));
+ &Apache::lonxml::error(&mt('This file appears to be a rendering of a LON-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'));
}
#
# we are in construction space, see if edit mode forced