--- loncom/interface/portfolio.pm	2006/08/08 19:36:54	1.149
+++ loncom/interface/portfolio.pm	2006/08/09 17:47:26	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.149 2006/08/08 19:36:54 banghart Exp $
+# $Id: portfolio.pm,v 1.152 2006/08/09 17:47:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ sub make_anchor {
     foreach my $field_name (keys(%$anchor_fields)) {
         $anchor .= $field_name.'='.$$anchor_fields{$field_name}.'&';
     }
-    $anchor =~ s\&$\\;
+    $anchor =~ s/&$//;
     $anchor .= &group_args();
     $anchor .= '">'.$inner_text.'</a>';
     return $anchor;
@@ -132,8 +132,7 @@ sub display_common {
 TABLE
     }
     my @tree = split (/\//,$current_path);
-    my %anchor_fields = ();
-    %anchor_fields = (
+    my %anchor_fields = (
         'selectfile'    => $port_path,
         'currentpath'   => '/',
         'mode'          => $env{"form.mode"},
@@ -145,8 +144,7 @@ TABLE
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            my %anchor_fields = ();
-            %anchor_fields = (
+            my %anchor_fields = (
                 'selectfile' => $tree[$i],
                 'currentpath' => '/',
                 'mode' => $env{"form.mode"},
@@ -173,16 +171,18 @@ sub display_directory_line {
     $r->print('<tr class="'.$css_class.'">');
     $r->print($line);
     $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-    $r->print('<td>'.$$version_flag{$filename}.'</td><td><a href="'.$href_location.$filename.'">'.
-	      $filename.'</a></td>'); 
+    $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
+    $r->print(&make_anchor($href_location.$filename,undef,$filename).'</td>'); 
     $r->print('<td>'.$size.'</td>');
     $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
     if ($select_mode ne 'true') {
 	$r->print('<td><span style="white-space: nowrap">'.
 		  &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
-	$r->print('<a href="'.$url.'?access='.$filename.
-		  '&amp;currentpath='.$current_path.&group_args().
-		  '">'.$access_admin_text.'</a></span></td>');
+        my %anchor_fields = (
+            'access' => $filename,
+            'currentpath' => $current_path
+        );
+	$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
     }
     $r->print('</tr>'.$/);
 }
@@ -268,10 +268,18 @@ sub display_directory {
     	        $show_versions = 'true';
     	    }
     	    if (exists($versioned{$filename})) {
+    	        my %anchor_fields = (
+    	            'selectfile' => $filename,
+    	            'continue' => 'false',
+    	            'currentpath' => $current_path,
+    	        );
     	        if ($show_versions) {
-                    $version_flag{$filename} = '<a href="portfolio?selectfile='.$filename.'&amp;continue=false&amp;currentpath='.$current_path.'"><img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+                    $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+                        '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
     	        } else {
-                    $version_flag{$filename} = '<a href="portfolio?selectfile='.$filename.'&amp;continue=false&amp;currentpath='.$current_path.'&amp;showversions='.$filename.'"><img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+    	            $anchor_fields{'showversions'} = $filename;
+                    $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+                        '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }
     	    } else {
     	        $version_flag{$filename} = '&nbsp;';
@@ -283,8 +291,7 @@ sub display_directory {
                 }
 		$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');
-                my %anchor_fields = ();
-                %anchor_fields = (
+                my %anchor_fields = (
                     'selectfile'    => $filename.'/',
                     'currentpath'   => $current_path.$filename.'/',
                     'mode'          => $env{"form.mode"},
@@ -306,7 +313,10 @@ sub display_directory {
 		    $line.=' /></td>';
                 } else {
                     if (exists $locked_files{$fullpath}) {
-                        $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.&group_args().'">Locked</a></td>';
+                        my %anchor_fields = (
+                            'lockinfo' => $current_path.$filename
+                        );
+                        $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
 			$css_class= 'LC_browser_file_locked';
                     } else {
                         if (!$can_modify) {
@@ -320,8 +330,13 @@ sub display_directory {
                         if ($can_modify) {
                             my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
-                            $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';
-                            $line .= '</td><td>'.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+                            my %anchor_fields = (
+                                'rename' => $filename,
+                                currentpath => $current_path
+                            );
+                            $line .= &make_anchor($url,\%anchor_fields,'Rename');
+                            $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+                            # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
                     }