--- loncom/interface/portfolio.pm 2007/03/20 15:36:14 1.178
+++ loncom/interface/portfolio.pm 2008/01/21 11:36:07 1.187
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.178 2007/03/20 15:36:14 albertel Exp $
+# $Id: portfolio.pm,v 1.187 2008/01/21 11:36:07 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -99,7 +99,7 @@ sub display_common {
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
# FIXME: This line should be deleted once Portfolio uses breadcrumbs
- $r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio'));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));
$r->print(<<"TABLE");
<table id="LC_portfolio_actions">
@@ -267,15 +267,16 @@ sub display_directory {
} else {
$r->print('<form method="post" action="'.$url.'">');
$r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
- 'Using the portfolio file list'));
+ &mt('Using the portfolio file list')));
$r->print('<table id="LC_browser">'.
- '<tr><th colspan="2">Actions'.
- &Apache::loncommon::help_open_topic('Portfolio FileAction').
- '</th><th> </th><th> </th><th>Name'.
- &Apache::loncommon::help_open_topic('Portfolio OpenFile').
- '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.
- &Apache::loncommon::help_open_topic('Portfolio ShareFile').
- '</th></tr>');
+ '<tr>'
+ .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
+ .'<th> </th><th> </th>'
+ .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
+ .'<th>'.&mt('Size').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
+ .'</tr>');
}
$r->print("\n".&group_form_data()."\n");
@@ -289,8 +290,6 @@ sub display_directory {
my ($bfile)=split('&',$b,2);
return (lc($afile) cmp lc($bfile));
} (@$dir_list)) {
- #$strip holds directory/file name
- #$dom
my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
$filename =~ s/\s+$//;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
@@ -451,7 +450,7 @@ sub display_directory {
$r->print('</table>');
if ($can_delete) {
$r->print('
- <input type="submit" name="doit" value="Delete Checked Files" />'.
+ <input type="submit" name="doit" value="'.&mt('Delete Checked Files').'" />'.
&Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
<input type="hidden" name="action" value="delete" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
@@ -566,10 +565,10 @@ sub delete_confirmed {
$env{'form.currentpath'}.
$delete_file);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'.
- &mt('An error occured ([_1]) while trying to delete
- [_2].',$result,&display_file(undef, $delete_file)).
- '</span><br /><br />');
+ $r->print('<span class="LC_error">'
+ .&mt('An error occurred ([_1]) while trying to delete [_2].'
+ ,$result,&display_file(undef, $delete_file))
+ .'</span><br /><br />');
} else {
$r->print(&mt('File: [_1] deleted.',
&display_file(undef,$delete_file)));
@@ -588,7 +587,7 @@ sub delete_confirmed {
&Apache::lonnet::modify_access_controls($file_name,\%changes,
$udom,$uname);
if ($outcome ne 'ok') {
- $r->print('<br />'.&mt("An error occured ([_1]) while ".
+ $r->print('<br />'.&mt("An error occurred ([_1]) while ".
"trying to delete access controls for the file.",$outcome).
'</span><br /><br />');
} else {
@@ -596,7 +595,7 @@ sub delete_confirmed {
$r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
} else {
$r->print('<span class="LC_error">'.'<br />'.
- &mt("An error occured ([_1]) while ".
+ &mt("An error occurred ([_1]) while ".
"trying to delete access controls for the file.",$deloutcome).
'</span><br /><br />');
}
@@ -626,15 +625,12 @@ sub delete_dir_confirmed {
$directory_name);
if ($result ne 'ok') {
- $r->print('<span class="LC_error"> An error occured (dir) ('.$result.
+ $r->print('<span class="LC_error"> An error occurred (dir) ('.$result.
') while trying to delete '.$directory_name.'</span><br />');
} else {
# now remove from recent
-# $r->print('<br /> removing '.$directory_name.'<br /');
&Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
my @dirs = split m!/!, $directory_name;
-
-# $directory_name =~ m/^(\/*\/)(\/*.)$/;
$directory_name='/';
for (my $i=1; $i < (@dirs - 1); $i ++){
$directory_name .= $dirs[$i].'/';
@@ -681,7 +677,7 @@ sub rename_confirmed {
$chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
} else {
$r->print('<span class="LC_error">'.
- &mt('An error occured ([_1]) while trying to rename [_2]'
+ &mt('An error occurred ([_1]) while trying to rename [_2]'
.' to [_3]',$result,&display_file(),
&display_file('',$filenewname)).'</span><br />');
return;
@@ -718,13 +714,13 @@ sub access_for_renamed {
&Apache::lonnet::modify_access_controls($oldfile,\%change_old,
$udom,$uname);
if ($outcome ne 'ok') {
- $chg_text ='<br /><br />'.&mt("An error occured ([_1]) while ".
+ $chg_text ='<br /><br />'.&mt("An error occurred ([_1]) while ".
"trying to delete access control records for the old name.",$outcome).
'</span><br />';
} else {
if ($deloutcome ne 'ok') {
$chg_text = '<br /><br /><span class="LC_error"><br />'.
- &mt("An error occured ([_1]) while ".
+ &mt("An error occurred ([_1]) while ".
"trying to delete access control records for the old name.",$deloutcome).
'</span><br />';
}
@@ -734,7 +730,7 @@ sub access_for_renamed {
$udom,$uname);
if ($outcome ne 'ok') {
$chg_text .= '<br /><br />'.
- &mt("An error occured ([_1]) while ".
+ &mt("An error occurred ([_1]) while ".
"trying to update access control records for the new name.",$outcome).
'</span><br />';
}
@@ -779,14 +775,14 @@ sub display_access {
if ($can_setacl) {
&open_form($r,$url);
$r->print($header.$info);
- $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
- $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
- $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
+ $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access')));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings')));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access')));
&access_setting_table($r,$url,$file_name,$access_controls{$file_name},
$action);
my $button_text = {
'continue' => &mt('Proceed'),
- 'cancel' => &mt('Back to directory listing'),
+ 'cancel' => &mt('Back to Directory'),
};
&close_form($r,$url,$button_text);
} else {
@@ -1014,7 +1010,7 @@ sub update_access {
} else {
if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
$errors .= '<span class="LC_error">'.
- &mt('A problem occurred storing access control settings: [_1]',$outcome).
+ &mt('A problem occurred saving access control settings: [_1]',$outcome).
'</span>';
}
}
@@ -1203,7 +1199,7 @@ sub access_setting_table {
sub standard_settings {
my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
$publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
- $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');
+ $r->print('<h3>'.&mt('Public access: [_1]',&mt($publictext)).'</h3>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
@@ -1219,7 +1215,7 @@ sub standard_settings {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print('</td><td width="40"> </td><td valign="top">');
- $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');
+ $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',&mt($guesttext)).'</h3>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
@@ -1265,7 +1261,7 @@ sub standard_settings {
'action' => 'chgconditions',
'currentpath' => $env{'form.currentpath'},
);
- $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');
+ $r->print('<h3>'.&mt('Conditional access: [_1]',&mt($conditionstext)).'</h3>');
if ($numconditionals > 0) {
my $count = 1;
my $chg = 'none';
@@ -1370,8 +1366,8 @@ sub display_access_row {
}
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No [_1]-based conditions defined.<br />',$type).
- &additional_item($type));
+ $r->print(&mt('No [_1]-based conditions defined.',$type).'<br />'
+ .&additional_item($type));
}
return;
}
@@ -1733,17 +1729,18 @@ ENDSMP
fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
}
}
- opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
+ var hwfield = opener.document.getElementsByName('$env{'form.fieldname'}');
+ hwfield[0].value = fileList;
self.close();
}
</script>
ENDSMP
$r->print($javascript);
- $r->print("<h1>Select portfolio files</h1>
- Check as many as you wish in response to the problem.<br />");
+ $r->print("<h1>".&mt('Select portfolio files')."</h1>".
+ &mt('Check as many as you wish in response to the problem.')."<br />");
my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
if (@otherfiles) {
- $r->print("<strong>Files selected from other directories:</strong><br />");
+ $r->print("<strong>".&mt('Files selected from other directories:')."</strong><br />");
foreach my $file (@otherfiles) {
$r->print($file."<br />");
}
@@ -1777,17 +1774,23 @@ sub check_for_upload {
my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
if (($current_disk_usage + $filesize) > $disk_quota){
- my $msg = '<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
- '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.';
+ my $msg = '<span class="LC_error">'.
+ &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
+ '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
return ('will_exceed_quota',$msg);
} elsif ($found_file) {
if ($locked_file) {
- my $msg = '<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$path.'</strong></span>'.
- '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.';
+ my $msg = '<span class="LC_error">';
+ $msg .= &mt('Unable to upload [_1] a locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+ $msg .= '</span><br />';
+ $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
return ('file_locked',$msg);
} else {
- my $msg = '<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$path.'</strong></span>'.
- '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$path;
+ my $msg = '<span class="LC_error">';
+ $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
+ $msg .= '</span>';
+ $msg .= '<br />';
+ $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
return ('file_exists',$msg);
}
}
@@ -1818,7 +1821,7 @@ sub upload {
$port_path.$env{'form.currentpath'},
$mode,\%allfiles,\%codebase);
if ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.'An errror occured ('.$result.
+ $r->print('<span class="LC_error">'.'An error occurred ('.$result.
') while trying to upload '.&display_file().'</span><br />');
$r->print(&done('Back',$url));
} else {
@@ -1829,8 +1832,12 @@ sub upload {
<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
<input type="hidden" name="mode" value="$env{'form.mode'}" />
STATE
- $r->print("<p>Completed upload of the file. This file contained references to other files. You can upload these now: </p>");
- $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,{'error_on_invalid_names' => 1}));
+ $r->print("<h2>".&mt("Reference Warning")."</h2>");
+ $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
+ $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
+ $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
+ {'error_on_invalid_names' => 1,
+ 'ignore_remote_references' => 1,}));
$r->print('<p>Or '.&done('Return to directory listing',$url).'</p>');
} else {
$r->print(&done(undef,$url));
@@ -1842,11 +1849,16 @@ sub upload_embedded {
my ($r,$url,$group)=@_;
for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
-
+ my $orig_uploaded_filename =
+ $env{'form.embedded_item_'.$i.'.filename'};
+
$env{'form.embedded_orig_'.$i} =
&unescape($env{'form.embedded_orig_'.$i});
my ($path,$fname) =
($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
+ # no path, whole string is fname
+ if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
+
$path = $env{'form.currentpath'}.$path;
$fname = &Apache::lonnet::clean_filename($fname);
@@ -1868,8 +1880,8 @@ sub upload_embedded {
&Apache::lonnet::userfileupload('embedded_item_'.$i,'',
$port_path.$path);
if ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.'An errror occured ('.$result.
- ') while trying to upload '.&display_file($path,$fname).'</span><br />');
+ $r->print('<span class="LC_error">'.'An error occurred ('.$result.
+ ') while trying to upload '.$orig_uploaded_filename.' for embedded element '.$env{'form.embedded_orig_'.$i}.'</span><br />');
next;
} else {
$r->print("<p> Uploaded ".
@@ -1919,7 +1931,7 @@ sub lock_info {
}
}
}
- $r->print(&done('Back',$url));
+ $r->print(&done(&mt('Back'),$url));
return 'ok';
}
@@ -1943,20 +1955,20 @@ sub createdir {
}
}
if ($found_file){
- $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
- ' </strong>a file or directory by that name already exists.</span><br />');
+ $r->print('<span class="LC_error">'.&mt('Unable to create a directory named').' <strong>'.$newdir.
+ '</strong>. '.&mt('A file or directory by that name already exists.').'</span><br />');
} else {
my ($uname,$udom) = &get_name_dom();
my $port_path = &get_port_path();
my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'.'An errror occured ('.$result.
+ $r->print('<span class="LC_error">'.'An error occurred ('.$result.
') while trying to create a new directory '.&display_file().'</span><br />');
}
}
if ($newdir ne $env{'form.newdir'}) {
- $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");
+ $r->print(&mt("The new directory name was changed from:")."<br /><strong>".$env{'form.newdir'}."</strong> ".&mt('to')." <strong>$newdir </strong>");
}
$r->print(&done(undef,$url));
}
@@ -2151,16 +2163,16 @@ sub handler {
$env{'request.course.id'}.'/'.$group))) {
$portfolio_root = &get_portfolio_root();
} else {
- $r->print('You do not have the privileges required to access the shared files space for this group.');
+ $r->print(&mt('You do not have the privileges required to access the shared files space for this group.'));
$earlyout = 1;
}
} else {
- $r->print('Not a valid group for this course');
+ $r->print(&mt('Not a valid group for this course'));
$earlyout = 1;
}
$title = &mt('Group files').' for '.$group;
} else {
- $r->print('Invalid group');
+ $r->print(&mt('Invalid group'));
$earlyout = 1;
}
if ($earlyout) { return OK; }
@@ -2216,16 +2228,14 @@ sub handler {
return OK;
}
if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
- $r->print('<span class="LC_error">'.
- 'No file was selected to upload.'.
- 'To upload a file, click <strong>Browse...</strong>'.
- ', select a file, then click <strong>Upload</strong>.'.
- '</span>');
+ $r->print('<span class="LC_error">');
+ $r->print(&mt('No file was selected to upload. '));
+ $r->print(&mt('To upload a file, click <strong>Browse...</strong> select a file, then click <strong>Upload</strong>.'));
+ $r->print('</span>');
}
if ($env{'form.meta'}) {
&open_form($r,$url);
-# $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
- $r->print('Edit the meta data<br />');
+ $r->print(&mt('Edit the meta data').'<br />');
&close_form($r,$url);
}
if ($env{'form.store'}) {