--- loncom/interface/lonaboutme.pm	2006/08/02 20:23:33	1.46
+++ loncom/interface/lonaboutme.pm	2006/08/04 19:42:55	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.46 2006/08/02 20:23:33 albertel Exp $
+# $Id: lonaboutme.pm,v 1.48 2006/08/04 19:42:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,7 @@ sub handler {
     if ($target eq 'tex') {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     }
-    my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
+    my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri);
 # Is this even a user?
     if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
 	&Apache::loncommon::simple_error_page($r,'No info',
@@ -62,18 +62,14 @@ sub handler {
        'ccc_webreferences' => 'Web References');
 
 # ------------------------------------------------------------ Get Query String
-    &Apache::loncommon::get_unprocessed_cgi
-        ($ENV{'QUERY_STRING'},['forceedit','forcestudent','register','action']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['forceedit','forcestudent',
+					     'register']);
 
 # ----------------------------------------------- Available Portfolio file display 
-    if (($target ne 'tex') && ($env{'form.action'} eq 'portfolio')) {
-        my %lt = &Apache::lonlocal::texthash (
-                  withoutpass => 'passphrase not required',
-                  withpass    => 'passphrase protected',
-                  both        => 'all access types ',
-        );
+    if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r);
-        &display_portfolio_files($r,\%lt);
+        &display_portfolio_files($r);
         $r->print(&Apache::loncommon::end_page());
         return OK;
     }
@@ -93,7 +89,7 @@ sub handler {
 	my $start_page = 
 	    &Apache::loncommon::start_page("Personal Information",undef,
 					   {'function'       => $forcestudent,
-					    'domain'         => $cdom,
+ 					    'domain'         => $cdom,
 					    'force_register' =>
 						            $forceregister,});
 	$r->print($start_page);
@@ -274,11 +270,11 @@ sub print_portfiles_link {
     my ($r) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r);
     my $filecounts = &portfolio_files($r,'showlink');
-    my $query_string = &build_query_string({'action' => 'portfolio',});
+    my $query_string = &build_query_string();
     my $output;
     if ($filecounts->{'both'} > 0) {
         $output = &mt('<h3>Viewable portfolio files</h3>');
-        $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme'.
+        $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>';
@@ -298,9 +294,9 @@ sub build_query_string {
     my ($new_items) = @_;
     my $query_string;
     my @formelements = ('register'); 
-    my $nonew = 1;
+    my $new = 0;
     if (ref($new_items) eq 'HASH') {
-        $nonew = 0;
+        $new = 1;
         if (!defined($new_items->{'forceedit'}) && 
             !defined($new_items->{'forcestudent'})) {
             push(@formelements,('forceedit','forcestudent'));
@@ -310,12 +306,12 @@ sub build_query_string {
     }
     foreach my $element (@formelements) {
         if (exists($env{'form.'.$element})) {
-            if (($nonew) || (!defined($new_items->{$element}))) {
+            if ((!$new) || (!defined($new_items->{$element}))) {
                 $query_string .= '&amp;'.$element.'='.$env{'form.'.$element};
             }
         }
     }
-    if (!$nonew) {
+    if ($new) {
         foreach my $key (keys(%{$new_items})) {
             $query_string .= '&amp;'.$key.'='.$new_items->{$key};
         }
@@ -339,7 +335,7 @@ sub display_portfolio_header {
         ({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
           text=>"Personal information - $name",
           title=>"Go to personal information page for $name"},
-         {href=>"/adm/$cdom/$cnum/aboutme?action=portfolio",
+         {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
           text=>"Viewable files - $name",
           title=>"Viewable portfolio files for $name"}
 );
@@ -350,12 +346,18 @@ sub display_portfolio_header {
 }
 
 sub display_portfolio_files {
-    my ($r,$lt) = @_;
+    my ($r) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r);
+    my %lt = ( withoutpass => 'passphrase not required',
+	       withpass    => 'passphrase protected',
+	       both        => 'all access types ',);
+    %lt = &Apache::lonlocal::texthash(%lt);
+
     my $portaccess = 'withoutpass';
     if (exists($env{'form.portaccess'})) {
         $portaccess = $env{'form.portaccess'};
     }
+
     my $output = '<form action="'.&HTML::Entities::encode($r->uri,'<>&"')
 	.'" name="displaystatus" method="post">'.
 	&mt('File access type: ').'<select name="portaccess">';
@@ -364,16 +366,14 @@ sub display_portfolio_files {
         if ($portaccess eq $type) {
             $output .= 'selected="selected"';
         }
-        $output .= '>'.$lt->{$type}.'</option>';
+        $output .= '>'.&mt($type).'</option>';
     }
     $output .= '</select>'."\n".
                '<input type="submit" name="portaccessbutton" value="'.
-               &mt('Update display').'" />'.
-               '<input type="hidden" name="action" value="'.
-               $env{'form.action'}.'" />';
+               &mt('Update display').'" />';
     $output .= '</form><br /><br />';
     $r->print($output);
-    my $filecounts = &portfolio_files($r,'listfiles',$lt);
+    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.'">'.
@@ -486,7 +486,7 @@ sub parse_directory {
         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" />&nbsp;'.$title;
-	    $output .= '</td></tr>';
+	    $output .= '</td><td></td></tr>';
             $output .= &parse_directory($r,$depth,$currhash->{$item});
         } else {
             my $showname;
@@ -496,7 +496,13 @@ sub parse_directory {
                 $showname = $currhash->{$item};
             }
             $showname=&HTML::Entities::encode($showname,'<>&"');
-            $output .= '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />&nbsp;<a href="/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.$currhash->{$item}.'">'.$showname.'</a>';
+	    my $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.
+		$currhash->{$item};
+            $output .= '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />&nbsp;<a href="'.$url.'">'.$showname.'</a>';
+	    $output.='</td><td><a href="'.$url.'.meta"><img align="right" alt="'.&mt('Catalog Information').'" src="'.
+		&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
+		'" /></a>';
+
 	    $output .= '</td></tr>';
         }
     }