--- loncom/homework/lonhomework.pm	2007/10/30 00:24:40	1.279
+++ loncom/homework/lonhomework.pm	2007/11/17 02:51:29	1.285
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.279 2007/10/30 00:24:40 albertel Exp $
+# $Id: lonhomework.pm,v 1.285 2007/11/17 02:51:29 albertel 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
 
@@ -149,7 +149,7 @@ sub get_target {
 	    } elsif ( $env{'form.problemmode'} eq &mt('Edit') ||
 		      $env{'form.problemmode'} eq 'Edit') {
 		if ( $env{'form.submitted'} eq 'edit' ) {
-		    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
+		    if ( $env{'form.submit'} eq &mt('Save and View') ) {
 			return ('modified','web','answer');
 		    } else {
 			return ('modified','no_output_web','edit');
@@ -494,6 +494,10 @@ sub check_access {
 	   $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");
@@ -543,7 +547,8 @@ sub due_date {
 	&Apache::lonxml::debug("looking for first_access $first_access");
 	if (defined($first_access)) {
 	    $interval = $first_access+$interval;
-	    $date = ($interval < $due_date)? $interval : $due_date;
+	    $date = (!$due_date || $interval < $due_date) ? $interval
+                                                          : $due_date;
 	} else {
 	    $date = $due_date;
 	}
@@ -683,9 +688,9 @@ sub handle_save_or_undo {
     my $error=0;
     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 [_1] and [_2]",
@@ -882,6 +887,7 @@ sub analyze {
 
     sub show_problem_status {
 	return ($show_problem_status eq 'yes'
+		|| $show_problem_status eq 'answer'
 		|| $show_problem_status eq '');
     }
     
@@ -892,6 +898,10 @@ sub analyze {
     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 {
@@ -909,7 +919,7 @@ 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.submit'} eq &mt('Save and View') ) {
 	&Apache::lonhomework::showhashsubset(\%env,'^form');
 	$env{'form.problemmode'}='View';
 	&renderpage($request,$file);
@@ -939,21 +949,30 @@ sub editxmlmode {
 
 	$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().'
             <div class="LC_edit_problem_editxml_header">
-            <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 class="LC_edit_problem_divide" />
-            <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 class="LC_edit_problem_divide" />
+              <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="'.&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').'" />
+              </div>
+              <div class="LC_edit_problem_saves">
+                <input type="submit" name="submit" accesskey="s" value="'.&mt('Save').'" />
+                <input type="submit" name="submit" accesskey="v" value="'.&mt('Save and View').'" />
+              </div>
+              <hr class="LC_edit_problem_divide" />
+	      '.&Apache::lonxml::message_location().'
             </div>
-            ' . $xml_help . '
+            '  . '
             <textarea '.&Apache::edit::element_change_detection().
 	              ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
 		      ' name="editxmltext" id="LC_editxmltext">'.
@@ -1050,52 +1069,49 @@ sub finished_parsing {
     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 {
-    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>) {
-	&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;
-	} else {
-	    if ($name) { push (@allnames, $name); }
-	}
-    }
-    if (@allnames && !$result) {
-	$result="<option>".&mt("Select a")." $extension ".&mt('template')."</option>\n<option>".
-	    join('</option><option>',sort(@allnames)).'</option>';
+    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);
+    foreach my $file (@files) {
+	next if ($file->[1] !~ /\S/);
+	$result .=
+	    '<label><input type="radio" name="template" value="'.$file->[0].'" />'.
+	    $file->[1].'</label><br />';
     }
     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.'.$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,'<>&"');
@@ -1103,9 +1119,6 @@ sub newproblem {
 	$shownurl=~s-^/~-/priv/-;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
-	if ($env{'form.newfile'}) {
-	    $errormsg='<p><span class="LC_error">'.&mt('You did not select a template.').'</span></p>'."\n";
-	}
 	my $instructions;
 	my $start_page = 
 	    &Apache::loncommon::start_page("Create New $extension");
@@ -1118,16 +1131,17 @@ $errormsg
 <p>
 <b>
 ".&mt("To create a new $extension, select a template from the".
-      "pull-down menu below. Then click on the \"Create $extension\" button.")."</b>
+      " 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 {