');
+ $r->print($image);
+
+ $r->print('Kontakt');
+ $r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).''.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+
+
}
+
if ($allowed) {
+ if ($env{'form.popup'}) {
+ $r->print('
');
+ }
$r->print('');
}
if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');}
@@ -221,70 +298,131 @@ sub handler {
}
if ($target ne 'tex') {
- &print_portfiles_link($r);
+ # &print_portfiles_link($r,$is_course); #old Print files
+
}
- if ($env{'request.course.id'}) {
- if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
- if ($target ne 'tex') {
- $r->print('
');
- $r->print('
'.
- &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').' '.
- &mt('Shared by course faculty and staff').
- &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
-'
');
- &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
- $r->print('
');
- if (&Apache::lonnet::allowed('vsa',
- $env{'request.course.id'}) ||
- &Apache::lonnet::allowed('vsa',
- $env{'request.course.id'}.'/'.
- $env{'request.course.sec'})) {
- $r->print(&Apache::loncommon::track_student_link
- ('View recent activity by this student',
- $cnum,$cdom).(' 'x2));
- }
- $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
- } else {
- $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
- &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+ if ($env{'request.course.id'}
+ && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
+ && &in_course($cdom,$cnum)) {
+ if ($target ne 'tex') {
+ $r->print('
');
+ $r->print('
'.
+ &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').' '.
+ &mt('Shared by course faculty and staff').
+ &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
+ '
');
+ &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+ $r->print('
');
+ if (&Apache::lonnet::allowed('vsa',
+ $env{'request.course.id'}) ||
+ &Apache::lonnet::allowed('vsa',
+ $env{'request.course.id'}.'/'.
+ $env{'request.course.sec'})) {
+ $r->print(&Apache::loncommon::track_student_link
+ ('View recent activity by this student',
+ $cnum,$cdom).(' 'x2));
}
- }
+ $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+ } else {
+ $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
+ &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+ }
}
if ($target ne 'tex') {
+ if ($env{'form.popup'}) {
+ $r->print('
'.&mt('Close window').' ');
+ }
+ $r->print('
Viewable portfolio files ');
+ $output = '
';
+ $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).' '.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).' ';
$output .= ''.&mt('Display file listing').
+ $query_string.'">'.$lt{'difl'}.
' ';
+ if ($filecounts->{'both'} == 1) {
+ if ($is_course) {
+ $output .= &mt('One group portfolio file is available.').'';
+ } else {
+ $output .= &mt('One portfolio file owned by [_1] is available.',$name).'';
+ }
+ } else {
+ if ($is_course) {
+ $output .= &mt('A total of [_1] group portfolio files are available.',$filecounts->{'both'}).'';
+ } else {
+ $output .= &mt('A total of [_1] portfolio files owned by [_2] are available.',$filecounts->{'both'},$name).'';
+ }
+ }
if ($filecounts->{'withoutpass'}) {
- $output .= ''.&mt('[quant,_1,file] are publicly accessible.',$filecounts->{'withoutpass'}).' ';
+ $output .= ''.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).' ';
}
if ($filecounts->{'withpass'}) {
- $output .= ''.&mt('[quant,_1,file] require a passphrase for access.',$filecounts->{'withpass'}).' ';
+ $output .= ''.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).' ';
}
$output .= ' ';
+ $output .=' ';
}
$r->print($output);
return;
@@ -321,33 +459,44 @@ sub build_query_string {
}
sub display_portfolio_header {
- my ($r) = @_;
- my ($cdom,$cnum,$name) = &aboutme_info($r);
+ my ($r,$is_course) = @_;
+ my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
my $query_string = &build_query_string();
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $forcestudent='';
if ($env{'form.forcestudent'}) { $forcestudent='student'; };
- my $output =
- &Apache::loncommon::start_page('Viewable portfolio files',undef,
- {'function' => $forcestudent,
+
+ my $output;
+ if ($is_course) {
+ $output =
+ &Apache::loncommon::start_page('Viewable group portfolio files',undef,
+ {'function' => $forcestudent,
+ 'domain' => $cdom,});
+ $output .= '
'.&mt('Group Portfolio files').' ';
+ } else {
+ $output =
+ &Apache::loncommon::start_page('Viewable portfolio files',undef,
+ {'function' => $forcestudent,
'domain' => $cdom,});
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
- text=>"Personal information - $name",
- title=>"Go to personal information page for $name"},
- {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
- text=>"Viewable files - $name",
- title=>"Viewable portfolio files for $name"}
-);
- $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));
- $output .= '
'.&mt('Portfolio files for [_1]',$name).' ';
+ if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
+ text=>"Personal information - $name",
+ title=>"Go to personal information page for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
+ text=>"Viewable files - $name",
+ title=>"Viewable portfolio files for $name"}
+ );
+ $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));
+ }
+ $output .= '
'.&mt('Portfolio files for [_1]',$name).' ';
+ }
$r->print($output);
return;
}
sub display_portfolio_files {
- my ($r) = @_;
- my ($cdom,$cnum,$name) = &aboutme_info($r);
+ my ($r,$is_course) = @_;
+ my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
my %lt = ( withoutpass => 'passphrase not required',
withpass => 'passphrase protected',
both => 'all access types ',);
@@ -366,24 +515,31 @@ sub display_portfolio_files {
if ($portaccess eq $type) {
$output .= 'selected="selected"';
}
- $output .= '>'.&mt($type).'';
+ $output .= '>'.$lt{$type}.'';
}
$output .= ''."\n".
'
';
$output .= '
';
$r->print($output);
- my $filecounts = &portfolio_files($r,'listfiles',\%lt);
- my $query_string = &build_query_string();
- $r->print('
'.
- &mt('Information about [_1]',$name).' ');
+ my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course,
+ $cdom,$cnum,$name);
+ if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
+ my $query_string = &build_query_string();
+ $r->print('
');
+ if ($is_course) {
+ $r->print(&mt('Course Information page'));
+ } else {
+ $r->print(&mt('Information about [_1]',$name));
+ }
+ $r->print(' ');
+ }
return;
}
sub portfolio_files {
- my ($r,$mode,$lt) = @_;
- my ($cdom,$cnum,$name) = &aboutme_info($r);
+ my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_;
my $filecounts = {
withpass => 0,
withoutpass => 0,
@@ -393,7 +549,6 @@ sub portfolio_files {
&Apache::lonnet::get_portfile_permissions($cdom,$cnum);
my %access_controls =
&Apache::lonnet::get_access_controls($current_permissions);
- my %allfileshash;
my $portaccess;
if ($mode eq 'showlink') {
$portaccess = 'both';
@@ -404,10 +559,63 @@ sub portfolio_files {
}
}
- foreach my $filename (keys(%access_controls)) {
- my $access_status =
- &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,undef,
- $access_controls{$filename});
+ my $diroutput;
+ if ($is_course) {
+ my %files_by_group;
+ foreach my $filename (sort(keys(%access_controls))) {
+ my ($group,$path) = split('/',$filename,2);
+ $files_by_group{$group}{$path} = $access_controls{$filename};
+ }
+ foreach my $group (sort(keys(%files_by_group))) {
+ my %fileshash;
+ my $grpout .= &build_hierarchy($r,$cdom,$cnum,$portaccess,
+ $is_course,$filecounts,$mode,
+ $files_by_group{$group},
+ \%fileshash,$group);
+ if ($grpout) {
+ $diroutput .= '
'.$group.' '.$grpout.'
';
+ }
+ }
+ } else {
+ my %allfileshash;
+ $diroutput = &build_hierarchy($r,$cdom,$cnum,$portaccess,$is_course,
+ $filecounts,$mode,\%access_controls,
+ \%allfileshash);
+ }
+ if ($mode eq 'listfiles') {
+ if ($filecounts->{'both'}) {
+ $r->print($diroutput);
+ } else {
+ my $access_text;
+ if (ref($lt) eq 'HASH') {
+ $access_text = $lt->{$portaccess};
+ }
+ $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text));
+ }
+ }
+ return $filecounts;
+}
+
+{
+ my $count=0;
+ sub portfolio_table_start {
+ $count=0;
+ return '
';
+ }
+ sub portfolio_row_start {
+ $count++;
+ my $class = ($count%2)?'LC_odd_row'
+ :'LC_even_row';
+ return '';
+ }
+}
+
+sub build_hierarchy {
+ my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info,
+ $allfileshash,$group) = @_;
+ foreach my $filename (sort(keys(%{$access_info}))) {
+ my $access_status =
+ &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group, $$access_info{$filename});
if ($portaccess eq 'both') {
if (($access_status ne 'ok') &&
($access_status !~ /^[^:]+:guest_/)) {
@@ -425,7 +633,7 @@ sub portfolio_files {
if ($mode eq 'listfiles') {
$filename =~ s/^\///;
my @pathitems = split('/',$filename);
- my $lasthash = \%allfileshash;
+ my $lasthash = $allfileshash;
while (@pathitems > 1) {
my $newlevel = shift(@pathitems);
if (!exists($lasthash->{$newlevel})) {
@@ -443,43 +651,30 @@ sub portfolio_files {
}
$filecounts->{'both'} = $filecounts->{'withoutpass'} +
$filecounts->{'withpass'};
+ my $output;
if ($mode eq 'listfiles') {
- my $output;
- if (keys(%allfileshash) > 0) {
+ if ($filecounts->{'both'} > 0) {
$output = &portfolio_table_start();
- $output .= &parse_directory($r,0,\%allfileshash);
+ $output .= &parse_directory($r,0,$allfileshash,'',$is_course,
+ $group);
$output .= '
';
- } else {
- my $access_text;
- if (ref($lt) eq 'HASH') {
- $access_text = $lt->{$portaccess};
- }
- $output .= &mt('There are no available files of the specified access type: [_1]',$access_text);
}
- $r->print($output);
- }
- return $filecounts;
-}
-
-{
- my $count=0;
- sub portfolio_table_start {
- $count=0;
- return '
';
- }
- sub portfolio_row_start {
- $count++;
- my $class = ($count%2)?'LC_odd_row'
- :'LC_even_row';
- return '';
}
+ return $output;
}
sub parse_directory {
- my ($r,$depth,$currhash) = @_;
- my ($cdom,$cnum,$name) = &aboutme_info($r);
+ my ($r,$depth,$currhash,$path,$is_course,$group) = @_;
+ my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
$depth++;
my $output;
+
+ my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum,
+ $group);
+ my $getpropath = 1;
+ my %dirlist = map {
+ ((split('&',$_,2))[0],1)
+ } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath);
foreach my $item (sort(keys(%{$currhash}))) {
$output .= &portfolio_row_start();
$output .= '';
@@ -487,22 +682,44 @@ sub parse_directory {
my $title=&HTML::Entities::encode($item,'<>&"');
$output .= ' ';
- $output .= &parse_directory($r,$depth,$currhash->{$item});
+ $output .= &parse_directory($r,$depth,$currhash->{$item},
+ $path.'/'.$item,$is_course,$group);
} else {
- my $showname;
- if ($currhash->{$item} =~ m|/([^/]+)$|) {
- $showname = $1;
- } else {
- $showname = $currhash->{$item};
+ my $file_name;
+ if ($currhash->{$item} =~ m|/([^/]+)$|) {
+ $file_name = $1;
+ } else {
+ $file_name = $currhash->{$item};
+ }
+ my $have_meta = exists($dirlist{$file_name.'.meta'});
+ my $url;
+ if ($is_course) {
+ $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group.
+ '/portfolio/'.$currhash->{$item};
+ } else {
+ $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.
+ $currhash->{$item};
}
+ my $showname;
+ if ($have_meta) {
+ $showname = &Apache::lonnet::metadata($url,'title');
+ }
+ if ($showname eq '') {
+ $showname = $file_name;
+ } else {
+ $showname = $file_name.' ('.$showname.')';
+ }
+
$showname=&HTML::Entities::encode($showname,'<>&"');
- my $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.
- $currhash->{$item};
- $output .= ''.$showname.' ';
- $output.='';
+ if ($have_meta) {
+ $output.= ' ';
}
}