[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm structuretags.pm

albertel lon-capa-cvs@mail.lon-capa.org
Sat, 15 Apr 2006 01:07:00 -0000 

albertel		Fri Apr 14 21:07:00 2006 EDT

  Modified files:              
    /loncom/homework	structuretags.pm bridgetask.pm 
  Log:
  - end_page for task/homework
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.345 loncom/homework/structuretags.pm:1.346
--- loncom/homework/structuretags.pm:1.345	Fri Apr 14 17:42:05 2006
+++ loncom/homework/structuretags.pm	Fri Apr 14 21:06:59 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.345 2006/04/14 21:42:05 albertel Exp $
+# $Id: structuretags.pm,v 1.346 2006/04/15 01:06:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -596,7 +596,6 @@
     my $status;
     my $accessmsg;
 
-    #should get back a <html> or the neccesary stuff to start XML/MathML
     my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$form_tag_start)=
 	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
@@ -865,7 +864,7 @@
 		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
 	    }
 	    if ($target eq 'web') {
-		$result.=&Apache::lonxml::xmlend().'</html>';
+		$result.= &Apache::loncommon::end_page({'discussion' => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $env{'form.problem_split'}=~/yes/) {
@@ -890,7 +889,7 @@
 	}
 	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
 	    && $env{'form.answer_output_mode'} ne 'tex') {
-	    $result.=&Apache::lonxml::xmlend().'</html>';
+	    $result.=&Apache::loncommon::end_page({'discussion' => 1});
 	                        # normally we get it from above, but in CSTR
 	                        # we always show answer mode too.
 	}
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.141 loncom/homework/bridgetask.pm:1.142
--- loncom/homework/bridgetask.pm:1.141	Fri Apr 14 17:42:05 2006
+++ loncom/homework/bridgetask.pm	Fri Apr 14 21:06:59 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.141 2006/04/14 21:42:05 albertel Exp $
+# $Id: bridgetask.pm,v 1.142 2006/04/15 01:06:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -381,7 +381,6 @@
 	$name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
     }
 
-    #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$form_tag_start)=
 	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,
 					   $parser,$safeeval,$name,&style());
@@ -840,7 +839,8 @@
 		}
 	    } 
 	    if ($target eq 'web') {
-		$result.="\n</div>\n".&Apache::lonxml::xmlend().'</html>';
+		$result.="\n</div>\n".
+		    &Apache::loncommon::end_page({'discussion' => 1});
 	    }
 	}
 	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {