--- loncom/homework/lonhomework.pm	2006/05/16 21:21:32	1.248
+++ loncom/homework/lonhomework.pm	2008/03/12 02:46:53	1.291
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.248 2006/05/16 21:21:32 albertel Exp $
+# $Id: lonhomework.pm,v 1.291 2008/03/12 02:46:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,11 +49,11 @@ use Apache::matchresponse();
 use Apache::chemresponse();
 use Apache::drawimage();
 use Apache::Constants qw(:common);
-use HTML::Entities();
 use Apache::loncommon();
 use Apache::lonlocal;
 use Time::HiRes qw( gettimeofday tv_interval );
-use Apache::lonnet();
+use HTML::Entities();
+use File::Copy();
 
 # FIXME - improve commenting
 
@@ -63,6 +63,28 @@ BEGIN {
 }
 
 
+=pod
+
+=item set_bubble_lines()
+
+Called at analysis time to set the bubble lines
+hash for the problem.. This should be called in the
+end_problemtype tag in analysis mode.
+
+We fetch the hash of part id counters from lonxml
+    and push them into analyze:{part_id.bubble_lines}.
+
+=cut
+
+sub set_bubble_lines {
+    my %bubble_counters = &Apache::lonxml::get_bubble_line_hash();
+
+    foreach my $key (keys(%bubble_counters)) {
+	$Apache::lonhomework::analyze{"$key.bubble_lines"} =
+	    $bubble_counters{"$key"};
+    }
+}
+
 #
 # Decides what targets to render for.
 # Implicit inputs:
