--- loncom/interface/lonaboutme.pm	2006/08/16 19:40:46	1.52
+++ loncom/interface/lonaboutme.pm	2006/08/18 13:49:34	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.52 2006/08/16 19:40:46 albertel Exp $
+# $Id: lonaboutme.pm,v 1.53 2006/08/18 13:49:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,12 +278,24 @@ sub print_portfiles_link {
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.&mt('Display file listing').
                    '</a><br /><br />';
-        $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'<ul>';
+        if ($filecounts->{'both'} == 1) {
+            $output .= &mt('One portfolio file owned by [_2] is available.',$filecounts->{'both'},$name).'<ul>';
+        } else {
+            $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'<ul>';
+        }
         if ($filecounts->{'withoutpass'}) {
-            $output .= '<li>'.&mt('[quant,_1,file] are publicly accessible.',$filecounts->{'withoutpass'}).'</li>';   
+            if ($filecounts->{'withoutpass'} == 1) {
+                $output .= '<li>'.&mt('[quant,_1,file] is publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
+            } else {
+                $output .= '<li>'.&mt('[quant,_1,file] are publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
+            }
         }
         if ($filecounts->{'withpass'}) {
-            $output .= '<li>'.&mt('[quant,_1,file] require a passphrase for access.',$filecounts->{'withpass'}).'</li>';
+            if ($filecounts->{'withpass'} == 1) {
+                $output .= '<li>'.&mt('[quant,_1,file] requires a passphrase for access.',$filecounts->{'withpass'}).'</li>';
+            } else {
+                $output .= '<li>'.&mt('[quant,_1,file] require a passphrase for access.',$filecounts->{'withpass'}).'</li>'; 
+            }
         }
         $output .= '</ul>';
     }
@@ -328,19 +340,21 @@ sub display_portfolio_header {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $forcestudent='';
     if ($env{'form.forcestudent'}) { $forcestudent='student'; };
-    my $output =
+    my $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.'));
+    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 .= '<h3>'.&mt('Portfolio files for [_1]',$name).'</h3>';
     $r->print($output);
     return;
@@ -367,7 +381,7 @@ sub display_portfolio_files {
         if ($portaccess eq $type) {
             $output .= 'selected="selected"';
         }
-        $output .= '>'.&mt($type).'</option>';
+        $output .= '>'.$lt{$type}.'</option>';
     }
     $output .= '</select>'."\n".
                '<input type="submit" name="portaccessbutton" value="'.
@@ -375,10 +389,12 @@ sub display_portfolio_files {
     $output .= '</form><br /><br />';
     $r->print($output);
     my $filecounts = &portfolio_files($r,'listfiles',\%lt);
-    my $query_string = &build_query_string();
-    $r->print('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.
-               '/aboutme'.$query_string.'">'.
-               &mt('Information about [_1]',$name).'</a>');
+    if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
+        my $query_string = &build_query_string();
+        $r->print('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.
+                  '/aboutme'.$query_string.'">'.
+                  &mt('Information about [_1]',$name).'</a>');
+    }
     return;
 }
 
@@ -482,7 +498,7 @@ sub parse_directory {
     $depth++;
     my $output;
 
-    my $portfolio_root =  &Apache::portfolio::get_portfolio_root($cdom,$cnum); 
+    my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum);
     my %dirlist = map {
 	    ((split('&',$_,2))[0],1)
 	} &Apache::lonnet::dirlist($path,$cdom,$cnum,$portfolio_root);