version 1.318, 2013/06/07 20:31:50
|
version 1.322, 2013/08/29 13:02:11
|
Line 222 sub start_textfield {
|
Line 222 sub start_textfield {
|
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
} elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') || |
} elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') || |
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) { |
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) { |
$oldresponse = '* '.&mt('only shown to submitter').' *'; |
$oldresponse = '* '.&mt('(only shown to submitter)').' *'; |
} else { |
} else { |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
} |
} |
Line 424 sub start_textline {
|
Line 424 sub start_textline {
|
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') || |
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
$oldresponse = '* '.&mt('only shown to submitter').' *'; |
$oldresponse = '* '.&mt('(only shown to submitter)').' *'; |
} else { |
} else { |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
} |
} |
Line 647 sub file_selector {
|
Line 647 sub file_selector {
|
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
} |
} |
if ($maxfilesize) { |
if ($maxfilesize) { |
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].', |
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB.', |
'<b>'.$maxfilesize.'</b>').'<br />'; |
'<b>'.$maxfilesize.'</b>').'<br />'; |
} |
} |
if ($constraints) { |
if ($constraints) { |
Line 691 sub current_file_submissions {
|
Line 691 sub current_file_submissions {
|
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
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(); |
&Apache::loncommon::start_data_table_header_row(); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
$header .= '<th>'.&mt('Delete?').'</th>'; |
$header .= '<th>'.&mt('Delete?').'</th>'; |
Line 757 sub current_file_submissions {
|
Line 758 sub current_file_submissions {
|
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n"; |
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n"; |
$num ++; |
$num ++; |
} |
} |
my $showname = $rows{$url}{path}.$name; |
my $pathid = 'HWFILE'.$jspart.'_'.$id.'_'.$num.'_path'; |
|
my $pathidtext = $pathid.'text'; |
|
my ($showname,$showpath); |
if ($legacy{$url}) { |
if ($legacy{$url}) { |
$showname = $name.' '.&mt('not in portfolio'); |
$showname = $name.' '.&mt('not in portfolio'); |
|
} else { |
|
$showname = $name; |
|
$showpath = '<br />'. |
|
'<span id="'.$pathidtext.'" class="LC_cusr_subheading">'. |
|
'<a href="javascript:showPortPath('."'$pathid','$pathidtext'".');" '. |
|
'class="LC_menubuttons_link">'. |
|
&mt('(Show path)').'</a></span>'. |
|
'<div id="'.$pathid.'" class="LC_dccid">'.$rows{$url}{path}.$name. |
|
'</div>'; |
} |
} |
$result .= |
$result .= |
'<td><a href="'.$link.'"><img src="'.$icon. |
'<td><a href="'.$link.'"><img src="'.$icon. |
'" border="0" alt="" />'.$showname.'</a></td>'."\n". |
'" border="0" alt="" />'.$showname.'</a>'.$showpath.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n". |
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
Line 818 sub current_file_info {
|
Line 830 sub current_file_info {
|
return ($status,\%info,$error); |
return ($status,\%info,$error); |
} |
} |
|
|
|
sub portpath_popup_js { |
|
my %lt = &Apache::lonlocal::texthash( |
|
show => '(Show path)', |
|
hide => '(Hide)', |
|
); |
|
return <<"END"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function showPortPath(id,idtext) { |
|
document.getElementById(id).style.display='block'; |
|
document.getElementById(id).style.textAlign='left'; |
|
document.getElementById(id).style.textFace='normal'; |
|
if (document.getElementById(idtext)) { |
|
document.getElementById(idtext).innerHTML ='<a href="javascript:hidePortPath(\\''+id+'\\',\\''+idtext+'\\'); '+ |
|
'"class="LC_menubuttons_link">$lt{'hide'}</a> '; |
|
} |
|
return; |
|
} |
|
|
|
function hidePortPath(id,idtext) { |
|
if (document.getElementById(id)) { |
|
document.getElementById(id).style.display='none'; |
|
} |
|
if (document.getElementById(idtext)) { |
|
document.getElementById(idtext).innerHTML ='<a href="javascript:showPortPath(\\''+id+'\\',\\''+idtext+'\\');" '+ |
|
'class="LC_menubuttons_link">$lt{'show'}</a>'; |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
END |
|
} |
|
|
sub valid_award { |
sub valid_award { |
my ($award) =@_; |
my ($award) =@_; |
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', |
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', |
Line 1088 sub decideoutput {
|
Line 1137 sub decideoutput {
|
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'EXCESS_FILESIZE') { |
} elsif ($award eq 'EXCESS_FILESIZE') { |
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$message = &mt("Submission won't be graded. The combined size of submitted files exceeded the amount allowed."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'FILENAME_INUSE') { |
} elsif ($award eq 'FILENAME_INUSE') { |