--- loncom/homework/inputtags.pm 2013/07/24 18:21:42 1.319 +++ loncom/homework/inputtags.pm 2013/08/20 00:46:35 1.320 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.319 2013/07/24 18:21:42 bisitz Exp $ +# $Id: inputtags.pm,v 1.320 2013/08/20 00:46:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -691,7 +691,8 @@ sub current_file_submissions { my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); - my $header = &Apache::loncommon::start_data_table(). + my $header = &portpath_popup_js(). + &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { $header .= ''.&mt('Delete?').''; @@ -757,13 +758,24 @@ sub current_file_submissions { ' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" />'."\n"; $num ++; } - my $showname = $rows{$url}{path}.$name; + my $pathid = 'HWFILE'.$jspart.'_'.$id.'_'.$num.'_path'; + my $pathidtext = $pathid.'text'; + my ($showname,$showpath); if ($legacy{$url}) { $showname = $name.' '.&mt('not in portfolio'); + } else { + $showname = $name; + $showpath = '
'. + ''. + ''. + &mt('(Show path)').''. + '
'.$rows{$url}{path}.$name. +'
'; } $result .= ''.$showname.''."\n". + '" border="0" alt="" />'.$showname.''.$showpath.''."\n". ''.$rows{$url}{size}.''."\n". ''.$rows{$url}{lastmodified}.''."\n". &Apache::loncommon::end_data_table_row(); @@ -818,6 +830,43 @@ sub current_file_info { return ($status,\%info,$error); } +sub portpath_popup_js { + my %lt = &Apache::lonlocal::texthash( + show => '(Show path)', + hide => '(Hide)', + ); + return <<"END"; + + +END +} + sub valid_award { my ($award) =@_; foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',