--- loncom/interface/lonaboutme.pm	2012/11/09 17:27:10	1.151
+++ loncom/interface/lonaboutme.pm	2014/06/19 00:36:29	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.151 2012/11/09 17:27:10 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.157 2014/06/19 00:36:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,11 +78,12 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lontexconvert;
-use Apache::lonfeedback;
+use Apache::lonhtmlgateway;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
 use Apache::lontemplate;
+use Apache::longroup;
 use HTML::Entities();
 use Image::Magick;
 
@@ -139,9 +140,8 @@ sub handler {
 
 # ------------------------------------------------------------ Get Query String
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                        ['forceedit','forcestudent',
-                         'register','popup']);
-
+                        ['forceedit','forcestudent','todocs',
+                         'register','popup','folderpath','title']);
 # ----------------------------------------------- Available Portfolio file display
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
@@ -220,8 +220,22 @@ sub handler {
         if ($env{'form.popup'}) { # Don't show breadcrumbs in popup window 
             $args->{'no_nav_bar'} = 1;
         } elsif (!$env{'form.register'}) { #Don't show breadcrumbs twice, when this page is part of course content and you call it
-            $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",
-                                        text=>"Personal Information Page"}];
+            if (($env{'request.course.id'}) &&
+                 ($env{'form.folderpath'} =~ /^supplemental/)) {
+                my $crstype = &Apache::loncommon::course_type();
+                my $title = $env{'form.title'};
+                if ($title eq '') {
+                    $title = &mt('Personal Information Page');
+                }
+                my $brcrum =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                if (ref($brcrum) eq 'ARRAY') {
+                    $args->{'bread_crumbs'} = $brcrum;
+                }
+            } else {
+                $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);
@@ -299,8 +313,9 @@ sub handler {
     if (($allowed) && ($env{'form.storesyl'})) {
         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'});
+            chomp($field);
+            my $gateway = Apache::lonhtmlgateway->new();
+            $field = $gateway->process_incoming_html($field,1);
             $syllabus{$syl_field}=$field;
         }
         $syllabus{'uploaded.lastmodified'}=time;
@@ -392,7 +407,7 @@ sub handler {
     if ($target ne 'tex') {
         $r->print('</div>');
         if ($env{'form.popup'}) {
-            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
+            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
         }
         $r->print(&Apache::loncommon::end_page());
     } else {
@@ -527,7 +542,7 @@ sub display_portfolio_header {
                           title => &mt('Go to personal information page for [_1]',$name),
                           no_mt => 1},
                          {href  => "/adm/$cdom/$cnum/aboutme/portfolio".$query_string,
-                          text  => 'Viewable files',
+                          text  => &mt('Viewable files'),
                           title => &mt('Viewable portfolio files for [_1]',$name),
                           no_mt => 1}
                          ];
@@ -616,9 +631,12 @@ sub portfolio_files {
     my $diroutput;
     if ($is_course) {
         my %files_by_group;
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
         foreach my $filename (sort(keys(%access_controls))) {
             my ($group,$path) = split('/',$filename,2);
-            $files_by_group{$group}{$path} = $access_controls{$filename};
+            if (exists($curr_groups{$group})) {
+                $files_by_group{$group}{$path} = $access_controls{$filename};
+            }
         }
         foreach my $group (sort(keys(%files_by_group))) {
             my %fileshash;