--- loncom/homework/inputtags.pm	2007/05/21 23:09:57	1.225
+++ loncom/homework/inputtags.pm	2007/09/18 22:18:41	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.225 2007/05/21 23:09:57 albertel Exp $
+# $Id: inputtags.pm,v 1.230 2007/09/18 22:18:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,6 @@ use strict;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
@@ -116,8 +115,7 @@ sub check_for_duplicate_ids {
 
 sub start_input {
     my ($parstack,$safeeval)=@_;
-    my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     push (@Apache::inputtags::input,$id);
     push (@Apache::inputtags::inputlist,$id);
     return $id;
@@ -449,7 +447,7 @@ sub file_selector {
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }
     if ($which eq 'portfolioonly' || $which eq 'both') { 
-	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
 	    &mt('Select Portfolio Files').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
@@ -1133,7 +1131,12 @@ sub gradestatus {
 	}
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
-		$button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />';
+		$button = 
+		    '<input 
+                          onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
+                           onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
+                        type="submit" name="submit_'.$id.'"
+                         value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1180,7 +1183,7 @@ sub previous_tries {
 	    my ($match,$which) = &find_which_previous($i);
 	    $message=$previousmsg;
 	    my $previous = $count_lookup{$which};
-	    $message =~ s{(</td>)}{ as submission # $previous $1};
+	    $message =~ s{(</td>)}{ as submission \# $previous $1};
 	} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
 	    if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
 		  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
@@ -1225,15 +1228,16 @@ sub previous_tries {
 	&mt('Submitted Answer').'</th>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
     #return $output;
-    $output=~s/\\/\\\\/g;
-    $output=~s/\'/\\\'/g;
-    $output=~s/\s+/ /g;
+    $output = &Apache::loncommon::js_ready($output); 
+    $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
+
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $start_page =
 	&Apache::loncommon::start_page('Previous Tries', undef,
-				       {'only_body' => 1,
-					'bgcolor'   => '#FFFFFF',
-					'js_ready'  => 1,});
+				       {'only_body'      => 1,
+					'bgcolor'        => '#FFFFFF',
+					'js_ready'       => 1,
+				        'inherit_jsmath' => 1, });
     my $end_page =
 	&Apache::loncommon::end_page({'js_ready' => 1,});