--- loncom/interface/portfolio.pm 2006/08/14 21:35:04 1.156.2.1
+++ loncom/interface/portfolio.pm 2006/08/24 17:38:21 1.161
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.156.2.1 2006/08/14 21:35:04 albertel Exp $
+# $Id: portfolio.pm,v 1.161 2006/08/24 17:38:21 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -191,6 +191,11 @@ sub display_directory_line {
}
if ($lock_info) {
my %anchor_fields = ('lockinfo' => $fullpath);
+ if ($versions) { # hold the folder open
+ my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+ $fname =~ s|^/||;
+ $anchor_fields{'showversions'} = $fname.'.'.$extension;
+ }
$lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
}
$r->print('<td colspan="2">'.$lock_info.'</td>');
@@ -358,7 +363,7 @@ sub display_directory {
currentpath => $current_path
);
$line .= &make_anchor($url,\%anchor_fields,'Rename');
- $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+ $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
# '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
}
$line .= '</td>';
@@ -496,6 +501,7 @@ sub done {
$message='Done';
}
my %anchor_fields = (
+ 'showversions' => $env{'form.showversions'},
'currentpath' => $env{'form.currentpath'},
'fieldname' => $env{'form.fieldname'},
'mode' => $env{'form.mode'}
@@ -636,15 +642,14 @@ sub display_access {
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
my $aclcount = keys(%access_controls);
my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
- my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public or passphrase-protected.');
+ my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
$info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
$info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
-# $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
-# $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
-# $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
- $info .= '</li></ul>';
+ $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
+ $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
+ $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
if ($group eq '') {
- $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a>"));
+ $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));
}
if ($can_setacl) {
@@ -1090,24 +1095,24 @@ sub access_setting_table {
$passwd.'" /></td>');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
-# $r->print('</td></tr><tr><td colspan="3"> </td></tr><tr><td valign="top">');
-# &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
-# $r->print('</td><td> </td><td valign="top">');
-# &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
-# $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
-# if (@courses > 0 || @groups > 0) {
-# $r->print('<td colspan="3" valign="top">');
-# } else {
-# $r->print('<td valign="top">');
-# }
-# &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
-# $r->print('</td>');
-# if (@courses > 0 || @groups > 0) {
-# $r->print('</tr><tr><td colspan="3"> </td></tr><tr><td colspan="3" valign="top">');
-# } else {
-# $r->print('<td> </td><td valign="top">');
-# }
-# &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
+ $r->print('</td></tr><tr><td colspan="3"> </td></tr><tr><td valign="top">');
+ &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+ $r->print('</td><td> </td><td valign="top">');
+ &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+ $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('<td colspan="3" valign="top">');
+ } else {
+ $r->print('<td valign="top">');
+ }
+ &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+ $r->print('</td>');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('</tr><tr><td colspan="3"> </td></tr><tr><td colspan="3" valign="top">');
+ } else {
+ $r->print('<td> </td><td valign="top">');
+ }
+ &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
$r->print('</td></tr></table>');
}
@@ -1678,7 +1683,10 @@ sub createdir {
}
sub get_portfolio_root {
- my ($uname,$udom) = &get_name_dom();
+ my ($udom,$uname) = @_;
+ if (!(defined($udom)) || !(defined($uname))) {
+ ($uname,$udom) = &get_name_dom();
+ }
my $path;
if (defined($env{'form.group'})) {
$path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';