[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm
amueller
amueller@source.lon-capa.org
Tue, 19 May 2009 10:03:37 -0000
This is a MIME encoded message
--amueller1242727417
Content-Type: text/plain
amueller Tue May 19 10:03:37 2009 EDT
Modified files:
/loncom/interface lonaboutme.pm
Log:
Replaced tabsymbol with 4 whitespaces to avoid conflicts with editors, where tabwidth expand i.e. to 8 whitespaces.
Use cvs diff -w to check, that between this revision (1.134) and the revision before (1.133) there is no difference
except the whitespaces.
--amueller1242727417
Content-Type: text/plain
Content-Disposition: attachment; filename="amueller-20090519100337.txt"
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.133 loncom/interface/lonaboutme.pm:1.134
--- loncom/interface/lonaboutme.pm:1.133 Fri May 15 13:43:46 2009
+++ loncom/interface/lonaboutme.pm Tue May 19 10:03:37 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.133 2009/05/15 13:43:46 amueller Exp $
+# $Id: lonaboutme.pm,v 1.134 2009/05/19 10:03:37 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -96,14 +96,14 @@
my $target=$env{'form.grade_target'};
# ------------------------------------------------------------ Print the screen
if ($target eq 'tex') {
- $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri);
my $is_course;
# Is this even a user?
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
- &Apache::loncommon::simple_error_page($r,'No info',
- 'No user information available');
+ &Apache::loncommon::simple_error_page($r,'No info',
+ 'No user information available');
return OK;
} else {
$is_course = &Apache::lonnet::is_course($cdom,$cnum);
@@ -141,8 +141,8 @@
# ------------------------------------------------------------ Get Query String
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['forceedit','forcestudent',
- 'register','popup']);
+ ['forceedit','forcestudent',
+ 'register','popup']);
# ----------------------------------------------- Available Portfolio file display
if (($target ne 'tex') && ($action eq 'portfolio')) {
@@ -168,8 +168,8 @@
if ($is_course) {
if ($target ne 'tex') {
- my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
- {href=>"/adm/aboutme",text=>"Course Information"}];
+ my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
+ {href=>"/adm/aboutme",text=>"Course Information"}];
my $start_page =
&Apache::loncommon::start_page(
"Course Information",
@@ -196,18 +196,18 @@
}
#------------Get rights
- my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
- my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
+ my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
+ my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
my $allowed=0;
- my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&
- ($env{'user.domain'} eq $cdom));
+ my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&
+ ($env{'user.domain'} eq $cdom));
if ($forcestudent or $target eq 'tex') { $allowed=0; }
# --------------------------------------- There is such a user, get environment
if ($target ne 'tex') {
- my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
my $args = {'function' => $forcestudent,
'domain' => $cdom,
'force_register' => $forceregister};
@@ -216,8 +216,8 @@
} else { # Don't show breadcrumbs in popup window
$args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];
}
- my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);
- $r->print($start_page);
+ my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);
+ $r->print($start_page);
#Print Privacy Note
if ($allowed) {
@@ -226,47 +226,47 @@
.&mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.')
.'</div>'
);
- }
+ }
#Print last modified
- my $lastmod;
+ my $lastmod;
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
$lastmod=$syllabus{'uploaded.lastmodified'};
$lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- $r->print('<div class="LC_info">');
- $r->print(&mt('Last updated').': '.$lastmod . '');
- $r->print('</div>');
+ $r->print('<div class="LC_info">');
+ $r->print(&mt('Last updated').': '.$lastmod . '');
+ $r->print('</div>');
}
}
#Print Help Text
- if ($target ne 'tex') {
- if($allowed){
- $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
- }
- }
+ if ($target ne 'tex') {
+ if($allowed){
+ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+ }
+ }
#----------------Print Functions
- if ($target ne 'tex') {
- $r->print(&Apache::lontemplate::start_functionslist());
+ if ($target ne 'tex') {
+ $r->print(&Apache::lontemplate::start_functionslist());
if ($allowed) {
- my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
+ my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
$r->print(&Apache::lontemplate::item_functionslist(
'<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
} elsif ($privleged) {
- my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
+ my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
$r->print(&Apache::lontemplate::item_functionslist(
'<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
- }
+ }
$r->print(&Apache::lontemplate::item_functionslist(
&Apache::lontemplate::send_message($r,$cnum,$cdom)));
- if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) {
- if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+ if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) {
+ if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$r->print(&Apache::lontemplate::item_functionslist(
&Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
- }
+ }
if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
&Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
$r->print(&Apache::lontemplate::item_functionslist(
@@ -274,52 +274,52 @@
}
$r->print(&Apache::lontemplate::item_functionslist(
&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)));
- }
+ }
$r->print(&Apache::lontemplate::end_functionslist());
}
#------Print Headtitle
- if ($target ne 'tex') {
- $r->print('<div class="LC_ContentBoxSpecial">');
- $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
- $r->print('<div class="LC_BoxPadding">' );
- if ($courseenv{'nickname'}) {
- $r->print('<h2>"'.$courseenv{'nickname'}.'"</h2>');
- }
- $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
- } else {
- $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
- $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
- }
+ if ($target ne 'tex') {
+ $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
+ $r->print('<div class="LC_BoxPadding">' );
+ if ($courseenv{'nickname'}) {
+ $r->print('<h2>"'.$courseenv{'nickname'}.'"</h2>');
+ }
+ $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
+ } else {
+ $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
+ $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
+ }
# does this user have privileges to post, etc?
- my $query_string;
+ my $query_string;
if (($env{'form.uploaddoc.filename'}) &&
($env{'form.storeupl'}) && ($allowed)) {
if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
- }
- $syllabus{'uploaded.photourl'}=
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+ }
+ $syllabus{'uploaded.photourl'}=
&Apache::lonnet::userphotoupload('uploaddoc','aboutme');
- }
+ }
$syllabus{'uploaded.lastmodified'}=time;
&Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
}
if ($allowed && $env{'form.delupl'}) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
- delete($syllabus{'uploaded.photourl'});
- &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum);
- }
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+ delete($syllabus{'uploaded.photourl'});
+ &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum);
+ }
}
if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (keys(%syllabusfields)) {
+ foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
$field=~s/\s+$//s;
$field=&Apache::lonfeedback::clear_out_html($field,$env{'user.adv'});
- $syllabus{$syl_field}=$field;
+ $syllabus{$syl_field}=$field;
}
$syllabus{'uploaded.lastmodified'}=time;
&Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
@@ -329,56 +329,56 @@
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'});
+ &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'});
#This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line.
- &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
- #---End Resize---
+ &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
+ #---End Resize---
- $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
+ $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
- if ($target eq 'tex') {
- $image=&Apache::lonxml::xmlparse($r,'tex',$image);
- }
+ if ($target eq 'tex') {
+ $image=&Apache::lonxml::xmlparse($r,'tex',$image);
+ }
}
if ($allowed) {
$r->print(
- '<form method="post" enctype="multipart/form-data">'.
+ '<form method="post" enctype="multipart/form-data">'.
'<h3>'.&mt('Upload a Photo').'</h3>'.
'<input type="file" name="uploaddoc" size="50" />'.
'<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
'<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
- '</form>');
- if ($syllabus{'uploaded.photourl'}) {
+ '</form>');
+ if ($syllabus{'uploaded.photourl'}) {
$r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
}
$r->print('<p>');
}
- if($allowed) {
- $r->print('<form method="post">');
- }
-
- if ($target ne 'tex') { #print Image
- &Apache::lontemplate::start_ContentBox($r);
- &Apache::lontemplate::end_ContentBox($r);
- $r->print($image);
+ if($allowed) {
+ $r->print('<form method="post">');
+ }
+
+ if ($target ne 'tex') { #print Image
+ &Apache::lontemplate::start_ContentBox($r);
+ &Apache::lontemplate::end_ContentBox($r);
+ $r->print($image);
- } #End Print Image
+ } #End Print Image
- #Print Content eg. Contactinfo aboutme,...
+ #Print Content eg. Contactinfo aboutme,...
&Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
#End Print Content
if ($target ne 'tex') { #Begin Print RSS and portfiles
- &print_portfiles_link($r,$is_course);
- if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
- $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
- &Apache::lontemplate::print_end_template($r);
- }
+ &print_portfiles_link($r,$is_course);
+ if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
+ &Apache::lontemplate::print_end_template($r);
+ }
} #End Print RSS and portfiles
@@ -388,7 +388,7 @@
$r->print('<input type="hidden" name="popup" value="'.
$env{'form.popup'}.'" />');
}
- $r->print('</form>');
+ $r->print('</form>');
}
if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
} else {
@@ -396,32 +396,32 @@
}
if ($env{'request.course.id'}
- && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
- && &in_course($cdom,$cnum)) {
- if ($target ne 'tex') {
- $r->print('<a name="coursecomment" />');
- &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
- $r->print('<span class="LC_info">');
- $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
- $r->print('</span> <p>');
+ && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
+ && &in_course($cdom,$cnum)) {
+ if ($target ne 'tex') {
+ $r->print('<a name="coursecomment" />');
+ &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
+ $r->print('<span class="LC_info">');
+ $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
+ $r->print('</span> <p>');
&Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
- $r->print('</p>');
- &Apache::lontemplate::print_end_template($r);
+ $r->print('</p>');
+ &Apache::lontemplate::print_end_template($r);
- } 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);
- }
+ } 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') {
- $r->print('</div>');
- $r->print('</div>');
+ $r->print('</div>');
+ $r->print('</div>');
if ($env{'form.popup'}) {
$r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
}
- $r->print(&Apache::loncommon::end_page());
+ $r->print(&Apache::loncommon::end_page());
} else {
- $r->print('\end{document}');
+ $r->print('\end{document}');
}
@@ -434,8 +434,8 @@
$type ||= 'any';
if (!defined($cdom) || !defined($cnum)) {
my $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
+ $cdom = $env{'course.'.$cid.'.domain'};
+ $cnum = $env{'course.'.$cid.'.num'};
}
my %roles = &Apache::lonnet::dump('roles',$udom,$uname);
my @course_roles = grep(m{^/\Q$cdom\E/\Q$cnum\E[/_]}, keys(%roles));
@@ -443,15 +443,15 @@
return 1 if ($type eq 'any');
my $now = time();
foreach my $role (@course_roles) {
- my (undef,$role_end,$role_start)=split(/\_/,$roles{$role});
- my $status = 'active';
- if ($role_start > 0 && $now < $role_start) {
- $status = 'future';
- }
- if ($role_end > 0 && $now > $role_end) {
- $status = 'previous';
- }
- return 1 if ($status eq $type);
+ my (undef,$role_end,$role_start)=split(/\_/,$roles{$role});
+ my $status = 'active';
+ if ($role_start > 0 && $now < $role_start) {
+ $status = 'future';
+ }
+ if ($role_end > 0 && $now > $role_end) {
+ $status = 'previous';
+ }
+ return 1 if ($status eq $type);
}
return 0;
}
@@ -479,10 +479,10 @@
'difl' => 'Display file listing',
);
if ($filecounts->{'both'} > 0) {
- $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
- $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4><div class="LC_BoxPadding">';
+ $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
+ $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4><div class="LC_BoxPadding">';
- #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
+ #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
$output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
$query_string.'">'.$lt{'difl'}.
'</a><br /><br />';
@@ -500,14 +500,14 @@
}
}
if ($filecounts->{'withoutpass'}) {
- $output .= '<li>'.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
+ $output .= '<li>'.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
}
if ($filecounts->{'withpass'}) {
- $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
+ $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
}
$output .= '</ul>';
- $output .='</p>';
- $output .='</div></div>';
+ $output .='</p>';
+ $output .='</div></div>';
}
$r->print($output);
return;
@@ -568,7 +568,7 @@
({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
text=>&mt('Personal Information Page - [_1]',$name),
title=>&mt('Go to personal information page for [_1]', $name)},
- {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
+ {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
text=>&mt('Viewable files - [_1]', $name),
title=>&mt('Viewable portfolio files for [_1]', $name)}
);
@@ -595,8 +595,8 @@
}
my $output = '<form action="'.&HTML::Entities::encode($r->uri,'<>&"')
- .'" name="displaystatus" method="post">'.
- &mt('File access type: ').'<select name="portaccess">';
+ .'" name="displaystatus" method="post">'.
+ &mt('File access type: ').'<select name="portaccess">';
foreach my $type ('withoutpass','withpass','both') {
$output .= '<option value="'.$type.'" ';
if ($portaccess eq $type) {
@@ -633,9 +633,9 @@
both => 0,
};
my $current_permissions =
- &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
+ &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
my %access_controls =
- &Apache::lonnet::get_access_controls($current_permissions);
+ &Apache::lonnet::get_access_controls($current_permissions);
my $portaccess;
if ($mode eq 'showlink') {
$portaccess = 'both';
@@ -746,54 +746,54 @@
$group);
my $getpropath = 1;
my %dirlist = map {
- ((split('&',$_,2))[0],1)
- } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath);
+ ((split('&',$_,2))[0],1)
+ } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath);
foreach my $item (sort(keys(%{$currhash}))) {
$output .= &Apache::loncommon::start_data_table_row();
$output .= '<td style="padding-left: '.($depth*25).'px">';
if (ref($currhash->{$item}) eq 'HASH') {
my $title=&HTML::Entities::encode($item,'<>&"');
$output .= '<img src="'.&Apache::loncommon::lonhttpdurl("/adm/lonIcons/navmap.folder.open.gif").'" alt="'.&mt('Folder').' '.$title.'" class="LC_icon" /> '.$title;
- $output .= '</td><td> </td>'
+ $output .= '</td><td> </td>'
.&Apache::loncommon::end_data_table_row();
$output .= &parse_directory($r,$depth,$currhash->{$item},
- $path.'/'.$item,$is_course,$group);
+ $path.'/'.$item,$is_course,$group);
} else {
- my $file_name;
- if ($currhash->{$item} =~ m|/([^/]+)$|) {
- $file_name = $1;
- } else {
- $file_name = $currhash->{$item};
- }
- my $have_meta = exists($dirlist{$file_name.'.meta'});
+ 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};
+ $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.')';
- }
+ 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,'<>&"');
$output .= '<a href="'.$url.'">'.
- '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />'.
- ' '.$showname.'</a>';
- $output.='</td><td>';
- if ($have_meta) {
- $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
- &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
- '" class="LC_icon" /></a>';
- }
- $output .= '</td>'
+ '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />'.
+ ' '.$showname.'</a>';
+ $output.='</td><td>';
+ if ($have_meta) {
+ $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
+ &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
+ '" class="LC_icon" /></a>';
+ }
+ $output .= '</td>'
.&Apache::loncommon::end_data_table_row();
}
}
--amueller1242727417--