--- loncom/interface/portfolio.pm	2006/10/19 20:36:12	1.165
+++ loncom/interface/portfolio.pm	2006/11/01 02:03:16	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.165 2006/10/19 20:36:12 albertel Exp $
+# $Id: portfolio.pm,v 1.167 2006/11/01 02:03:16 rezaferry Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -95,6 +95,13 @@ sub display_common {
 					 'createdir_label' => 
 					 'Create subdirectory in current directory:');
         my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
+		my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
+		my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
+		
+		# TO BE DEPRECATED: This line should be deleted once Portfolio uses breadcrumbs
+		$r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio'));
+		# END LINE TO BE DEPRECATED
+		
         $r->print(<<"TABLE"); 
 <table id="LC_portfolio_actions">
   <tr id="LC_portfolio_upload">
@@ -109,7 +116,7 @@ sub display_common {
 	<input type="hidden" name="action" value="$env{"form.action"}" />
 	<input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
 	<input type="hidden" name="mode" value="$env{"form.mode"}" />
-	<input type="submit" name="storeupl" value="$text{'upload'}" />
+	<input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload
       </form>
     </td>
   </tr>
@@ -124,7 +131,7 @@ sub display_common {
         <input type="hidden" name="action" value="$env{"form.action"}" />
         <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
         <input type="hidden" name="mode" value="$env{"form.mode"}" />
-        <input type="submit" name="createdir" value="$text{'createdir'}" />
+        <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir
       </form>
     </td>
   </tr>
@@ -155,6 +162,7 @@ TABLE
         }
     }
     $r->print('</span>');
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
     &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
     $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"}.&group_args());
     $r->print('">'.
@@ -259,8 +267,13 @@ sub display_directory {
             '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {
         $r->print('<form method="post" action="'.$url.'">');
+		$r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', 'Using the portfolio file list'));
         $r->print('<table id="LC_browser">'.
-            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
+            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.
+			&Apache::loncommon::help_open_topic('Portfolio OpenFile').
+			'</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.
+			&Apache::loncommon::help_open_topic('Portfolio ShareFile').		
+			'</th></tr>');
     }
     $r->print("\n".&group_form_data()."\n");
 
@@ -436,7 +449,8 @@ sub display_directory {
         $r->print('</table>');
         if ($can_delete) {
             $r->print('
-        <input type="submit" name="doit" value="Delete Checked Files" />
+        <input type="submit" name="doit" value="Delete Checked Files" />'.
+		&Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
         <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>'
@@ -550,9 +564,10 @@ sub delete_confirmed {
 					       $env{'form.currentpath'}.
 					       $delete_file);
         if ($result ne 'ok') {
-	    $r->print('<span class="LC_error"> An error occured ('.$result.
-    		      ') while trying to delete '.
-                      &display_file(undef, $delete_file).'</span><br />');
+	    $r->print('<span class="LC_error">'.
+                     &mt('An error occured ([_1]) while trying to delete 
+                         [_2].',$result,&display_file(undef, $delete_file)).
+                      '</span><br /><br />');
         } else {
             $r->print(&mt('File: [_1] deleted.',
                           &display_file(undef,$delete_file)));
@@ -563,7 +578,7 @@ sub delete_confirmed {
                                                          $group,$file_name);
             if (keys(%access_controls) > 0) {
                 my %changes; 
-                foreach my $key (%{$access_controls{$file_name}}) {
+                foreach my $key (keys(%{$access_controls{$file_name}})) {
                     $changes{'delete'}{$key} = 1;
                 }
                 if (keys(%changes) > 0) {
@@ -573,15 +588,15 @@ sub delete_confirmed {
                     if ($outcome ne 'ok') {
                            $r->print('<br />'.&mt("An error occured ([_1]) while ".
                                "trying to delete access controls for the file.",$outcome).
-                               '</span><br />');
+                               '</span><br /><br />');
                     } else {
                         if ($deloutcome eq 'ok') {
-                            $r->print('<br />'.&mt('Access controls also deleted for the file.'));
+                            $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
                         } else {
                             $r->print('<span class="LC_error">'.'<br />'.
                                &mt("An error occured ([_1]) while ".
                                    "trying to delete access controls for the file.",$deloutcome).
-                                   '</span><br />');
+                                   '</span><br /><br />');
                         }
                     }
                 }
@@ -747,10 +762,12 @@ sub display_access {
     if ($group eq '') {
         $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));
     }
-    
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
+		$r->print ('<br/>'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
+		$r->print (&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
+		$r->print (&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
         &access_setting_table($r,$access_controls{$file_name});
         my $button_text = {
                         'continue' => &mt('Proceed'),