--- loncom/homework/structuretags.pm	2005/12/01 18:46:31	1.326
+++ loncom/homework/structuretags.pm	2006/03/28 18:31:37	1.332.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.326 2005/12/01 18:46:31 albertel Exp $
+# $Id: structuretags.pm,v 1.332.2.1 2006/03/28 18:31:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -113,6 +113,15 @@ sub page_start {
 	    &Apache::lonhtmlcommon::htmlareaheaders().
 	    &Apache::lonhtmlcommon::spellheader().
 	    &Apache::lonxml::fontsettings();     
+	my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
+	if ($css_href =~ /\S/) {
+	    &Apache::lonxml::extlink($css_href);
+	    $head_tag_start = 
+		'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
+	}
+	if ($target eq 'edit') {
+	    $head_tag_start.=&Apache::edit::js_change_detection();
+	}
     }
     my $body_tag_start;
     if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') {
@@ -150,7 +159,11 @@ sub page_start {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="';
 	my $uri=$env{'request.uri'};
 	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	$form_tag_start.=$uri.'">';
+	$form_tag_start.=$uri.'" ';
+	if ($target eq 'edit') {
+	    $form_tag_start.=&Apache::edit::form_change_detection();
+	}
+	$form_tag_start.='>';
     }
     return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
 }
@@ -225,7 +238,7 @@ sub problem_edit_header {
 	&Apache::structuretags::remember_problem_state().'
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-       <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
@@ -549,7 +562,7 @@ sub start_problem {
 	    defined($env{'form.problemtype'})) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
-	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
+	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
 	my $uri=$env{'request.uri'};
@@ -651,7 +664,10 @@ sub start_problem {
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
-		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
+		my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
+		                    : '\begin{minipage}{\textwidth}';
+		$result.='\begin{document}\noindent \vskip 1 mm '.
+		    $startminipage.'\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
 		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
 		} else {
@@ -712,6 +728,7 @@ sub end_problem {
 
     if (!$Apache::lonxml::metamode) {
 	$result = &Apache::lonxml::endredirection(); #started in &start_problem
+	$Apache::lonxml::post_evaluate=0;
     }
 
     if ($target eq 'tex') {
@@ -1158,7 +1175,7 @@ sub start_randomlist {
     my $result;
     if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
 	$target eq 'tex' || $target eq 'analyze') {
-	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser,$style);
+	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
 	my $b_parser= HTML::LCParser->new(\$body);
 	$b_parser->xml_mode(1);
 	$b_parser->marked_sections(1);
@@ -1364,6 +1381,7 @@ sub end_part {
     my $result;
     if (!$Apache::lonxml::metamode) {
 	$result = &Apache::lonxml::endredirection(); # started in &start_part
+	$Apache::lonxml::post_evaluate=0;
     }
     if ($target eq 'grade') {
 	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
@@ -1577,7 +1595,7 @@ sub start_simpleeditbutton {
     my $result='';
     if (($env{'form.simple_edit_button'} ne 'off') &&
 	($target eq 'web') &&
-        (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
 	my ($symb) = &Apache::lonxml::whichuser();