@@ -96,7 +118,6 @@ sub get_target {
 	    return ('grade','webgrade');
 	}
 	if ( defined($env{'form.submitted'}) &&
-	     ( !defined($env{'form.resetdata'})) &&
 	     ( !defined($env{'form.newrandomization'}))) {
 	    return ('grade', 'web');
 	} else {
@@ -113,8 +134,11 @@ sub get_target {
 		return ('web');
 	    }
 	} else {
-	    if ( $env{'form.problemmode'} eq &mt('View') ||
-		 $env{'form.problemmode'} eq &mt('Discard Edits and View')) {
+	    if ($env{'form.problemstate'} eq 'WEB_GRADE') {
+		#$env{'form.webgrade'} = 'yes';
+		return ('grade','webgrade','answer');
+	    } elsif (($env{'form.problemmode'} eq 'view') ||
+		     ($env{'form.problemmode'} eq 'discard')) {
 		if ( defined($env{'form.submitted'}) &&
 		     (!defined($env{'form.resetdata'})) &&
 		     (!defined($env{'form.newrandomization'}))) {
@@ -122,10 +146,9 @@ sub get_target {
 		} else {
 		    return ('web','answer');
 		}
-	    } elsif ( $env{'form.problemmode'} eq &mt('Edit') ||
-		      $env{'form.problemmode'} eq 'Edit') {
+	    } elsif ($env{'form.problemmode'} eq 'edit') {
 		if ( $env{'form.submitted'} eq 'edit' ) {
-		    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
+		    if ( $env{'form.submitbutton'} eq &mt('Save and View') ) {
 			return ('modified','web','answer');
 		    } else {
 			return ('modified','no_output_web','edit');
@@ -170,9 +193,14 @@ sub proctor_checked_in {
     } elsif ($type eq 'problem') {
 	$key ='resource.0.checkedin';
     }
-    
+    # backward compatability, used to be username@domain, 
+    # now is username:domain
+    my $who = $Apache::lonhomework::history{$key};
+    if ($who !~ /:/) {
+	$who =~ tr/@/:/;
+    }     
     foreach my $possible (@possible_proctors) { 
-	if ($Apache::lonhomework::history{$key} eq $possible
+	if ($who eq $possible
 	    && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
 	    return 1;
 	}
@@ -181,7 +209,6 @@ sub proctor_checked_in {
     return 0;
 }
 
-$Apache::lonxml::browse='';
 sub check_ip_acc {
     my ($acc)=@_;
     &Apache::lonxml::debug("acc is $acc");
@@ -189,7 +216,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*//;
@@ -239,8 +267,9 @@ sub check_slot_access {
     # does it pass normal muster
     my ($status,$datemsg)=&check_access($id);
     
-    my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");
-    if ($useslots ne 'resource' && $useslots ne 'map') {
+    my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+    if ($useslots ne 'resource' && $useslots ne 'map' 
+	&& $useslots ne 'map_map') {
 	return ($status,$datemsg);
     }
 
@@ -262,9 +291,9 @@ sub check_slot_access {
 	}
     }
 
-    my @slots=
-	(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),
-	 split(':',&Apache::lonnet::EXT("resource.$id.available")));
+    my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent");
+    my $available = &Apache::lonnet::EXT("resource.0.available");
+    my @slots= (split(':',$availablestudent),split(':',$available));
 
 #    if (!@slots) {
 #	return ($status,$datemsg);
@@ -304,8 +333,10 @@ sub check_slot_access {
 	$checkedin =
 	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {
-	$got_grade = 1;
-	$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
+	$got_grade  = 1;
+	$checkedin  = $Apache::lonhomework::history{"resource.0.checkedin"};
+	$is_correct =
+	    ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
     }
     
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
@@ -318,6 +349,14 @@ sub check_slot_access {
 	return ('WAITING_FOR_GRADE');
     }
 
+    # no slot is currently open, and has been checked in for this version
+    # previous slot is therefore CLOSED, so therefore the problem is
+    if (!defined($slot_name)
+	&& $checkedin 
+	&& $type eq 'problem') {
+	return ('CLOSED',$datemsg);
+    }
+
     if ($slotstatus eq 'NOT_IN_A_SLOT' 
 	&& $checkedin ) {
 
@@ -328,9 +367,14 @@ sub check_slot_access {
 	}
 
     }
+
     if ( $is_correct) {
+	if ($type eq 'problem') {
+	    return ($status);
+	}
 	return ('SHOW_ANSWER');
     }
+
     if ( $status eq 'CANNOT_ANSWER' && 
 	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
 	return ($status,$datemsg);
@@ -353,8 +397,8 @@ sub check_access {
     if ($env{'request.state'} eq "construct") {
 	if ($env{'form.problemstate'}) {
 	    if ($env{'form.problemstate'} =~ /^CANNOT_ANSWER/) {
-		if ( ! ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
-			lc($Apache::lonhomework::problemstatus) eq 'no')) {
+		if ( ! ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct' 
+			&& &hide_problem_status())) {
 		    return ('CANNOT_ANSWER',
 			    &mt('is in this state due to author settings.'));
 		}
@@ -372,11 +416,12 @@ sub check_access {
     &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
 
-    my ($symb)=&Apache::lonxml::whichuser();
+    my ($symb)=&Apache::lonnet::whichuser();
     &Apache::lonxml::debug("symb:".$symb);
     #if ($env{'request.state'} ne "construct" && $symb ne '') {
     if ($env{'request.state'} ne "construct") {
-	my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
+        my $idacc = &Apache::lonnet::EXT("resource.$id.acc");
+	my $allowed=&check_ip_acc($idacc);
 	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
 	    $status='INVALID_ACCESS';
 	    $date=&mt("can not be accessed from your location.");
@@ -413,7 +458,7 @@ sub check_access {
 		$date = &mt("an indeterminate date"); $passed = 0;
 	    } else {
 		if (time < $date) { $passed = 0; } else { $passed = 1; }
-		$date = localtime $date;
+		$date = &Apache::lonlocal::locallocaltime($date);
 	    }
 	    if (!$passed) { $type=$temp; last; }
 	}
@@ -444,22 +489,30 @@ sub check_access {
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
 	    &&
-	    lc($Apache::lonhomework::problemstatus) ne 'no')
+	    &show_problem_status())
 	   ||
 	   $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
 	    $status = 'CANNOT_ANSWER';
 	}
+	if ($status eq 'CANNOT_ANSWER'
+	    && &show_answer_problem_status()) {
+	    $status = 'SHOW_ANSWER';
+	}
     }
     if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
-	my $interval=&Apache::lonnet::EXT("resource.$id.interval");
-	&Apache::lonxml::debug("looking for interval $interval");
-	if ($interval) {
-	    my $first_access=&Apache::lonnet::get_first_access('map');
+	my @interval=&Apache::lonnet::EXT("resource.$id.interval");
+	&Apache::lonxml::debug("looking for interval @interval");
+	if ($interval[0]) {
+	    my $first_access=&Apache::lonnet::get_first_access($interval[1]);
 	    &Apache::lonxml::debug("looking for accesstime $first_access");
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
 		my $due_date = &due_date($id);
-		$datemsg=&seconds_to_human_length($due_date-time);
+		my $seconds_left = $due_date - time;
+		if ($seconds_left > $interval[0] || $due_date eq '') {
+		    $seconds_left = $interval[0];
+		}
+		$datemsg=&seconds_to_human_length($seconds_left);
 	    }
 	}
     }
@@ -481,17 +534,21 @@ sub check_access {
 }
 # this should work exactly like the copy in lonnavmaps.pm
 sub due_date {
-    my ($part_id,$symb)=@_;
+    my ($part_id,$symb,$udom,$uname)=@_;
     my $date;
-    my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb);
-    &Apache::lonxml::debug("looking for interval $part_id $symb $interval");
-    my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb);
+    my @interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,
+				       $udom,$uname);
+    &Apache::lonxml::debug("looking for interval $part_id $symb @interval");
+    my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
+				       $udom,$uname);
     &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
-    if (defined($interval)) {
-	my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+    if ($interval[0] =~ /\d+/) {
+	my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+	&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
 	if (defined($first_access)) {
-	    $interval = $first_access+$interval;
-	    $date = ($interval < $due_date)? $interval : $due_date;
+	    my $interval = $first_access+$interval[0];
+	    $date = (!$due_date || $interval < $due_date) ? $interval
+                                                          : $due_date;
 	} else {
 	    $date = $due_date;
 	}
@@ -576,7 +633,7 @@ sub setuppermissions {
 
     if ($Apache::lonhomework::browse eq 'F' && 
 	$env{'form.devalidatecourseresdata'} eq 'on') {
-	my (undef,$courseid) = &Apache::lonxml::whichuser();
+	my (undef,$courseid) = &Apache::lonnet::whichuser();
 	&Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},
 					      $env{"course.$courseid.domain"});
     }
@@ -603,6 +660,13 @@ sub setuppermissions {
     return '';
 }
 
+sub unset_permissions {
+    undef($Apache::lonhomework::queuegrade);
+    undef($Apache::lonhomework::modifygrades);
+    undef($Apache::lonhomework::viewgrades);
+    undef($Apache::lonhomework::browse);
+}
+
 sub setupheader {
     my $request=$_[0];
     &Apache::loncommon::content_type($request,'text/html');
@@ -622,38 +686,48 @@ sub handle_save_or_undo {
     my $filebak =$file.".bak";
     my $filetmp =$file.".tmp";
     my $error=0;
-
-    &Apache::lonnet::correct_line_ends($result);
-
     if ($env{'form.Undo'} eq &mt('undo')) {
 	my $error=0;
-	if (!copy($file,$filetmp)) { $error=1; }
-	if ((!$error) && (!copy($filebak,$file))) { $error=1; }
-	if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
+	if (!&File::Copy::copy($file,$filetmp)) { $error=1; }
+	if ((!$error) && (!&File::Copy::copy($filebak,$file))) { $error=1; }
+	if ((!$error) && (!&File::Copy::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 {
+        &Apache::lonnet::correct_line_ends($result);
 	my $fs=Apache::File->new(">$filebak");
 	if (defined($fs)) {
 	    print $fs $$problem;
-	    &Apache::lonxml::info("<b>".&mt("Making Backup to").
-				  " $filebak</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>");
 	} 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;
 	}
     }
@@ -662,19 +736,27 @@ sub handle_save_or_undo {
 
 sub analyze_header {
     my ($request) = @_;
+    my $js = &Apache::structuretags::setmode_javascript();
     my $result =
-	&Apache::loncommon::start_page('Analyzing a problem',undef);
+	&Apache::loncommon::start_page('Analyzing a problem',$js);
 
     $result .= 
 	&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
+            '<input type="hidden" name="problemmode" value="'.
+            $env{'form.problemmode'}.'" />'.
 	    &Apache::structuretags::remember_problem_state().'
-            <input type="submit" name="problemmode" value="'.&mt("EditXML").'" />
-            <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
-            <hr />
-            <input type="submit" name="submit" value="'.&mt("View").'" />
-            <hr />
+            <div class="LC_edit_problem_analyze_header">
+            <input type="button" name="submitmode" value="'.&mt("EditXML").'" '.
+            'onclick="javascript:setmode(this.form,'."'editxml'".')" />
+            <input type="button" name="submitmode" value="'.&mt('Edit').'" '.
+            'onclick="javascript:setmode(this.form,'."'edit'".')" />
+            <hr class="LC_edit_problem_divide" />
+            <input type="button" name="submitmode" value="'.&mt("View").'" '.
+            'onclick="javascript:setmode(this.form,'."'view'".')" />
+            <hr class="LC_edit_problem_divide" />
+            </div>
             </form>';
     &Apache::lonxml::add_messages(\$result);
     $request->print($result);
@@ -720,36 +802,57 @@ sub analyze {
 	    if ($analyze{$part.'.type'} eq 'numericalresponse'	||
 		$analyze{$part.'.type'} eq 'stringresponse'	||
 		$analyze{$part.'.type'} eq 'formularesponse'   ) {
-		my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} });
-		if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
-		    @{$analyze{$part.'.answer'}}=('<font color="red">'.&mt('Error').'</font>');
+		foreach my $name (keys(%{ $analyze{$part.'.answer'} })) {
+		    my $i=0;
+		    foreach my $answer_part (@{ $analyze{$part.'.answer'}{$name} }) {
+			push( @{ $overall{$part.'.answer'}[$i] },
+			      $answer_part);
+			my $concatanswer= join("\0",@{ $answer_part });
+			if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
+			    $answer_part = ['<span class="LC_error">'.&mt('Error').'</span>'];
+			}
+			$seedexample{join("\0",$part,$i,@{$answer_part})}=
+			    $thisseed;
+			$i++;
+		    }
+		}
+		if (!keys(%{ $analyze{$part.'.answer'} })) {
+		    my $answer_part = 
+			['<span class="LC_error">'.&mt('Error').'</span>'];
+		    $seedexample{join("\0",$part,0,@{$answer_part})}=
+			$thisseed;
+		    push( @{ $overall{$part.'.answer'}[0] },
+			  $answer_part);
 		}
-		push( @{ $overall{$part.'.answer'} },
-		      [@{ $analyze{$part.'.answer'} }]);
-                $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed;
 	    }
 	}
     }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
 					  &mt('Analyzing Results'));
-    $request->print('<hr />'.&mt('List of possible answers').': ');
+    $request->print('<hr class="LC_edit_problem_divide" />'.&mt('List of possible answers').': ');
     foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
-	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
-	    $request->print('<table class="thinborder"><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
-	    my %frequency;
-	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
-		$frequency{join("\0",@{ $answer })}++;
-	    }
-	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />('
-			    .&mt('click for example').')</th></tr>');
-	    foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
-		$request->print('<tr><td class="center">'.
-				join('</td><td class="center">',split("\0",$answer)).
-				'</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{$answer}.'">'.$frequency{$answer}.
-				'</a></td></tr>');
+	    for (my $i=0;$i<scalar(@{ $overall{$part.'.answer'} });$i++) {
+		my $num_cols=scalar(@{ $overall{$part.'.answer'}[$i][0] });
+		$request->print('<table class="thinborder"><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part);
+		if (scalar(@{ $overall{$part.'.answer'} }) > 1) {
+		    $request->print(&mt(' Answer [_1]',$i+1));
+		}
+		$request->print('</th></tr>');
+		my %frequency;
+		foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'}[$i] })) {
+		    $frequency{join("\0",@{ $answer })}++;
+		}
+		$request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />('
+				.&mt('click for example').')</th></tr>');
+		foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
+		    $request->print('<tr><td class="center">'.
+				    join('</td><td class="center">',split("\0",$answer)).
+				    '</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{join("\0",$part,$i,$answer)}.'">'.$frequency{$answer}.
+				    '</a></td></tr>');
+		}
+		$request->print('</table>');
 	    }
-	    $request->print('</table>');
 	} else {
 	    $request->print('<p>'.&mt('Response').' '.$part.' '.
 			    &mt('is not analyzable at this time').'</p>');
@@ -764,6 +867,41 @@ sub analyze {
     return $result;
 }
 
+{
+    my $show_problem_status;
+    sub reset_show_problem_status {
+	undef($show_problem_status);
+    }
+
+    sub set_show_problem_status {
+	my ($new_status) = @_;
+	$show_problem_status = lc($new_status);
+    }
+
+    sub hide_problem_status {
+	return ($show_problem_status eq 'no'
+		|| $show_problem_status eq 'no_feedback_ever');
+    }
+
+    sub show_problem_status {
+	return ($show_problem_status eq 'yes'
+		|| $show_problem_status eq 'answer'
+		|| $show_problem_status eq '');
+    }
+    
+    sub show_some_problem_status {
+	return ($show_problem_status eq 'no');
+    }
+
+    sub show_no_problem_status {
+	return ($show_problem_status eq 'no_feedback_ever');
+    }
+  
+    sub show_answer_problem_status {
+	return ($show_problem_status eq 'answer');
+    }
+}
+
 sub editxmlmode {
     my ($request,$file) = @_;
     my $result;
@@ -779,9 +917,9 @@ sub editxmlmode {
 	if (!$error) { $problem=&Apache::lonnet::getfile($file); }
     }
     &Apache::lonhomework::showhashsubset(\%env,'^form');
-    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
+    if ( $env{'form.submitbutton'} eq &mt('Save and View') ) {
 	&Apache::lonhomework::showhashsubset(\%env,'^form');
-	$env{'form.problemmode'}='View';
+	$env{'form.problemmode'}='view';
 	&renderpage($request,$file);
     } else {
 	my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
@@ -789,34 +927,57 @@ sub editxmlmode {
 	    &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
 						    "Problem Editing Help").
 						    '</td><td>'.
-       &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring').
+       &Apache::loncommon::help_open_menu(undef,undef,5,'Authoring').
                 '</td></tr></table>';
 	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().
+            &Apache::structuretags::setmode_javascript();
+	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).
-	    &Apache::lonxml::message_location().'
-            <form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'.
+            '<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
-            <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
-            <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-            <input type="submit" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
-            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
-            <hr />
-            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
-            <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').'" />
+            <div class="LC_edit_problem_editxml_header">
+              <table class="LC_edit_problem_header_title"><tr><td>
+               '.&mt('Problem Editing').&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').'
+                </td><td align="right">
+                  '.&Apache::loncommon::helpLatexCheatsheet().'
+                </td></tr>
+              </table>
+              <div class="LC_edit_problem_discards">
+                <input type="hidden" name="problemmode" value="editxml" />
+                <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
+                'onclick="javascript:setmode(this.form,'."'discard'".')" />
+                <input type="button" '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'edit'".')').'name="submitmode" accesskey="e" value="'.&mt('Edit').'" />
+                <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+              </div>
+              <div class="LC_edit_problem_saves">
+                <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save').'"  />
+                <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
+              </div>
+              <hr class="LC_edit_problem_divide" />
+	      '.&Apache::lonxml::message_location().'
+            </div>
+            '  . '
+            <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">
+            </div>
             </form>'.&Apache::loncommon::end_page();
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
@@ -833,6 +994,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
@@ -850,9 +1012,16 @@ sub renderpage {
 	my $problem=&Apache::lonnet::getfile($file);
 	my $result;
 	if ($problem eq -1) {
-	    my $filename=(split('/',$file))[-1];
-	    $result.="<b> ".&mt('Unable to find')." <i>$filename</i></b>";
 	    $problem='';
+	    my $filename=(split('/',$file))[-1];
+	    my $error =
+		"<b> ".&mt('Unable to find [_1]',
+			   ' <span class="LC_filename">'.$filename.'</span>')
+		."</b>";
+	    $result.=
+		&Apache::loncommon::simple_error_page($request,'Not available',
+						      $error);
+	    return;
 	}
 
 	my %mystyle;
@@ -863,7 +1032,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') {
@@ -894,50 +1063,76 @@ sub renderpage {
     }
 }
 
-# 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 finished_parsing {
+    undef($Apache::lonhomework::parsing_a_problem);
+    undef($Apache::lonhomework::parsing_a_task);
+}
+
 sub get_template_list {
-    my ($namewanted,$extension) = @_;
+    my ($extension) = @_;
     my $result;
     my @allnames;
     &Apache::lonxml::debug("Looking for :$extension:");
-    foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
-	my $name=&Apache::lonnet::metadata($file,'title');
-	if ($namewanted && ($name eq $namewanted)) {
-	    $result=$file;
-	    last;
-	} else {
-	    if ($name) { push (@allnames, $name); }
-	}
+    my $glob_extension  = $extension;
+    if ($extension eq 'survey' || $extension eq 'exam') {
+	$glob_extension = 'problem';
+    }
+    my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
+		     '/templates/*.'.$glob_extension);
+    @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title'))]} (@files);
+    @files = sort {$a->[1] cmp $b->[1]} (@files);
+    my ($midpoint,$seconddiv,$numfiles);
+    $numfiles = 0;
+    foreach my $file (@files) {
+        next if ($file->[1] !~ /\S/);
+        $numfiles ++;
+    }
+    if ($numfiles > 0) {
+        $result = '<div class="LC_left_float">';
+        $midpoint = int($numfiles/2);
+        if ($numfiles%2) {
+            $midpoint ++;
+        }
+    }
+    my $count = 0;
+    foreach my $file (@files) {
+	next if ($file->[1] !~ /\S/);
+	$result .=
+	    '<label><input type="radio" name="template" value="'.$file->[0].'" />'.
+	    $file->[1].'</label><br />'."\n";
+        $count ++;
+        if ((!$seconddiv) && ($count >= $midpoint)) {
+            $result .= '</div>'."\n".'<div class="LC_left_float">'."\n";
+            $seconddiv = 1;
+        }
     }
-    if (@allnames && !$result) {
-	$result="<option>".&mt("Select a")." $extension ".&mt('template')."</option>\n<option>".
-	    join('</option><option>',sort(@allnames)).'</option>';
+    if ($numfiles > 0) {
+        $result .= '</div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n";
     }
     return $result;
 }
 
 sub newproblem {
     my ($request) = @_;
-    my $extension=$request->uri;
-    $extension=~s:^.*\.([\w]+)$:$1:;
-    &Apache::lonxml::debug("Looking for :$extension:");
-    my $templatelist=&get_template_list('',$extension);
-    if ($env{'form.template'} &&
-	$env{'form.template'} ne "Select a $extension template") {
-	use File::Copy;
-	my $file = &get_template_list($env{'form.template'},$extension);
+
+    if ($env{'form.template'}) {
+	my $file = $env{'form.template'};
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
-	copy($file,$dest);
+	&File::Copy::copy($file,$dest);
 	&renderpage($request,$dest);
-    } elsif($env{'form.newfile'} && !$templatelist) {
-	# I don't like hard-coded filenames but for now, this will work.
-	use File::Copy;
+	return;
+    }
+
+    my ($extension) = ($request->uri =~ m/\.(\w+)$/);
+    &Apache::lonxml::debug("Looking for :$extension:");
+    my $templatelist=&get_template_list($extension);
+    if ($env{'form.newfile'} && !$templatelist) {
+	# no templates found
 	my $templatefilename =
-	    $request->dir_config('lonIncludes').'/templates/blank.problem';
+	    $request->dir_config('lonIncludes').'/templates/blank.'.$extension;
 	&Apache::lonxml::debug("$templatefilename");
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
-	copy($templatefilename,$dest);
+	&File::Copy::copy($templatefilename,$dest);
 	&renderpage($request,$dest);
     } else {
 	my $url=&HTML::Entities::encode($request->uri,'<>&"');
@@ -945,40 +1140,49 @@ sub newproblem {
 	$shownurl=~s-^/~-/priv/-;
 	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";
-	}
 	my $instructions;
 	my $start_page = 
 	    &Apache::loncommon::start_page("Create New $extension");
-	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
-	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
-			  'resource' => 'resource',
-			  'requested' => 'The requested file',
-			  'not exist' => 'currently does not exist',
-			  'createnew' => 'To create a new',
-			  'click' => 'click on the',
-			  'Create' => 'Create',
-			  'button' => 'button');
-	$request->print(<<ENDNEWPROBLEM);
+	$request->print("
 $start_page
-<h1>$lt{'create'} $extension $lt{'resource'}</h1>
+<h1>".&mt("Creating a new $extension resource.")."</h1>
 $errormsg
-$lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
+".&mt("The requested file [_1] currently does not exist.",
+      "<tt>$shownurl</tt>")."
 <p>
-<b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>
-</p>
-<p><form action="$url" method="POST">
-ENDNEWPROBLEM
+<b>
+".&mt("To create a new $extension, select a template from the".
+      " list below. Then click on the \"Create $extension\" button.")."</b>
+</p><form action=\"$url\" method=\"POST\">");
+
 	if (defined($templatelist)) {
-	    $request->print("<select name=\"template\">$templatelist</select>");
+	    $request->print($templatelist);
 	}
-	$request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"".&mt('Create')." $extension\" />");
+	$request->print('<br /><input type="submit" name="newfile" value="'.
+			&mt("Create $extension").'" />');
 	$request->print("</form></p>".&Apache::loncommon::end_page());
     }
-    return '';
+    return;
+}
+
+sub update_construct_style {
+    if ($env{'request.state'} eq "construct"
+	&& $env{'form.problemmode'} eq '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];
@@ -986,13 +1190,6 @@ sub handler {
     $Apache::lonxml::debug=$env{'user.debug'};
     $env{'request.uri'}=$request->uri;
     &setuppermissions();
-    # some times multiple problemmodes are submitted, need to select
-    # the last one
-    if ( defined($env{'form.problemmode'}) && ref($env{'form.problemmode'}) ) {
-	my $mode=$env{'form.problemmode'}->[-1];
-	undef $env{'form.problemmode'};
-	$env{'form.problemmode'}=$mode;
-    }
 
     my $file=&Apache::lonnet::filelocation("",$request->uri);
 
@@ -1002,13 +1199,18 @@ sub handler {
 	if ($Apache::lonhomework::browse ne 'F' && 
 	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
-	    $request->internal_redirect('/adm/ambiguous'); return OK;
+	    &unset_permissions();
+	    $request->internal_redirect('/adm/ambiguous');
+	    return OK;
 	}
     }
-    if (&setupheader($request)) { return OK; }
+    if (&setupheader($request)) {
+	&unset_permissions();
+	return OK;
+    }
     &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade");
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
-    my ($symb) = &Apache::lonxml::whichuser();
+    my ($symb) = &Apache::lonnet::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
     if ($env{'request.state'} eq "construct") {
 	if ( -e $file ) {
@@ -1016,14 +1218,14 @@ sub handler {
 						    ['problemmode']);
 	    if (!(defined $env{'form.problemmode'})) {
 		#first visit to problem in construction space
-		$env{'form.problemmode'}='View';
+		$env{'form.problemmode'}= 'view';
 		&renderpage($request,$file);
-	    } elsif ($env{'form.problemmode'} eq &mt('EditXML') ||
-		     $env{'form.problemmode'} eq 'EditXML') {
+	    } elsif ($env{'form.problemmode'} eq 'editxml') {
 		&editxmlmode($request,$file);
-	    } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {
+	    } elsif ($env{'form.problemmode'} eq 'calcanswers') {
 		&analyze($request,$file);
 	    } else {
+		&update_construct_style();
 		&renderpage($request,$file);
 	    }
 	} else {
@@ -1039,6 +1241,7 @@ sub handler {
     #&Apache::lonxml::debug("Spent $td seconds processing");
     # always turn off debug messages
     $Apache::lonxml::debug=0;
+    &unset_permissions();
     return OK;
 
 }