--- loncom/homework/inputtags.pm 2007/05/21 23:09:57 1.225
+++ loncom/homework/inputtags.pm 2007/09/26 19:30:30 1.231
@@ -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.231 2007/09/26 19:30:30 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.='
'.''.&mt('OR:').'
';
}
if ($which eq 'portfolioonly' || $which eq 'both') {
- $result.=$extratext.''.
+ $result.=$extratext.''.
&mt('Select Portfolio Files').'
'.
''.
'
';
@@ -1133,7 +1131,12 @@ sub gradestatus {
}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button = '';
+ $button =
+ '';
}
}
@@ -1180,7 +1183,7 @@ sub previous_tries {
my ($match,$which) = &find_which_previous($i);
$message=$previousmsg;
my $previous = $count_lookup{$which};
- $message =~ s{()}{ as submission # $previous $1};
+ $message =~ s{()}{ 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,23 +1228,27 @@ sub previous_tries {
&mt('Submitted Answer').'';
$output ='