--- loncom/homework/structuretags.pm	2005/12/22 22:06:54	1.328
+++ loncom/homework/structuretags.pm	2006/04/20 19:08:41	1.332.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.328 2005/12/22 22:06:54 albertel Exp $
+# $Id: structuretags.pm,v 1.332.2.3 2006/04/20 19:08:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,7 @@ BEGIN {
 sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	return $bodytext;
     }
     return '';
@@ -113,6 +113,12 @@ 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();
 	}
@@ -423,13 +429,14 @@ sub checkout_msg {
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
                 'checkout'=>'Check out Exam for Viewing',
 		'checkout?'=>'Check out Exam?');
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
 <font color="red">
 <p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="POST" action="$env{'request.uri'}">
+<form name="checkout" method="POST" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
@@ -441,9 +448,10 @@ sub firstaccess_msg {
     my ($map)=&Apache::lonnet::decode_symb($symb);
     my $foldertitle=&Apache::lonnet::gettitle($map);
     &Apache::lonxml::debug("map is $map title is $foldertitle");
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
-<form name="markaccess" method="POST" action="$env{'request.uri'}">
+<form name="markaccess" method="POST" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />
 <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
 </form>
@@ -556,7 +564,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'};
@@ -658,7 +666,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 {
@@ -719,6 +730,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') {
@@ -970,8 +982,8 @@ sub start_block {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer'  ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = $token->[2]->{'condition'};
 	if (defined($code)) {
 	    if (!$Apache::lonxml::default_homework_loaded) {
@@ -1014,8 +1026,8 @@ sub start_languageblock {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
         my %languages=&Apache::loncommon::display_languages();
@@ -1067,8 +1079,8 @@ sub start_instructorcomment {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
         $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
 	if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
@@ -1096,8 +1108,8 @@ sub start_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = $token->[2]->{'condition'};
 
 	push( @Apache::structuretags::whileconds, $code);
@@ -1129,8 +1141,8 @@ sub end_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = pop(@Apache::structuretags::whileconds);
 	my $bodytext = pop(@Apache::structuretags::whilebody);
 	my $line = pop(@Apache::structuretags::whileline);
@@ -1163,9 +1175,9 @@ sub end_while {
 sub start_randomlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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);
+    if ($target eq 'answer' || $target eq 'grade'   || $target eq 'web' ||
+	$target eq 'tex'    || $target eq 'analyze' || $target eq 'webgrade') {
+	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);
@@ -1371,6 +1383,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) &&
@@ -1403,7 +1416,8 @@ sub end_part {
 
 sub start_preduedate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
+    if ($target eq 'web' || $target eq 'grade'    || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'webgrade') {
 	&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
 	if (!$Apache::lonhomework::scantronmode &&
 	    $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
@@ -1421,7 +1435,7 @@ sub end_preduedate {
 
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {
 	if ($Apache::lonhomework::scantronmode ||
 	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
@@ -1439,7 +1453,7 @@ sub end_postanswerdate {
 sub start_notsolved {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex') {
+	$target eq 'tex' || $target eq 'webgrade') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	&Apache::lonxml::debug("not solved has :$gradestatus:");
 	if ($gradestatus =~ /^correct/ &&
@@ -1475,8 +1489,8 @@ sub end_solved {
 sub start_problemtype {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
 	if (!defined($mode)) { $mode='show'; }
 	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
@@ -1584,7 +1598,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();