--- loncom/interface/portfolio.pm 2006/07/19 10:26:43 1.121.2.6
+++ loncom/interface/portfolio.pm 2006/07/04 23:52:10 1.129
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.121.2.6 2006/07/19 10:26:43 albertel Exp $
+# $Id: portfolio.pm,v 1.129 2006/07/04 23:52:10 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,6 @@ use Apache::lonfeedback;
use Apache::lonlocal;
use Apache::lonnet;
use Apache::longroup;
-use Apache::lonhtmlcommon;
use HTML::Entities;
use LONCAPA;
@@ -197,7 +196,7 @@ sub display_directory {
$filename =~ s/\s+$//;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if ($version) {
- $versioned{$fname} .= $version.",";
+ $versioned{$fname.'.'.$extension} .= $version.",";
}
push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
}
@@ -205,6 +204,12 @@ sub display_directory {
my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
+ my $version_flag;
+ if (exists($versioned{$filename})) {
+ $version_flag = ' (*) ';
+ } else {
+ $version_flag = '';
+ }
if ($dirptr&$testdir) {
my $colspan='colspan="2"';
if ($select_mode eq 'true'){
@@ -212,18 +217,12 @@ sub display_directory {
}
$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
$r->print('<td>Go to ...</td>');
- $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');
+ $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).$version_flag.'</td>');
$r->print('</tr>');
} else {
my $css_class = 'LC_browser_file';
my $line;
- my $version_flag;
- if (exists($versioned{$fname})) {
- $version_flag = "*";
- } else {
- $version_flag = "";
- }
- my $fullpath = $current_path.$filename;
+ my $fullpath = $current_path.$filename;
$fullpath = &prepend_group($fullpath,$group);
if ($select_mode eq 'true') {
$line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
@@ -248,7 +247,7 @@ sub display_directory {
my $cat='<img alt="'.&mt('Catalog Information').
'" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
$line .= '<a href="'.$url.'?rename='.$filename.'&currentpath='.$current_path.$groupecho.'">Rename</a>';
- $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+ $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>'.$version_flag;
}
$line .= '</td>';
}
@@ -290,7 +289,7 @@ sub display_directory {
}
$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
$r->print('<td><a href="'.$href_location.$filename.'">'.
- $filename.'</a></td>');
+ $filename.'</a>'.$version_flag.'</td>');
$r->print('<td>'.$size.'</td>');
$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
if ($select_mode ne 'true') {
@@ -527,7 +526,7 @@ sub rename_confirmed {
}
sub display_access {
- my ($r,$url,$group,$can_setacl,$port_path) = @_;
+ my ($r,$url,$group,$can_setacl) = @_;
my ($uname,$udom) = &get_name_dom($group);
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
$file_name = &prepend_group($file_name,$group);
@@ -535,23 +534,8 @@ sub display_access {
$uname);
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 portfolio 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, passphrase-protected or conditional.').
- '<br /><ul><li>'.
- &mt('Public files are available to anyone without the need for login.').
- '</li><li>'.
- &mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').
- '</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 />'.
- #&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').
- #'<br />'.
- #&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').
- '</li></ul>';
+ my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$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, passphrase-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</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 />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
if ($can_setacl) {
&open_form($r,$url);
$r->print($header.$info);
@@ -706,7 +690,7 @@ sub build_access_summary {
sub update_access {
- my ($r,$url,$group,$port_path) = @_;
+ my ($r,$url,$group) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -732,7 +716,7 @@ sub update_access {
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
- $port_path.$file_name).'</h3>'."\n");
+ $file_name).'</h3>'."\n");
$file_name = &prepend_group($file_name,$group);
my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -828,10 +812,7 @@ sub update_access {
}
$r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
'&currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
- &mt('Display all access settings for this file').'</a>'.
- ' '.
- '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
- $group_arg.'">'.&mt('Return to directory listing').'</a>');
+ &mt('Display all access settings for this file').'</a>');
}
return;
}
@@ -1001,25 +982,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>');
}
@@ -1688,24 +1668,6 @@ sub missing_priv {
return;
}
-sub coursegrp_portfolio_header {
- my ($cdom,$cnum,$group,$grp_desc)=@_;
- my $gpterm = &Apache::loncommon::group_term();
- my $ucgpterm = $gpterm;
- $ucgpterm =~ s/^(\w)/uc($1)/e;
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/$cdom/$cnum/$group/smppg",
- text=>"$ucgpterm: $grp_desc",
- title=>"Go to group's home page"},
- {href=>"//?group=$group",
- text=>"Group Portfolio",
- title=>"Display group portfolio"},);
- my $output = &Apache::lonhtmlcommon::breadcrumbs(
- &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
- return $output;
-}
-
-
sub handler {
# this handles file management
my $r = shift;
@@ -1713,7 +1675,7 @@ sub handler {
['selectfile','currentpath','meta','lockinfo','currentfile','action',
'fieldname','mode','rename','continue','group','access','setnum',
'cnum','cdom','type','setroles']);
- my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
+ my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
$caller = $2;
@@ -1737,9 +1699,6 @@ sub handler {
my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
if (%curr_groups) {
- my %grp_content = &Apache::longroup::get_group_settings(
- $curr_groups{$group});
- $grp_desc = &unescape($grp_content{'description'});
if (($view_permission) || (&Apache::lonnet::allowed('rgf',
$env{'request.course.id'}.'/'.$group))) {
$portfolio_root = &get_portfolio_root($group);
@@ -1786,7 +1745,6 @@ sub handler {
$can_setacl = 1;
}
- my $port_path = &get_port_path($group);
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1864,10 +1822,10 @@ sub handler {
} elsif ($env{'form.access'}) {
$env{'form.selectfile'} = $env{'form.access'};
$env{'form.action'} = 'chgaccess';
- &display_access($r,$url,$group,$can_setacl,$port_path);
+ &display_access($r,$url,$group,$can_setacl);
} elsif ($env{'form.action'} eq 'chgaccess') {
if ($can_setacl) {
- &update_access($r,$url,$group,$port_path);
+ &update_access($r,$url,$group);
} else {
&missing_priv($r,$url,'setacl',$group);
}
@@ -1890,10 +1848,6 @@ sub handler {
if ($env{'form.currentpath'}) {
$current_path = $env{'form.currentpath'};
}
- if ($caller eq 'coursegrp_portfolio') {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc));
- }
my @dir_list=&get_dir_list($portfolio_root,$group);
if ($dir_list[0] eq 'no_such_dir'){
# two main reasons for this: