--- loncom/interface/portfolio.pm	2006/10/19 00:23:21	1.164
+++ loncom/interface/portfolio.pm	2009/05/06 13:38:34	1.214
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.164 2006/10/19 00:23:21 raeburn Exp $
+# $Id: portfolio.pm,v 1.214 2009/05/06 13:38:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,57 +80,76 @@ sub make_anchor {
 
 my $dirptr=16384;
 sub display_common {
-    my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_;
+    my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_;
     my $namespace = &get_namespace();
     my $port_path = &get_port_path();
     if ($can_upload) {
         my $groupitem = &group_form_data();
 
         my $iconpath= $r->dir_config('lonIconsURL') . "/";
-        my %text=&Apache::lonlocal::texthash(
+        my %lt=&Apache::lonlocal::texthash(
 					 'upload' => 'Upload',
-					 'upload_label' =>  
-					 'Upload file to current directory:',
+					 'upload_label' => 'Upload file to current directory',
 					 'createdir' => 'Create Subdirectory',
 					 'createdir_label' => 
-					 'Create subdirectory in current directory:');
+					 'Create subdirectory in current directory',
+                                         'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files'
+                                            );
         my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
-        $r->print(<<"TABLE"); 
-<table id="LC_portfolio_actions">
-  <tr id="LC_portfolio_upload">
-    <td class="LC_label">
-      $text{'upload_label'}
-    </td>
-    <td class="LC_value">
-      <form method="post" enctype="multipart/form-data" action="$escuri">
-        $groupitem 
-        <input name="uploaddoc" type="file" />
-	<input type="hidden" name="currentpath" value="$current_path" />
-	<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'}" />
-      </form>
-    </td>
-  </tr>
-  <tr id="LC_portfolio_createdir">
-    <td class="LC_label">
-      $text{'createdir_label'}
-    </td>
-    <td class="LC_value">
-      <form method="post" action="$escuri">
-        <input name="newdir" type="input" />$groupitem
-        <input type="hidden" name="currentpath" value="$current_path" />
-        <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'}" />
-      </form>
-    </td>
-  </tr>
-</table>
-TABLE
-    }
+	my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
+	my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
+        my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
+        $r->print(&display_usage($group));
+        my $parse_check;
+        if (!&suppress_embed_prompt()) {
+            $parse_check = <<"END";
+        <br />
+        <span class="LC_nobreak">
+         <label>$lt{'parse'}
+         <input type="checkbox" name="parserflag" checked="checked" />
+         </label>
+        </span>
+END
+        }
+
+        $r->print('<div>'.$help_portfolio);
+        # Upload File
+        $r->print('<div class="LC_left_float">'
+                 .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
+                 .'<fieldset>'
+                 .'<legend>'.$lt{'upload_label'}.'</legend>'
+                 .$groupitem 
+                 .'<input name="uploaddoc" type="file" />'
+                 .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
+                 .'<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="'.$lt{'upload'}.'" />'
+                 .$help_fileupload
+                 .$parse_check
+                 .'</fieldset>'
+                 .'</form>'
+                 .'</div>'
+        );
+        # Create Subdirectory
+        $r->print('<div class="LC_left_float">'
+                 .'<form method="post" action="'.$escuri.'">'
+                 .'<fieldset>'
+                 .'<legend>'.$lt{'createdir_label'}.'</legend>'
+                 .'<input name="newdir" type="text" />'.$groupitem
+                 .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
+                 .'<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="'.$lt{'createdir'}.'" />'
+                 .$help_createdir
+                 .'</fieldset>'
+                 .'</form>'
+                 .'</div>'
+        );
+        $r->print('</div>');
+    } # end "if can_upload"
+
     my @tree = split (/\//,$current_path);
     my %anchor_fields = (
         'selectfile'    => $port_path,
@@ -141,12 +160,12 @@ TABLE
     );
     $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     if (@tree > 1){
-        my $newCurrentPath = '';
+        my $newCurrentPath = '/';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
             my %anchor_fields = (
                 'selectfile' => $tree[$i],
-                'currentpath' => '/',
+                'currentpath' => $newCurrentPath,
                 'mode' => $env{"form.mode"},
                 'fieldname' => $env{"form.fieldname"},
                 'continue' => $env{"form.continue"}
@@ -155,6 +174,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('">'.
@@ -163,20 +183,62 @@ TABLE
     $r->print("</form>");
 }
 
+sub display_usage {
+    my ($group) = @_;
+    my $disk_quota = &get_quota($group);
+    my $getpropath = 1;
+    my $portfolio_root = &get_portfolio_root();
+    my ($uname,$udom) = &get_name_dom($group);
+    my $current_disk_usage =
+         &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+    my $usage = $current_disk_usage/1000;
+    my $quota = $disk_quota/1000;
+    my $percent;
+    if ($disk_quota == 0) {
+        $percent = 100.0;
+    } else {
+        $percent = 100*($current_disk_usage/$disk_quota);
+    }
+    $usage = sprintf("%.2f",$usage);
+    $quota = sprintf("%.2f",$quota);
+    $percent = sprintf("%.0f",$percent);
+    my ($color,$cssclass);
+    if ($percent <= 60) {
+        $color = '#00A000';
+    } elsif ($percent > 60 && $percent < 90) {
+        $color = '#FFD300';
+        $cssclass = 'class="LC_warning"';
+    } elsif( $percent >= 90) {
+        $color = '#FF0000';
+        $cssclass = 'class="LC_error"';
+    }
+    my $prog_width = $percent;
+    if ($prog_width > 100) {
+        $prog_width = 100;
+    }
+    my $disk_meter = '
+  <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
+'   <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
+'    <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
+'   </div>'."\n".
+'  </div>';
+    return $disk_meter;
+}
+
 sub display_directory_line {
     my ($r,$select_mode, $filename, $mtime, $size, $css_class,
 	$line, $access_controls, $curr_access, $now, $version_flag,
 	$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
 
     my $fullpath =  &prepend_group($current_path.$filename);
-    $r->print('<tr class="'.$css_class.'">');
+    $r->print(&Apache::loncommon::start_data_table_row());
     $r->print($line); # contains first two cells of table
     my $lock_info;
     if ($version_flag) { # versioned can't be versioned, so TRUE when root file
-        $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+        $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" class="LC_fileicon" /></td>');
         $r->print('<td>'.$version_flag.'</td>');
     } else { # this is a graded or handed back file
-        my ($user,$domain) = &get_name_dom();
+        my ($user,$domain) = &get_name_dom($env{'form.group'});
         my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
         if (defined($$permissions_hash{$fullpath})) {
             foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
@@ -205,15 +267,19 @@ sub display_directory_line {
     $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('<td class="'.$css_class.'">&nbsp;&nbsp;</td>'); # Display status
+        $r->print('<td><span class="LC_nobreak">'
+                 .&mt($curr_access).'&nbsp;&nbsp;&nbsp;'
+       );
         my %anchor_fields = (
             'access' => $filename,
             'currentpath' => $current_path
         );
 	$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
+    } else {
+        $r->print('<td class="'.$css_class.'">&nbsp;&nbsp;</td>'); # Display status
     }
-    $r->print('</tr>'.$/);
+    $r->print(&Apache::loncommon::end_data_table_row().$/);
 }
 
 sub display_directory {
@@ -224,7 +290,7 @@ sub display_directory {
     my $select_mode;
     my $checked_files;
     my $port_path = &get_port_path();
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my $access_admin_text = &mt('View Status');
     if ($can_setacl) {
         $access_admin_text = &mt('View/Change Status');
@@ -236,7 +302,7 @@ sub display_directory {
                                                   $current_permissions,$group);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
     my $now = time;
-    if ($env{"form.mode"} eq 'selectfile'){
+    if ($env{"form.mode"} eq 'selectfile') {
 	&select_files($r);
 	$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
 	$select_mode = 'true';
@@ -245,7 +311,9 @@ sub display_directory {
         $display_out = '<form method="post" action="'.$url.'">'.
 	    &group_form_data().
         '<input type="hidden" name="action" value="deletedir" />'.
+        '<p>'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+        '</p>'.
         '<input type="hidden" name="selectfile" value="" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '</form>';
@@ -255,12 +323,30 @@ sub display_directory {
     }
     if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');
-        $r->print('<table id="LC_browser">'.
-            '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+        $r->print(&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row()
+                 .'<th>'.&mt('Select').'</th>'
+                 .'<th>&nbsp;</th><th>&nbsp;</th>'
+                 .'<th>'.&mt('Name').'</th>'
+                 .'<th>'.&mt('Size').'</th>'
+                 .'<th>'.&mt('Last Modified').'</th>'
+                 .'<th>&nbsp;</th>'
+                 .&Apache::loncommon::end_data_table_header_row()
+        );
     } else {
         $r->print('<form method="post" action="'.$url.'">');
-        $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>');
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
+						      &mt('Using the portfolio file list')));
+        $r->print(&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row()
+                 .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
+                 .'<th>&nbsp;</th><th>&nbsp;</th>'
+                 .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
+                 .'<th>'.&mt('Size').'</th>'
+                 .'<th>'.&mt('Last Modified').'</th>'
+                 .'<th>&nbsp;</th>'
+                 .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
+                 .&Apache::loncommon::end_data_table_header_row());
     }
     $r->print("\n".&group_form_data()."\n");
 
@@ -274,8 +360,6 @@ sub display_directory {
 			  my ($bfile)=split('&',$b,2);
 			  return (lc($afile) cmp lc($bfile));
 		      } (@$dir_list)) {
-    	#$strip holds directory/file name
-    	#$dom 
     	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
     	$filename =~ s/\s+$//;
     	my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
@@ -320,12 +404,17 @@ sub display_directory {
     	        $version_flag = '&nbsp;';
     	    }
             if ($dirptr&$testdir) {
-		my $colspan='colspan="2"';
+		my $colspan_folder='';
+		my $colspan_fill='';
                 if ($select_mode eq 'true'){
-		    undef($colspan);
+                    $colspan_fill=' colspan="3"';
+                } else {
+                    $colspan_folder=' colspan="2"';
+                    $colspan_fill=' colspan="4"';
                 }
-		$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>');
+		$r->print('<tr class="LC_browser_folder">');
+                $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'navmap.folder.closed.gif" class="LC_fileicon" /></td>'
+                         .'<td>'.&mt('Go to ...').'</td>');
                 my %anchor_fields = (
                     'selectfile'    => $filename.'/',
                     'currentpath'   => $current_path.$filename.'/',
@@ -333,7 +422,9 @@ sub display_directory {
                     'fieldname'     => $env{"form.fieldname"},
                     'continue'      => $env{"form.continue"}
                 );  
-                $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
+                $r->print('<td>'.$version_flag.'</td>'
+                         .'<td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
+                $r->print('<td'.$colspan_fill.'>&nbsp;</td>');
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
@@ -341,7 +432,7 @@ sub display_directory {
                 if ($select_mode eq 'true') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
 		    if ($$checked_files{$filename} eq 'selected') {
-                        $line.=" checked ";
+                        $line.=' checked="checked" ';
                     }
 		    $line.=' /></td>';
                 } else {
@@ -349,7 +440,7 @@ sub display_directory {
                         my %anchor_fields = (
                             'lockinfo' => $fullpath
                         );
-                        $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
+                        $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,&mt('Locked')).'</td>';
 			$css_class= 'LC_browser_file_locked';
                     } else {
                         if (!$can_modify) {
@@ -361,13 +452,13 @@ sub display_directory {
                             $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
                         }
                         if ($can_modify) {
-                            my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
-                            '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
+                            my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'"/>';
+# 	src="'.#&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                             my %anchor_fields = (
                                 'rename' => $filename,
                                 currentpath => $current_path
                             );
-                            $line .= &make_anchor($url,\%anchor_fields,'Rename');
+                            $line .= &make_anchor($url,\%anchor_fields,&mt('Rename'));
                             $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
                             # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
@@ -424,19 +515,24 @@ sub display_directory {
         }
     }
     if ($select_mode eq 'true') {
-        $r->print('</table>
+        $r->print(&Apache::loncommon::end_data_table().'
             <input type="hidden" name="continue" value="true" />
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
             <input type="hidden" name="mode" value="selectfile" />
-            <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
-            <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
+            <p>
+            <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
+            <input type="button" name="doit" onClick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
+            </p>
             <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>');        
     } else {
-        $r->print('</table>');
+        $r->print(&Apache::loncommon::end_data_table());
         if ($can_delete) {
             $r->print('
-        <input type="submit" name="doit" value="Delete Checked Files" />
+        <p>
+        <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'.
+	&Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
+        </p>
         <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>'
@@ -516,19 +612,19 @@ sub done {
 }
 
 sub delete {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $file_name = &prepend_group($file_name);
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
-        $r->print ("The file is locked and cannot be deleted.<br />");
+        $r->print(&mt('The file is locked and cannot be deleted.').'<br />');
         $r->print(&done('Back',$url));
     } else {
         if (scalar(@files)) {
             &open_form($r,$url);
-            $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
+            $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
             &close_form($r,$url);
         } else {
             $r->print("No file was checked to delete.<br />");
@@ -541,7 +637,7 @@ sub delete_confirmed {
     my ($r,$url,$group)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path();
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);
@@ -550,9 +646,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 occurred ([_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 +660,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) {
@@ -571,17 +668,17 @@ sub delete_confirmed {
                     &Apache::lonnet::modify_access_controls($file_name,\%changes,
                                                             $udom,$uname);
                     if ($outcome ne 'ok') {
-                           $r->print(&mt('<br />'."An error occured ($outcome) while ".
-                               "trying to delete access controls for the file.").
-                               '</span><br />');
+                           $r->print('<br />'.&mt("An error occurred ([_1]) while ".
+                               "trying to delete access controls for the file.",$outcome).
+                               '</span><br /><br />');
                     } else {
                         if ($deloutcome eq 'ok') {
-                            $r->print(&mt('<br />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">'.
-                               &mt('<br />'."An error occured ($deloutcome) while ".
-                                   "trying to delete access controls for the file.").
-                                   '</span><br />');
+                            $r->print('<span class="LC_error">'.'<br />'.
+                               &mt("An error occurred ([_1]) while ".
+                                   "trying to delete access controls for the file.",$deloutcome).
+                                   '</span><br /><br />');
                         }
                     }
                 }
@@ -594,30 +691,29 @@ sub delete_confirmed {
 sub delete_dir {
     my ($r,$url)=@_;
     &open_form($r,$url);
-    $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+     $r->print('<p>'.&mt('Delete [_1]?',&display_file()).'</p>');
     &close_form($r,$url);
 } 
 
 sub delete_dir_confirmed {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $directory_name = $env{'form.currentpath'};
     $directory_name =~ s|/$||; # remove any trailing slash
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my $namespace = &get_namespace();
     my $port_path = &get_port_path();
     my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $directory_name);
 					       
     if ($result ne 'ok') {
-	$r->print('<span class="LC_error"> An error occured (dir) ('.$result.
-		  ') while trying to delete '.$directory_name.'</span><br />');
+	$r->print('<span class="LC_error">'
+                  .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+                       ,$result,$directory_name)
+                  .'</span><br />');
     } else {
         # now remove from recent
-#        $r->print('<br /> removing '.$directory_name.'<br /');
         &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
         my @dirs = split m!/!, $directory_name;
-        
-#        $directory_name =~ m/^(\/*\/)(\/*.)$/;
         $directory_name='/';
         for (my $i=1; $i < (@dirs - 1); $i ++){
             $directory_name .= $dirs[$i].'/';
@@ -628,17 +724,17 @@ sub delete_dir_confirmed {
 }
 
 sub rename {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     $file_name = &prepend_group($file_name);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
-        $r->print ("The file is locked and cannot be renamed.<br />");
+        $r->print("The file is locked and cannot be renamed.<br />");
         $r->print(&done(undef,$url));
     } else {
         &open_form($r,$url);
-        $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
-                   <input name="filenewname" type="input" size="50" />?</p>');
+        $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()
+                  , '<input name="filenewname" type="text" size="50" />').'</p>');
         &close_form($r,$url);
     }
 }
@@ -646,7 +742,7 @@ sub rename {
 sub rename_confirmed {
     my ($r,$url,$group)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path();
     if ($filenewname eq '') {
 	$r->print('<span class="LC_error">'.
@@ -664,9 +760,9 @@ sub rename_confirmed {
         $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
     } else {      
 	$r->print('<span class="LC_error">'.
-		  &mt('An error occured ([_1]) while trying to rename [_2]'
-		      .' to [_3]',$result,&display_file(),
-		      &display_file('',$filenewname)).'</span><br />');
+		  &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+                      ,$result,&display_file(),&display_file('',$filenewname))
+                  .'</span><br />');
         return;
     }
     if ($filenewname ne $env{'form.filenewname'}) {
@@ -685,39 +781,40 @@ sub access_for_renamed {
     my $newfile = $env{'form.currentpath'}.$filenewname;
     $newfile = &prepend_group($newfile);
     my $current_permissions =
-            &Apache::lonnet::get_portfile_permissions($udom,$uname);
+	&Apache::lonnet::get_portfile_permissions($udom,$uname);
     my %access_controls =
-            &Apache::lonnet::get_access_controls($current_permissions,
-                                                 $group,$oldfile);
+	&Apache::lonnet::get_access_controls($current_permissions,
+					     $group,$oldfile);
     my $chg_text;
     if (keys(%access_controls) > 0) {
         my %change_old;
         my %change_new;
-        foreach my $key (%{$access_controls{$oldfile}}) {
+        foreach my $key (keys(%{$access_controls{$oldfile}})) {
             $change_old{'delete'}{$key} = 1;
             $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key};
         }
         my ($outcome,$deloutcome,$new_values,$translation) =
             &Apache::lonnet::modify_access_controls($oldfile,\%change_old,
-                                                            $udom,$uname);
+						    $udom,$uname);
         if ($outcome ne 'ok') {
-            $chg_text = &mt('<br /><br />'."An error occured ($outcome) while ".
-                "trying to delete access control records for the old name.").
+            $chg_text ='<br /><br />'.&mt("An error occurred ([_1]) while ".
+                "trying to delete access control records for the old name.",$outcome).
                 '</span><br />';
         } else {
             if ($deloutcome ne 'ok') {
-                $chg_text = '<br /><br /><span class="LC_error">'.
-                          &mt('<br />'."An error occured ($deloutcome) while ".
-                          "trying to delete access control records for the old name.").
-                          '</span><br />';
+                $chg_text = '<br /><br /><span class="LC_error"><br />'.
+		    &mt("An error occurred ([_1]) while ".
+			"trying to delete access control records for the old name.",$deloutcome).
+			'</span><br />';
             }
         }
         ($outcome,$deloutcome,$new_values,$translation) =
             &Apache::lonnet::modify_access_controls($newfile,\%change_new,
                                                     $udom,$uname);
         if ($outcome ne 'ok') {
-            $chg_text .= &mt('<br /><br />'."An error occured ($outcome) while ".
-                "trying to update access control records for the new name.").
+            $chg_text .= '<br /><br />'.
+		&mt("An error occurred ([_1]) while ".
+                "trying to update access control records for the new name.",$outcome).
                 '</span><br />';
         }
         if ($chg_text eq '') {
@@ -728,32 +825,47 @@ sub access_for_renamed {
 }
 
 sub display_access {
-    my ($r,$url,$group,$can_setacl,$port_path) = @_;
-    my ($uname,$udom) = &get_name_dom();
+    my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
+    my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);
-    my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
-    my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
-    $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
-    $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
-    $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
-    $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
-    $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
-    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 />"));
+    my ($header,$info);
+    if ($action eq 'chgaccess') {
+        $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+        $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
+        $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
+        $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
+        $info .= '</li><li>'.&explain_conditionals();
+        $info .= '</li></ul>'.
+                  &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
+        if ($group eq '') {
+            $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
+        } else {
+            $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
+        }
+        $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";
+        if ($group ne '') {
+            $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
+        }
+    } else {
+        $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
+                  &explain_conditionals().'<br />';
     }
-    
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
-        &access_setting_table($r,$access_controls{$file_name});
+	$r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access')));
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings')));
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access')));
+        &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
+                              $action);
         my $button_text = {
                         'continue' => &mt('Proceed'),
-                        'cancel' => &mt('Back to directory listing'),
+                        'cancel' => &mt('Return to directory'),
                       };
         &close_form($r,$url,$button_text);
     } else {
@@ -765,6 +877,13 @@ sub display_access {
     }
 }
 
+sub explain_conditionals {
+    return
+        &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n".
+        &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'<br />'."\n".
+        &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+}
+
 sub view_access_settings {
     my ($r,$url,$access_controls,$aclcount) = @_;
     my ($showstart,$showend);
@@ -774,7 +893,7 @@ sub view_access_settings {
         $todisplay{$scope}{$key} = $$access_controls{$key};
     }
     if ($aclcount) {
-        $r->print(&mt('<h4>Current access controls defined for this file:</h4>'));
+        $r->print('<h4>'.&mt('Current access controls defined for this file:').'</h4>');
         $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
@@ -785,12 +904,12 @@ sub view_access_settings {
         &build_access_summary($r,$count,$chg,%todisplay);
         $r->print(&Apache::loncommon::end_data_table());
     } else {
-        $r->print(&mt('No access control settings currently exist for this file.<br />' ));
+        $r->print(&mt('No access control settings currently exist for this file.').'<br />');
     }
     my %anchor_fields = (
         'currentpath' => $env{'form.currentpath'}
     );
-    $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
+    $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
     return;
 }
 
@@ -803,9 +922,8 @@ sub build_access_summary {
                       domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',
                       course => 'Conditional: course-based',
-                      group => 'Conditional: group-based',
                      );
-    my @allscopes = ('public','guest','domains','users','course','group');
+    my @allscopes = ('public','guest','domains','users','course');
     foreach my $scope (@allscopes) {
         if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
             next;
@@ -828,7 +946,7 @@ sub build_access_summary {
                 }
             }
             $r->print('<td>'.&mt($scope_desc{$scope}));
-            if (($scope eq 'course') || ($scope eq 'group')) {
+            if ($scope eq 'course') {
                 if ($chg ne 'delete') {
                     my $cid = $content->{'domain'}.'_'.$content->{'number'};
                     my %course_description = &Apache::lonnet::coursedescription($cid);
@@ -840,16 +958,12 @@ sub build_access_summary {
             if ($chg ne 'delete') {
                 if ($scope eq 'guest') {
                     $r->print(&mt('Passphrase').': '.$content->{'password'});
-                } elsif ($scope eq 'course' || $scope eq 'group') {
-                    $r->print('<table><tr>');
+                } elsif ($scope eq 'course') {
+                    $r->print('<table width="100%"><tr>');
                     $r->print('<th>'.&mt('Roles').'</th><th>'.
                           &mt('Access').'</th><th>'.
                                           &mt('Sections').'</th>');
-                    if ($scope eq 'course') {
-                        $r->print('<th>'.&mt('Groups').'</th>');
-                    } else {
-                        $r->print('<th>'.&mt('Teams').'</th>');
-                    }
+                    $r->print('<th>'.&mt('Groups').'</th>');
                     $r->print('</tr>');
                     foreach my $id (sort(keys(%{$content->{'roles'}}))) {
                         $r->print('<tr>');
@@ -873,11 +987,11 @@ sub build_access_summary {
                             } else {
                                 $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
                             }
-                            $r->print('</tr>');
+                            $r->print('</td>');
                         }
-			$r->print("</table>");
+			$r->print('</tr>');
                     }
-		    $r->print("</tr></table>");
+		    $r->print('</table>');
                 } elsif ($scope eq 'domains') {
                     $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
                 } elsif ($scope eq 'users') {
@@ -926,7 +1040,7 @@ sub update_access {
     $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
               $port_path.$file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name);
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);
     if ($totalprocessed) {
         ($outcome,$deloutcome,$new_values,$translation) =
@@ -979,7 +1093,7 @@ sub update_access {
         } else {
             if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
                 $errors .= '<span class="LC_error">'.
-		    &mt('A problem occurred storing access control settings: [_1]',$outcome).
+		    &mt('A problem occurred saving access control settings: [_1]',$outcome).
 		    '</span>';
             }
         }
@@ -991,16 +1105,16 @@ sub update_access {
     my $totalnew = 0;
     my $status = 'new';
     my ($firstitem,$lastitem);
-    foreach my $newitem ('course','group','domains','users') {
+    foreach my $newitem ('course','domains','users') {
         $allnew += $env{'form.new'.$newitem};
     }
     if ($allnew > 0) {
         my $now = time;
         my $then = $now + (60*60*24*180); # six months approx.
         &open_form($r,$url);
-        foreach my $newitem ('course','group','domains','users') {
+        foreach my $newitem ('course','domains','users') {
             if ($env{'form.new'.$newitem} > 0) {
-                $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
+                $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
                 $firstitem = $totalnew;
                 $lastitem = $totalnew + $env{'form.new'.$newitem};
                 $totalnew = $lastitem;
@@ -1020,7 +1134,7 @@ sub update_access {
         );
         $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
         delete $anchor_fields{'access'};
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory')));
     }
     return;
 }
@@ -1037,7 +1151,7 @@ sub build_access_record {
 		
     if ($scope eq 'guest') {	
         $record->{'password'} = $env{'form.password'};
-    } elsif (($scope eq 'course') || ($scope eq 'group')) {
+    } elsif ($scope eq 'course') {
         $record->{'domain'} = $env{'form.crsdom_'.$num};
 	$record->{'number'} = $env{'form.crsnum_'.$num};
         my @role_ids;
@@ -1119,19 +1233,18 @@ sub sort_users {
 }
 
 sub access_setting_table {
-    my ($r,$access_controls) = @_;
+    my ($r,$url,$filename,$access_controls,$action) = @_;
     my ($public,$publictext);
-    $publictext = &mt('Off');
+    $publictext ='Off';
     my ($guest,$guesttext);
-    $guesttext = &mt('Off');
+    $guesttext = 'Off';
     my @courses = ();
-    my @groups = ();
     my @domains = ();
     my @users = ();
     my $now = time;
     my $then = $now + (60*60*24*180); # six months approx.
     my ($num,$scope,$publicnum,$guestnum);
-    my (%acl_count,%end,%start);
+    my (%acl_count,%end,%start,%conditionals);
     foreach my $key (sort(keys(%{$access_controls}))) {
         ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
         if ($scope eq 'public') {
@@ -1142,19 +1255,34 @@ sub access_setting_table {
             $guest=$key;
             $guestnum = $num;  
             $guesttext = &acl_status($start{$key},$end{$key},$now);
-        } elsif ($scope eq 'course') {
-            push(@courses,$key);
-        } elsif ($scope eq 'group') {
-            push(@groups,$key);
-        } elsif ($scope eq 'domains') {
-            push(@domains,$key);
-        } elsif ($scope eq 'users') {
-            push(@users,$key);
+        } else {
+            $conditionals{$scope}{$key} = $$access_controls{$key};
+            if ($scope eq 'course') {
+                push(@courses,$key);
+            } elsif ($scope eq 'domains') {
+                push(@domains,$key);
+            } elsif ($scope eq 'users') {
+                push(@users,$key);
+            }
         }
         $acl_count{$scope} ++;
     }
     $r->print('<table border="0"><tr><td valign="top">');
-    $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');
+    if ($action eq 'chgaccess') {
+        &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start,
+                           \%end,$public,$publicnum,$publictext,$guest,$guestnum,
+                           $guesttext,$access_controls,%conditionals);
+    } else {
+        &condition_setting($r,$access_controls,$now,$then,\%acl_count,
+                           \@domains,\@users,\@courses);
+    }
+    $r->print('</td></tr></table>');
+}
+
+sub standard_settings {
+    my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
+      $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
+    $r->print('<h3>'.&mt('Public access: [_1]',&mt($publictext)).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
@@ -1162,7 +1290,7 @@ sub access_setting_table {
     $r->print(&Apache::loncommon::start_data_table_row());
     if ($public) {
         $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
-                  &dateboxes($publicnum,$start{$public},$end{$public}).'</td>');
+             &dateboxes($publicnum,$start->{$public},$end->{$public}).'</td>');
     } else {
         $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.
                   &dateboxes('0',$now,$then).'</td>');
@@ -1170,7 +1298,7 @@ sub access_setting_table {
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
     $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
-    $r->print('<h3>'.&mt('Passphrase-protected access:').' '.$guesttext.'</h3>');
+    $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',&mt($guesttext)).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
@@ -1181,7 +1309,7 @@ sub access_setting_table {
     if ($guest) {
         $passwd = $$access_controls{$guest}{'password'};
         $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.
-                  &dateboxes($guestnum,$start{$guest},$end{$guest}).'</td>');
+              &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'</td>');
     } else {
         $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.
                   &dateboxes('1',$now,$then).'</td>');
@@ -1190,36 +1318,75 @@ sub access_setting_table {
               $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
-    &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+    $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr>'.
+              '<tr><td colspan="3">');
+    my $numconditionals = 0;
+    my $conditionstext;
+    my %cond_status;
+    foreach my $scope ('domains','users','course') {
+        $numconditionals += $acl_count->{$scope}; 
+        if ($acl_count->{$scope} > 0) {
+            if ($conditionstext ne 'Active') { 
+                foreach my $key (keys(%{$conditionals{$scope}})) {
+                    $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
+                    if ($conditionstext eq 'Active') {
+                       last;
+                    }
+                }
+            }
+        }
+    }
+    if ($conditionstext eq '') {
+        $conditionstext = 'Off';
+    }
+    my %anchor_fields = (
+            'access' => $env{'form.selectfile'},
+            'action' => 'chgconditions',
+            'currentpath' => $env{'form.currentpath'},
+        );
+    $r->print('<h3>'.&mt('Conditional access: [_1]',&mt($conditionstext)).'</h3>');
+    if ($numconditionals > 0) {
+        my $count = 1;
+        my $chg = 'none';
+        $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'<br /><br />');
+        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_data_table_header_row());
+        $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
+                  '</th><th>'.&mt('Additional information').'</th>');
+        $r->print(&Apache::loncommon::end_data_table_header_row());
+        &build_access_summary($r,$count,$chg,%conditionals);
+        $r->print(&Apache::loncommon::end_data_table());
+    } else {
+        $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
+    }
+}
+
+sub condition_setting {
+    my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
+    $r->print('<tr><td valign="top">');
+    &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then);
     $r->print('</td><td>&nbsp;</td><td valign="top">');
-    &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+    &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
     $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
-    if (@courses > 0 || @groups > 0) {
+    if ($acl_count->{course} > 0) {
         $r->print('<td colspan="3" valign="top">');
     } else {
         $r->print('<td valign="top">');
     }
-    &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+    &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
     $r->print('</td>');
-    if (@courses > 0 || @groups > 0) {
-        $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
-    } else {
-        $r->print('<td>&nbsp;</td><td valign="top">');
-    }
-    &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     $r->print('</td></tr></table>');
 }
 
 sub acl_status {
     my ($start,$end,$now) = @_;
     if ($start > $now) {
-        return &mt('Inactive');
+        return 'Inactive';
     }
     if ($end && $end<$now) {
-        return &mt('Inactive');
+        return 'Inactive';
     }
-    return &mt('Active');
+    return 'Active';
 }
 
 sub access_element {
@@ -1227,7 +1394,7 @@ sub access_element {
     my $title = $type;
     $title =~ s/s$//;
     $title =~ s/^(\w)/uc($1)/e;
-    $r->print('<h3>'.&mt('[_1]-based conditional access: ',$title));
+    $r->print('<h3>'.&mt('[_1]-based conditional access: ',&mt($title)));
     if ($$acl_count{$type}) {
         $r->print($$acl_count{$type}.' ');
         if ($$acl_count{$type} > 1) {
@@ -1254,17 +1421,17 @@ sub display_access_row {
         $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
               &mt('Dates available').'</th>');
-        if (($type eq 'course') || ($type eq 'group')) {
+        if ($type eq 'course' && $status eq 'old') {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
                       '</th>');
             $colspan ++;
         } elsif ($type eq 'domains') {
-            @all_doms = &Apache::loncommon::get_domains();
+            @all_doms = sort(&Apache::lonnet::all_domains());
         }
         $r->print(&Apache::loncommon::end_data_table_header_row());
         foreach my $key (@{$items}) {
 	    $r->print(&Apache::loncommon::start_data_table_row());
-            if (($type eq 'course') || ($type eq 'group')) {
+            if ($type eq 'course') {
                 &course_row($r,$status,$type,$key,$access_controls,$now,$then);
             } elsif ($type eq 'domains') {
                 &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
@@ -1282,8 +1449,8 @@ sub display_access_row {
         }
         $r->print(&Apache::loncommon::end_data_table());
     } else {
-        $r->print(&mt('No [_1]-based conditions defined.<br />',$type).
-                  &additional_item($type));
+        $r->print(&mt('No [_1]-based conditions defined.',&mt($type)).'<br />'
+                  .&additional_item($type));
     }
     return;
 }
@@ -1291,34 +1458,37 @@ sub display_access_row {
 sub course_js {
     return qq|
 <script type="text/javascript">
-function setRoleOptions(caller,num,cdom,cnum,type) {
-    addIndexnum = getCallerIndex(caller);
-    updateIndexnum = getIndex('update',num);
-    if (caller.checked) {
-        document.portform.elements[updateIndexnum].checked = true;
-        var url = '/adm/portfolio?action=rolepicker&setroles='+addIndexnum+'&cnum='+cnum+'&cdom='+cdom+'&type='+type;
+function setRoleOptions(num,roleid,cdom,cnum,type) {
+    updateIndexNum = getIndexByValue('update',num);
+    var addItem = 'add_role_'+num;
+    var addIndexNum = getIndexByName(addItem);
+    if (document.portform.elements[addItem].checked) {
+        document.portform.elements[updateIndexNum].checked = true;
+        var url = '/adm/portfolio?action=rolepicker&setroles='+num+'_'+roleid+'&cnum='+cnum+'&cdom='+cdom+'&type='+type;
         var title = 'Roles_Chooser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
         rolebrowser = open(url,title,options,'1');
         rolebrowser.focus();
     } else {
-        for (var j=0;j<5;j++) {
-            document.portform.elements[addIndexnum+j].value = '';
+        addArray = new Array ('role','access','section','group');
+        for (var j=0;j<addArray.length;j++) {
+            var itemIndex = getIndexByName(addArray[j]+'_'+num+'_'+roleid);
+            document.portform.elements[itemIndex].value = '';
         }
     }
 }
 
-function getCallerIndex(caller) {
+function getIndexByName(item) {
     for (var i=0;i<document.portform.elements.length;i++) {
-        if (document.portform.elements[i] == caller) {
+        if (document.portform.elements[i].name == item) {
             return i;
         }
     }
     return -1;
 }
 
-function getIndex(name,value) {
+function getIndexByValue(name,value) {
     for (var i=0;i<document.portform.elements.length;i++) {
         if (document.portform.elements[i].name == name && document.portform.elements[i].value == value) {
             return i;
@@ -1341,10 +1511,6 @@ sub course_row {
     }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
 	.&course_js();
-    my $crsgrptext = 'Groups';
-    if ($type eq 'group') {
-        $crsgrptext = 'Teams';
-    }
     my $uctype = $type;
     $uctype =~ s/^(\w)/uc($1)/e;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
@@ -1355,45 +1521,65 @@ sub course_row {
         my %course_description = &Apache::lonnet::coursedescription($cid);
         $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
     } elsif ($status eq 'new') {
-        $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
+        $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
     }
-    $r->print('<td>'.&dateboxes($num,$start,$end).'</td>');
-    $r->print('<td><table><tr>');
-    $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.
-              &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.
-              &mt($crsgrptext).'</th></tr>');
+    $r->print('<td>'.&dateboxes($num,$start,$end));
+    my $newrole_id = 1;
     if ($status eq 'old') {
+        $r->print('</td><td>');
         my $max_id = 0;
-        foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
-            if ($role_id > $max_id) {
-                $max_id = $role_id;
-            }
-            $max_id ++;
-            my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display');
-            $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
-        }
-        $r->print('</table><br />'.&mt('Add a roles-based condition').'&nbsp;<input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content->{'domain'}','$content->{'number'}','$uctype'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
-    } elsif ($status eq 'new') {
-        my $role_id = 1;
-        my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
-        $r->print('<tr><td><input type="checkbox" name="add_role_'.$num.'" value="'.$role_id.'" checked="checked" />'.&mt('Add').'<input type="hidden" name="grplist_'.$num.'_'.$role_id.'" /></td>'.$role_selects);
-        $r->print('</tr></table></td>');
+        if (keys(%{$content->{'roles'}}) > 0) {
+            $r->print('<table><tr><th>'.&mt('Action').'</th>'.
+                      '<th>'.&mt('Roles').'</th>'.
+                      '<th>'.&mt('Access').'</th>'.
+                      '<th>'.&mt('Sections').'</th>'.
+                      '<th>'.&mt('Groups').'</th></tr>');
+            foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
+                if ($role_id > $max_id) {
+                    $max_id = $role_id;
+                }
+                $max_id ++;
+                my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
+                $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
+            }
+            $r->print('</table>');
+        }
+        $r->print('<br />'.&mt('Add a roles-based condition').
+                  '&nbsp;<input type="checkbox" name="add_role_'.
+                  $num.'" onClick="javascript:setRoleOptions('."'$num',
+                  '$max_id','$content->{'domain'}','$content->{'number'}',
+                  '$uctype'".')" value="" />');
+        $newrole_id = $max_id;
+    } else {
+        $r->print('<input type="hidden" name="add_role_'.$num.'" value="" />');
     }
+    $r->print(&add_course_role($num,$newrole_id));
+    $r->print('</td>');
     return;
 }
 
+sub add_course_role {
+    my ($num,$max_id) = @_;
+    my $output;
+    $output .='<input type="hidden" name="role_'.$num.'_'.$max_id.'" />'.
+              '<input type="hidden" name="access_'.$num.'_'.$max_id.'" />'.
+              '<input type="hidden" name="section_'.$num.'_'.$max_id.'" />'.
+              '<input type="hidden" name="group_'.$num.'_'.$max_id.'" />';
+    return $output;
+}
+
 sub domains_row {
     my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     'domains');
-    my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true">'.
+    my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="multiple">'.
                      ' <option value="">'.&mt('Please select').'</option>';
     if ($status eq 'old') {
         my $content =  $$access_controls{$item};
 	foreach my $dom (@{$all_doms}) {
             if ((@{$content->{'dom'}} > 0) 
 		&& (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) {
-                $dom_select .= '<option value="'.$dom.'" selected>'.
+                $dom_select .= '<option value="'.$dom.'" selected="selected">'.
                                $dom.'</option>';
             } else {
                 $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
@@ -1423,19 +1609,24 @@ sub users_row {
 
 sub additional_item {
     my ($type) = @_;
-    my $output = &mt('Add new [_1] condition(s)?',$type).'&nbsp;'.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
+    my $output = &mt('Add new [_1] condition(s)?',&mt($type)).'&nbsp;'.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
     return $output;
 }
 
 sub actionbox {
     my ($status,$num,$scope) = @_;
-    my $output = '<span style="white-space: nowrap"><label>';
+    my $output = '<span class="LC_nobreak"><label>';
     if ($status eq 'new') {
-        $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.
+        my $checkstate;
+        if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
+            $checkstate = 'checked="checked"';
+        }
+        $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
+                   $checkstate.'  />'.
         &mt('Activate');
     } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.
-                   '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.
+                   '" />'.&mt('Delete').'</label></span><br /><span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="update" value="'.
                    $num.'" />'.&mt('Update');
     }
@@ -1454,7 +1645,7 @@ sub dateboxes {
                             undef,undef,1);
     my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
                                'enddate_'.$num,$end,undef,undef,undef,1,undef,
-                                undef,undef,1). '&nbsp;&nbsp;<span style="white-space: nowrap"><label>'.
+                                undef,undef,1). '&nbsp;&nbsp;<span class="LC_nobreak"><label>'.
                                 '<input type="checkbox" name="noend_'.
                                 $num.'" '.$noend.' />'.&mt('No end date').
                                 '</label></span>';
@@ -1479,21 +1670,12 @@ sub set_identifiers {
 } 
 
 sub role_selectors {
-    my ($num,$role_id,$status,$type,$content,$caller) = @_;
+    my ($num,$role_id,$type,$content,$caller) = @_;
     my ($output,$cdom,$cnum,$longid);
     if ($caller eq 'display') {
         $longid = '_'.$num.'_'.$role_id;
-        if ($status eq 'new') {
-            foreach my $item ('role','access','section','group') {
-                $output .= '<td><select name="'.$item.$longid.'">'.
-                           '<option value="">'.&mt('Pick [_1] first',$type).
-                           '</option></select></td>';
-            }
-            return $output;
-        } else {
-            $cdom = $$content{'domain'};
-            $cnum = $$content{'number'};
-        }
+        $cdom = $$content{'domain'};
+        $cnum = $$content{'number'};
     } elsif ($caller eq 'rolepicker') {
          $cdom = $env{'form.cdom'};
          $cnum = $env{'form.cnum'};
@@ -1531,15 +1713,15 @@ sub role_selectors {
                     'role' => $allroles,
                     'access' => \@allaccesses,
                     'section' => $sections,
-                    'group' => $groups, 
+                    'group' => $groups,
                    );
     foreach my $item ('role','access','section','group') {
-        $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";
+        $output .= '<td><select name="'.$item.$longid.'" multiple="multiple" size="4">'."\n";
         foreach my $entry (@{$allitems{$item}}) {
             if ($caller eq 'display') {
                 if ((@{$$content{'roles'}{$role_id}{$item}} > 0) && 
                     (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) {
-                    $output .= '  <option value="'.$entry.'" selected>'.
+                    $output .= '  <option value="'.$entry.'" selected="selected">'.
                                   $lookup{$item}{$entry}.'</option>';
                     next;
                 }
@@ -1555,20 +1737,21 @@ sub role_selectors {
 
 sub role_options_window {
     my ($r) = @_;
-    my $cdom = $env{'form.cdom'};
-    my $cnum = $env{'form.cnum'};
     my $type = $env{'form.type'};
-    my $addindex = $env{'form.setroles'};
-    my $grouptitle = 'Groups';
-    if ($type eq 'Group') {
-         $grouptitle = 'Teams';
-    } 
-    my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');
+    my $rolenum = $env{'form.setroles'};
+    my ($num,$role_id) = ($rolenum =~ /^([\d_]+)_(\d+)$/);
+    my $role_elements;
+    foreach my $item ('role','access','section','group') {
+        $role_elements .= "'".$item.'_'.$rolenum."',";
+    }
+    $role_elements =~ s/,$//; 
+    my $role_selects = &role_selectors($num,$role_id,$type,undef,
+                                       'rolepicker');
     $r->print(<<"END_SCRIPT");
 <script type="text/javascript">
 function setRoles() {
-    var addidx = $addindex+1;
-    for (var i=0; i<4; i++) {
+    var role_elements = new Array($role_elements);
+    for (var i=0; i<role_elements.length; i++) {
         var copylist = '';
         for (var j=0; j<document.rolepicker.elements[i].length; j++) {
             if (document.rolepicker.elements[i].options[j].selected) {
@@ -1576,14 +1759,27 @@ function setRoles() {
             }
         }
         copylist = copylist.substr(0,copylist.length-1);
-        opener.document.portform.elements[addidx+i].value = copylist;
+        var openerItem = getIndexByName(role_elements[i]);
+        opener.document.portform.elements[openerItem].value = copylist; 
     }
+    var roleAdder = getIndexByName('add_role_$num');
+    opener.document.portform.elements[roleAdder].value = '$role_id';
     self.close();
 }
+
+function getIndexByName(item) {
+    for (var i=0;i<opener.document.portform.elements.length;i++) {
+        if (opener.document.portform.elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+
 </script>
 END_SCRIPT
     $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
-    $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt($grouptitle).'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
+    $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
     return;
 }
 
@@ -1616,49 +1812,53 @@ ENDSMP
                     fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                 }
             }
-            opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
+            var hwfield = opener.document.getElementsByName('$env{'form.fieldname'}');
+            hwfield[0].value = fileList;
             self.close();
         }
         </script>
 ENDSMP
     $r->print($javascript);
-    $r->print("<h1>Select portfolio files</h1>
-                Check as many as you wish in response to the problem.<br />");
+    $r->print("<h1>".&mt('Select portfolio files')."</h1>");
     my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
     if (@otherfiles) {
-	$r->print("<strong>Files selected from other directories:</strong><br />");
+	$r->print(&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row()
+                 .'<th>'.&mt('Files selected from other directories:')."</th>"
+                 .&Apache::loncommon::end_data_table_header_row()
+        );
 	foreach my $file (@otherfiles) {
-	    $r->print($file."<br />");
+	    $r->print(&Apache::loncommon::start_data_table_row()
+                     .'<td>'.$file."</td>"
+                     .&Apache::loncommon::end_data_table_row()
+            );
 	}
+        $r->print(&Apache::loncommon::end_data_table()
+                 .'<br />'
+        );
     }
+    $r->print('<div>'
+             .&mt('Check as many files as you wish in response to the problem:')
+             .'</div>'
+    );
 }
 
-sub upload {
-    my ($r,$url,$group)=@_;
-    my $fname=$env{'form.uploaddoc.filename'};
-    my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
-    my $disk_quota = 20000; # expressed in k
-    if (defined($group)) {
-        my $grp_quota = &get_group_quota($group); # quota expressed in k 
-        if ($grp_quota ne '') {
-            $disk_quota = $grp_quota;
-        } else {
-            $disk_quota = 0;
-        }
-    }
-    $fname=&Apache::lonnet::clean_filename($fname);
 
-    my $portfolio_root=&get_portfolio_root();
-    my ($uname,$udom) = &get_name_dom();
+sub check_for_upload {
+    my ($path,$fname,$group,$element) = @_;
+    my $disk_quota = &get_quota($group);
+    my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
+    my $portfolio_root = &get_portfolio_root();
     my $port_path = &get_port_path();
+    my ($uname,$udom) = &get_name_dom($group);
     # Fixme --- Move the checking for existing file to LOND error return
-    my @dir_list=&get_dir_list($portfolio_root);
+    my @dir_list=&get_dir_list($portfolio_root,$path,$group);
     my $found_file = 0;
     my $locked_file = 0;
     foreach my $line (@dir_list) {
         my ($file_name)=split(/\&/,$line,2);
         if ($file_name eq $fname){
-            $file_name = $env{'form.currentpath'}.$file_name;
+            $file_name = $path.$file_name;
             $file_name = &prepend_group($file_name);
             $found_file = 1;
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
@@ -1666,38 +1866,93 @@ sub upload {
             } 
         }
     }
-    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
+    my $getpropath = 1;
+    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+
     if (($current_disk_usage + $filesize) > $disk_quota){
-        $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
-                  '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
-        $r->print(&done('Back',$url));
-    } 
-    elsif ($found_file){
-        if ($locked_file){
-            $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
-                  '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
-            $r->print(&done('Back',$url));      
-        } else {   
-            $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
-                  '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
-            $r->print(&done('Back',$url));
-        }
-    } else {
-        my $result=&Apache::lonnet::userfileupload('uploaddoc','',
-	        	 $port_path.$env{'form.currentpath'});
-        if ($result !~ m|^/uploaded/|) {
-            $r->print('<span class="LC_error">'.'An errror occured ('.$result.
-	              ') while trying to upload '.&display_file().'</span><br />');
-	    $r->print(&done('Back',$url));
-        } else {
-            $r->print(&done(undef,$url));
+        my $msg = '<span class="LC_error">'.
+                &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
+                  '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
+	return ('will_exceed_quota',$msg);
+    } elsif ($found_file) {
+        if ($locked_file) {
+            my $msg = '<span class="LC_error">';
+            $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+            $msg .= '</span><br />';
+            $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
+	    return ('file_locked',$msg);
+	} else {
+            my $msg = '<span class="LC_error">';
+            $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
+            $msg .= '</span>';
+            $msg .= '<br />';
+            $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
+	    return ('file_exists',$msg);
+	}
+    }
+}
+
+sub upload {
+    my ($r,$url,$group)=@_;
+    my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
+    my $disk_quota = &get_quota($group);
+    my $portfolio_root = &get_portfolio_root();
+    my $port_path = &get_port_path();
+    my ($uname,$udom) = &get_name_dom($group);
+    my $getpropath = 1;
+    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+    my ($state,$msg) = 
+        &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
+		                             $group,'uploaddoc',$portfolio_root,
+                                             $port_path,$disk_quota,
+                                             $current_disk_usage,$uname,$udom);
+    if ($state eq 'will_exceed_quota'
+	|| $state eq 'file_locked'
+	|| $state eq 'file_exists' ) {
+	$r->print($msg.&done('Back',$url));
+	return;
+    }
+
+    my (%allfiles,%codebase,$mode);
+    if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
+        if ($env{'form.parserflag'}) {
+	    $mode = 'parse';
         }
     }
+    my $result=
+	&Apache::lonnet::userfileupload('uploaddoc','',
+					$port_path.$env{'form.currentpath'},
+					$mode,\%allfiles,\%codebase);
+    if ($result !~ m|^/uploaded/|) {
+	$r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
+                  ,$result,&display_file()).'</span><br />');
+	$r->print(&done('Back',$url));
+    } else {
+	if (%allfiles) {
+            if (!&suppress_embed_prompt()) {
+	        my $state = <<STATE;
+    <input type="hidden" name="action"      value="upload_embedded" />
+    <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+    <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />
+    <input type="hidden" name="mode"        value="$env{'form.mode'}" />
+STATE
+                $r->print("<h2>".&mt("Reference Warning")."</h2>");
+                $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
+                $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
+	        $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
+				      {'error_on_invalid_names'   => 1,
+				       'ignore_remote_references' => 1,}));
+	        $r->print('<p>Or '.&done('Return to directory',$url).'</p>');
+            }
+	} else {
+	    $r->print(&done(undef,$url));
+	}
+    }
 }
 
 sub lock_info {
     my ($r,$url,$group) = @_;
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                        $uname);
     my $file_name = $env{'form.lockinfo'};
@@ -1730,17 +1985,16 @@ sub lock_info {
 	    my %course_description = 
 		&Apache::lonnet::coursedescription($$array_item[1]);
 	    if ( $course_description{'description'} ne '') {
-		$r->print(&mt('In the course: <strong>[_1]</strong><br />',
-			      $course_description{'description'}));
+		$r->print(&mt('In the course:').' <strong>'.$course_description{'description'}.'</strong><br />');
 	    }
         }
     }
-    $r->print(&done('Back',$url));
+    $r->print(&done(&mt('Back'),$url));
     return 'ok';
 }
 
 sub createdir {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {
     	$r->print('<span class="LC_error">'.
@@ -1750,7 +2004,7 @@ sub createdir {
 	    return;
     }
     my $portfolio_root = &get_portfolio_root(); 
-    my @dir_list=&get_dir_list($portfolio_root);
+    my @dir_list=&get_dir_list($portfolio_root,undef,$group);
     my $found_file = 0;
     foreach my $line (@dir_list) {
         my ($filename)=split(/\&/,$line,2);
@@ -1759,20 +2013,24 @@ sub createdir {
         }
     }
     if ($found_file){
-    	    $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
-    	            ' </strong>a file or directory by that name already exists.</span><br />');
+    	    $r->print('<span class="LC_error">'
+                      .&mt('Unable to create a directory named [_1].','<strong>'.$newdir.'</strong>')
+                      .' '.&mt('A file or directory by that name already exists.').'</span><br />');
     } else {
-        my ($uname,$udom) = &get_name_dom();
+        my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path();
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
 	         $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {
-    	    $r->print('<span class="LC_error">'.'An errror occured ('.$result.
-	    	      ') while trying to create a new directory '.&display_file().'</span><br />');
+    	    $r->print('<span class="LC_error">'
+                      .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+                           ,$result,&display_file())
+                      .'</span><br />');
         }
     }
     if ($newdir ne $env{'form.newdir'}) {
-        $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
+        $r->print(&mt('The new directory name was changed from [_1] to [_2].'
+                      ,'<strong>'.$env{'form.newdir'}.'</strong>','<strong>'.$newdir.'</strong>'));  
     }
     $r->print(&done(undef,$url));
 }
@@ -1780,7 +2038,7 @@ sub createdir {
 sub get_portfolio_root {
     my ($udom,$uname,$group) = @_;
     if (!(defined($udom)) || !(defined($uname))) {
-        ($uname,$udom) = &get_name_dom();
+        ($uname,$udom) = &get_name_dom($group);
     }
     my $path = '/userfiles/portfolio';
     if (!defined($group)) { 
@@ -1791,7 +2049,7 @@ sub get_portfolio_root {
     if (defined($group)) {
         $path = '/userfiles/groups/'.$group.'/portfolio';
     } 
-    return (&Apache::loncommon::propath($udom,$uname).$path);
+    return $path;
 }
 
 sub get_group_quota {
@@ -1806,21 +2064,23 @@ sub get_group_quota {
         $group_quota = $group_info{'quota'}; #expressed in Mb
         if ($group_quota) {
             $group_quota = 1000 * $group_quota; #expressed in k
-        } 
+        }
     }
     return $group_quota;
-} 
+}
 
 sub get_dir_list {
-    my ($portfolio_root) = @_;
-    my ($uname,$udom) = &get_name_dom();
-    return &Apache::lonnet::dirlist($env{'form.currentpath'},
-                                          $udom,$uname,$portfolio_root);
+    my ($portfolio_root,$path,$group) = @_;
+    $path ||= $env{'form.currentpath'};
+    my ($uname,$udom) = &get_name_dom($group);
+    my $getpropath = 1;
+    return &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,$getpropath);
 }
 
 sub get_name_dom {
+    my ($group) = @_;
     my ($uname,$udom);
-    if (defined($env{'form.group'})) {
+    if (defined($group)) {
         $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
     } else {
@@ -1841,7 +2101,7 @@ sub prepend_group {
 sub get_namespace {
     my $namespace = 'portfolio';
     if (defined($env{'form.group'})) {
-        my ($uname,$udom) = &get_name_dom();
+        my ($uname,$udom) = &get_name_dom($env{'form.group'});
         $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
     }
     return $namespace;
@@ -1873,16 +2133,16 @@ sub missing_priv {
         $rtnlink .= '?';
     }
     $rtnlink .= 'currentpath='.$escpath;
-    $r->print(&mt('<h3>Action disallowed</h3>'));
+    $r->print('<h3>'.&mt('Action disallowed').'</h3>');
     $r->print(&mt('You do not have sufficient privileges to [_1] ',
                   $longtext->{$priv}));
     if (defined($env{'form.group'})) {
-        $r->print(&mt("in the group's file repository."));
+        $r->print(&mt("in the group's group portfolio."));
         $rtnlink .= &group_args()
     } else {
         $r->print(&mt('in this portfolio.'));
     }
-    $rtnlink .= '">'.&mt('Return to directory listing page').'</a>';
+    $rtnlink .= '">'.&mt('Return to directory').'</a>';
     $r->print('<br />'.$rtnlink);
     $r->print(&Apache::loncommon::end_page());
     return;
@@ -1911,6 +2171,34 @@ sub coursegrp_portfolio_header {
     return $output;
 }
 
+sub get_quota {
+    my ($group) = @_;
+    my $disk_quota;
+    if (defined($group)) {
+        my $grp_quota = &get_group_quota($group); # quota expressed in k
+        if ($grp_quota ne '') {
+            $disk_quota = $grp_quota;
+        } else {
+            $disk_quota = 0;
+        }
+    } else {
+        $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
+                                    $env{'user.domain'}); #expressed in Mb
+        $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+    }
+    return $disk_quota;
+}
+
+sub suppress_embed_prompt {
+    my $suppress_prompt = 0;
+    if (($env{'request.role'} =~ /^st/) && ($env{'request.course.id'} ne '')) {
+        if ($env{'course.'.$env{'request.course.id'}.'.suppress_embed_prompt'} eq 'yes') {
+            $suppress_prompt = 1;
+        }
+    }
+    return $suppress_prompt;
+}
+
 
 sub handler {
     # this handles file management
@@ -1938,8 +2226,8 @@ sub handler {
            &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
         $env{'form.group'} =~ s/\W//g;
 	$group = $env{'form.group'};
-        if ($group) {
-            ($uname,$udom) = &get_name_dom();
+        if ($group ne '') {
+            ($uname,$udom) = &get_name_dom($group);
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
 							       $group); 
             if (%curr_groups) {
@@ -1950,16 +2238,16 @@ sub handler {
                                       $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root();
                 } else {
-                    $r->print('You do not have the privileges required to access the shared files space for this group.');
+                    $r->print(&mt('You do not have the privileges required to access the shared files space for this group.'));
                     $earlyout = 1;
                 }
             } else {
-                $r->print('Not a valid group for this course');
+                $r->print(&mt('Not a valid group for this course'));
                 $earlyout = 1;
             }
-            $title = &mt('Group files').' for '.$group; 
+            $title = &mt('Group portfolio for [_1]', $group); 
         } else {
-            $r->print('Invalid group');
+            $r->print(&mt('Invalid group'));
             $earlyout = 1;
         }
         if ($earlyout) { return OK; }
@@ -1985,7 +2273,7 @@ sub handler {
     } else {
         ($uname,$udom) = &get_name_dom();
         $portfolio_root = &get_portfolio_root();
-        $title = &mt('Portfolio Manager');
+        $title = &mt('My Space');
         $can_modify = 1;
         $can_delete = 1;
         $can_upload = 1;
@@ -1997,27 +2285,46 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     # Give the LON-CAPA page header
+    my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];
+
     if ($env{"form.mode"} eq 'selectfile'){
         $r->print(&Apache::loncommon::start_page($title,undef,
 						 {'only_body' => 1}));
     } elsif ($env{'form.action'} eq 'rolepicker') {
         $r->print(&Apache::loncommon::start_page('New role-based condition',undef,
                                                  {'no_nav_bar'  => 1, }));
-    } else {
+    } elsif ($caller eq 'coursegrp_portfolio') {
         $r->print(&Apache::loncommon::start_page($title));
+    } else {
+        $r->print(&Apache::loncommon::start_page($title,undef,
+                                                 {'bread_crumbs' => $brcrum}));
+        if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
+            $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
+                      &mt('This is a result of one of the following:').'<ul>'.
+                      '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+                      '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+                      '</ul>');
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
     }
     $r->rflush();
+    my ($blocked,$blocktext) = 
+        &Apache::loncommon::blocking_status('port',$uname,$udom);
+    if ($blocked) {
+         $r->print($blocktext);
+         $r->print(&Apache::loncommon::end_page());
+         return OK;
+    }
 	if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
-   	    $r->print('<span class="LC_error">'.
-		      'No file was selected to upload.'.
-		      'To upload a file, click <strong>Browse...</strong>'.
-		      ', select a file, then click <strong>Upload</strong>.'.
-		      '</span>');
+   	    $r->print('<span class="LC_error">');
+   	    $r->print(&mt('No file was selected to upload.').' ');
+	    $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
+	    $r->print('</span>');
 	}
     if ($env{'form.meta'}) {
         &open_form($r,$url);
-#        $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
-        $r->print('Edit the meta data<br />');
+        $r->print(&mt('Edit the meta data').'<br />');
         &close_form($r,$url);
     }
     if ($env{'form.store'}) {
@@ -2029,6 +2336,19 @@ sub handler {
         } else {
             &missing_priv($r,$url,'upload');
         }
+    } elsif ($env{'form.action'} eq 'upload_embedded') {
+	if ($can_upload) {
+            my $disk_quota = &get_quota($group);
+            my $getpropath = 1;
+            my $current_disk_usage = 
+                &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+	    $r->print(
+                &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
+                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
+            $r->print(&done(undef,$url));
+        } else {
+            &missing_priv($r,$url,'upload');
+        }
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
         if ($can_delete) {
 	    &delete_confirmed($r,$url,$group);
@@ -2037,13 +2357,13 @@ sub handler {
         }
     } elsif ($env{'form.action'} eq 'delete') {
         if ($can_delete) {
-	    &delete($r,$url);
+	    &delete($r,$url,$group);
         } else {
             &missing_priv($r,$url,'delete');
         }
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
         if ($can_delete) {
-	    &delete_dir_confirmed($r,$url);
+	    &delete_dir_confirmed($r,$url,$group);
         } else {
             &missing_priv($r,$url,'delete');
         }
@@ -2063,15 +2383,18 @@ sub handler {
         $env{'form.selectfile'} = $env{'form.rename'};
         $env{'form.action'} = 'rename';
         if ($can_modify) {
-	    &rename($r,$url);
+	    &rename($r,$url,$group);
         } else {
             &missing_priv($r,$url,'rename');
         }
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
-        $env{'form.action'} = 'chgaccess';
-        &display_access($r,$url,$group,$can_setacl,$port_path);
-    } elsif ($env{'form.action'} eq 'chgaccess') {
+        if (!defined($env{'form.action'})) { 
+            $env{'form.action'} = 'chgaccess';
+        }
+        &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});
+    } elsif (($env{'form.action'} eq 'chgaccess') || 
+             ($env{'form.action'} eq 'chgconditions')) {
         if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);
         } else {
@@ -2085,7 +2408,7 @@ sub handler {
         }
     } elsif ($env{'form.createdir'}) {
         if ($can_upload) {
-	    &createdir($r,$url);
+	    &createdir($r,$url,$group);
         } else {
             &missing_priv($r,$url,'upload');
         }
@@ -2100,7 +2423,7 @@ sub handler {
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
         }
-        my @dir_list=&get_dir_list($portfolio_root);
+        my @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
 	if ($dir_list[0] eq 'no_such_dir'){
 	    # two main reasons for this:
             #    1) never been here, so directory structure not created
@@ -2116,13 +2439,12 @@ sub handler {
 		$current_path = '/'; # force it back to the root        
 	    }
 	    # now grab the directory list again, for the first time
-	    @dir_list=&Apache::lonnet::dirlist($current_path,
-					    $udom,$uname,$portfolio_root);
+            @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
         }
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
 	&display_common($r,$url,$current_path,$is_empty,\@dir_list,
-			$can_upload);
+			$can_upload,$group);
         &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);
 	$r->print(&Apache::loncommon::end_page());