loncom/interface/portfolio.pm - diff

Return to portfolio.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/portfolio.pm between versions 1.222 and 1.224

version 1.222, 2010/03/26 23:08:41	version 1.224, 2010/06/20 03:13:46
Line 287 sub display_directory {	Line 287 sub display_directory {
my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,	my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
$can_modify,$can_delete,$can_setacl)=@_;	$can_modify,$can_delete,$can_setacl)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";	my $iconpath= $r->dir_config('lonIconsURL') . "/";
my $display_out;
my $select_mode;	my $select_mode;
my $checked_files;	my $checked_files;
my $port_path = &get_port_path();	my $port_path = &get_port_path();
Line 304 sub display_directory {	Line 303 sub display_directory {
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);	my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
my $now = time;	my $now = time;
if ($env{"form.mode"} eq 'selectfile') {	if ($env{"form.mode"} eq 'selectfile') {
&select_files($r);	&select_files($r);
$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});	$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
$select_mode = 'true';	$select_mode = 'true';
}
if ($is_empty && ($current_path ne '/') && $can_delete) {
$display_out = '<form method="post" action="'.$url.'">'.
&group_form_data().
'<input type="hidden" name="action" value="deletedir" />'.
'<p>'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
'</p>'.
'<input type="hidden" name="selectfile" value="" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
'</form>';

$r->print($display_out);
return;
}	}
if ($select_mode eq 'true') {	if ($select_mode eq 'true') {
$r->print('<form method="post" name="checkselect" action="'.$url.'">');	$r->print('<form method="post" name="checkselect" action="'.$url.'">');
$r->print(&Apache::loncommon::start_data_table()	$r->print(&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()	.&Apache::loncommon::start_data_table_header_row()
.'<th>'.&mt('Select').'</th>'	.'<th>'.&mt('Select').'</th>'
.'<th> </th><th> </th>'	.'<th> </th>'
	.'<th> </th>'
.'<th>'.&mt('Name').'</th>'	.'<th>'.&mt('Name').'</th>'
.'<th>'.&mt('Size').'</th>'	.'<th>'.&mt('Size').'</th>'
.'<th>'.&mt('Last Modified').'</th>'	.'<th>'.&mt('Last Modified').'</th>'
Line 336 sub display_directory {	Line 322 sub display_directory {
);	);
} else {	} else {
$r->print('<form method="post" action="'.$url.'">');	$r->print('<form method="post" action="'.$url.'">');
$r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',	$r->print(
&mt('Using the portfolio file list')));	'<p>'
	.&Apache::loncommon::help_open_topic(
	'Portfolio FileList',
	&mt('Using the portfolio file list'))
	.'</p>'
	);
$r->print(&Apache::loncommon::start_data_table()	$r->print(&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()	.&Apache::loncommon::start_data_table_header_row()
.'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'	.'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
.'<th> </th><th> </th>'	.'<th> </th>'
	.'<th> </th>'
.'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'	.'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
.'<th>'.&mt('Size').'</th>'	.'<th>'.&mt('Size').'</th>'
.'<th>'.&mt('Last Modified').'</th>'	.'<th>'.&mt('Last Modified').'</th>'
Line 349 sub display_directory {	Line 341 sub display_directory {
.'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'	.'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
.&Apache::loncommon::end_data_table_header_row());	.&Apache::loncommon::end_data_table_header_row());
}	}

	# Empty directory?
	if ($is_empty && ($current_path ne '/') && $can_delete) {
	my $cols = ($select_mode eq 'true') ? 7 : 9;
	# Empty message
	$r->print(
	&Apache::loncommon::start_data_table_row()
	.'<td colspan="'.$cols.'">'
	.'<p class="LC_info">'
	.&mt('This directory is empty.')
	.'</p>'
	.'</td>'
	.&Apache::loncommon::end_data_table_row()
	.&Apache::loncommon::end_data_table()
	.'</form>'
	);
	# Delete button
	$r->print(
	'<form method="post" action="'.$url.'">'.
	&group_form_data().
	'<input type="hidden" name="action" value="deletedir" />'.
	'<p>'.
	'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
	'</p>'.
	'<input type="hidden" name="selectfile" value="" />'.
	'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
	'</form>'
	);
	# Directory is empty, so nothing else to display
	return;
	}

$r->print("\n".&group_form_data()."\n");	$r->print("\n".&group_form_data()."\n");

my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;	my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
Line 1909 sub check_for_upload {	Line 1933 sub check_for_upload {
$found_file = 1;	$found_file = 1;
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {	if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$locked_file = 1;	$locked_file = 1;
}	}
	last;
}	}
}	}
my $getpropath = 1;	my $getpropath = 1;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.222
changed lines
	Added in v.1.224