--- loncom/homework/lonhomework.pm	2007/02/24 01:44:14	1.264
+++ loncom/homework/lonhomework.pm	2007/08/31 19:32:57	1.273
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.264 2007/02/24 01:44:14 albertel Exp $
+# $Id: lonhomework.pm,v 1.273 2007/08/31 19:32:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,7 +112,10 @@ sub get_target {
 		return ('web');
 	    }
 	} else {
-	    if ( $env{'form.problemmode'} eq &mt('View') ||
+	    if ($env{'form.problemstate'} eq 'WEB_GRADE') {
+		#$env{'form.webgrade'} = 'yes';
+		return ('grade','webgrade','answer');
+	    } elsif ( $env{'form.problemmode'} eq &mt('View') ||
 		 $env{'form.problemmode'} eq &mt('Discard Edits and View')) {
 		if ( defined($env{'form.submitted'}) &&
 		     (!defined($env{'form.resetdata'})) &&
@@ -185,7 +188,6 @@ sub proctor_checked_in {
     return 0;
 }
 
-$Apache::lonxml::browse='';
 sub check_ip_acc {
     my ($acc)=@_;
     &Apache::lonxml::debug("acc is $acc");
@@ -193,7 +195,8 @@ sub check_ip_acc {
 	return 1;
     }
     my $allowed=0;
-    my $ip=$ENV{'REMOTE_ADDR'};
+    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+
     my $name;
     foreach my $pattern (split(',',$acc)) {
 	$pattern =~ s/^\s*//;
@@ -662,9 +665,19 @@ sub handle_save_or_undo {
 	if ((!$error) && (!copy($filebak,$file))) { $error=1; }
 	if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
 	if (!$error) {
-	    &Apache::lonxml::info("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");
+	    &Apache::lonxml::info("<p><b>".
+				  &mt("Undid changes, Switched [_1] and [_2]",
+				      '<span class="LC_filename">'.$filebak.
+				      '</span>',
+				      '<span class="LC_filename">'.$file.
+				      '</span>')."</b></p>");
 	} else {
-	    &Apache::lonxml::info("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");
+	    &Apache::lonxml::info("<p><span class=\"LC_error\">".
+				  &mt("Unable to undo, unable to switch [_1] and [_2]",
+				      '<span class="LC_filename">'.
+				      $filebak.'</span>',
+				      '<span class="LC_filename">'.
+				      $file.'</span>')."</span></p>");
 	    $error=1;
 	}
     } else {
@@ -672,20 +685,29 @@ sub handle_save_or_undo {
 	my $fs=Apache::File->new(">$filebak");
 	if (defined($fs)) {
 	    print $fs $$problem;
-	    &Apache::lonxml::info("<b>".&mt("Making Backup to").
-				  " $filebak</b>");
+	    &Apache::lonxml::info("<b>".&mt("Making Backup to [_1]",
+					    '<span class="LC_filename">'.
+					    $filebak.'</span>').
+				  "</b>");
 	} else {
-	    &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");
+	    &Apache::lonxml::info("<span class=\"LC_error\">".
+				  &mt("Unable to make backup [_1]",
+				      '<span class="LC_filename">'.
+				      $filebak.'</span>')."</span>");
 	    $error=2;
 	}
 	my $fh=Apache::File->new(">$file");
 	if (defined($fh)) {
 	    print $fh $$result;
-	    &Apache::lonxml::info("<b>".&mt("Saving Modifications to").
-				  " $file</b>");
+	    &Apache::lonxml::info("<b>".&mt("Saving Modifications to [_1]",
+					   '<span class="LC_filename">'.
+					    $file.'</span>' )."</b>");
 	} else {
-	    &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".
-				  &mt("Unable to write to")." $file</b></font>");
+	    &Apache::lonxml::info('<span class="LC_error">'.
+				  &mt("Unable to write to [_1]",
+				      '<span class="LC_filename">'.
+				      $file.'</span>').
+				  '</span>');
 	    $error|=4;
 	}
     }
@@ -759,7 +781,7 @@ sub analyze {
 			      $answer_part);
 			my $concatanswer= join("\0",@{ $answer_part });
 			if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
-			    $answer_part = ['<font color="red">'.&mt('Error').'</font>'];
+			    $answer_part = ['<span class="LC_error">'.&mt('Error').'</span>'];
 			}
 			$seedexample{join("\0",$part,$i,@{$answer_part})}=
 			    $thisseed;
@@ -839,9 +861,18 @@ sub editxmlmode {
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }
 	if ($rows < 20) { $rows = 20; }
+	my $js =
+	    &Apache::edit::js_change_detection(). 
+	    &Apache::loncommon::resize_textarea_js();
+	my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
 	my $start_page = 
-	    &Apache::loncommon::start_page("EditXML $file",
-					   &Apache::edit::js_change_detection());
+	    &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
+					   {'no_auto_mt_title' => 1,
+					    'only_body'        => $only_body,
+					    'add_entries'      => {
+						'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
+						'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
+				    }});
 
 	$result.=$start_page.
 	    &renderpage($request,$file,['no_output_web'],1).
@@ -858,10 +889,14 @@ sub editxmlmode {
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             <hr />
             ' . $xml_help . '
-            <textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem,'<>&"').'</textarea><br />
-            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
-            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
+            <textarea '.&Apache::edit::element_change_detection().
+	              ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
+		      ' name="editxmltext" id="LC_editxmltext">'.
+		      &HTML::Entities::encode($problem,'<>&"').'</textarea>
+            <div id="LC_aftertextarea">
+                <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
+                <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
+            </div>
             </form>'.&Apache::loncommon::end_page();
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
@@ -878,6 +913,7 @@ sub renderpage {
     my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
+
     my $overall_result;
     foreach my $target (@targets) {
 	# FIXME need to do something intelligent when a problem goes
@@ -915,7 +951,7 @@ sub renderpage {
 	&Apache::lonxml::debug("Should be parsing now");
 	$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
 					     &setup_vars($target),%mystyle);
-	undef($Apache::lonhomework::parsing_a_problem);
+	&finished_parsing();
 	if (!$output) { $result = ''; }
 	#$request->print("Result follows:");
 	if ($target eq 'modified') {
@@ -946,6 +982,11 @@ sub renderpage {
     }
 }
 
+sub finished_parsing {
+    undef($Apache::lonhomework::parsing_a_problem);
+    undef($Apache::lonhomework::parsing_a_task);
+}
+
 # with no arg it returns a HTML <option> list of the template titles
 # with one arg it returns the filename associated with the arg passed
 sub get_template_list {
@@ -954,7 +995,9 @@ sub get_template_list {
     my @allnames;
     &Apache::lonxml::debug("Looking for :$extension:");
     foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
+	&Apache::lonxml::debug("Looking at $file");
 	my $name=&Apache::lonnet::metadata($file,'title');
+	&Apache::lonxml::debug("Got a name $name");
 	if ($namewanted && ($name eq $namewanted)) {
 	    $result=$file;
 	    last;
@@ -998,7 +1041,7 @@ sub newproblem {
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
 	if ($env{'form.newfile'}) {
-	    $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
+	    $errormsg='<p><span class="LC_error">'.&mt('You did not select a template.').'</span></p>'."\n";
 	}
 	my $instructions;
 	my $start_page = 
@@ -1024,6 +1067,24 @@ $errormsg
     return '';
 }
 
+sub update_construct_style {
+    if ($env{'request.state'} eq "construct"
+	&& $env{'form.problemmode'} eq &mt('View') 
+	&&  defined($env{'form.submitted'})
+	&& !defined($env{'form.resetdata'})
+	&& !defined($env{'form.newrandomization'})) {
+	if ((!$env{'form.style_file'} && $env{'construct.style'})
+	    ||$env{'form.clear_style_file'}) {
+	    &Apache::lonnet::delenv('construct\\.style');
+	} elsif ($env{'form.style_file'} 
+	    && $env{'construct.style'} ne $env{'form.style_file'}) {
+	    &Apache::lonnet::appenv('construct.style' => 
+				        $env{'form.style_file'});
+	}
+    }
+}
+
+
 sub handler {
     #my $t0 = [&gettimeofday()];
     my $request=$_[0];
@@ -1074,6 +1135,7 @@ sub handler {
 	    } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {
 		&analyze($request,$file);
 	    } else {
+		&update_construct_style();
 		&renderpage($request,$file);
 	    }
 	} else {