--- loncom/interface/portfolio.pm	2006/08/18 20:55:44	1.156.2.2
+++ loncom/interface/portfolio.pm	2006/08/24 18:28:43	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.156.2.2 2006/08/18 20:55:44 albertel Exp $
+# $Id: portfolio.pm,v 1.162 2006/08/24 18:28:43 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,6 +191,11 @@ sub display_directory_line {
         }
 	if ($lock_info) {
 	    my %anchor_fields = ('lockinfo' => $fullpath);
+	    if ($versions) { # hold the folder open
+	        my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+	        $fname =~ s|^/||;
+	        $anchor_fields{'showversions'} = $fname.'.'.$extension;
+	    }
 	    $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
 	}
 	$r->print('<td colspan="2">'.$lock_info.'</td>');
@@ -289,7 +294,7 @@ sub display_directory {
     	    my $version_flag;
     	    my $show_versions;
 	    my $fullpath =  &prepend_group($current_path.$filename);
-    	    if ($env{'form.showversions'} eq $filename) {
+    	    if ($env{'form.showversions'} =~ /$filename/) {
     	        $show_versions = 'true';
     	    }
     	    if (exists($versioned{$fullpath})) {
@@ -299,10 +304,15 @@ sub display_directory {
     	            'currentpath' => $current_path,
     	        );
     	        if ($show_versions) {
+    	            # Must preserve other possible showversion files
+    	            my $version_remainder = $env{'form.showversions'};
+    	            $version_remainder =~ s/$filename//g;    	            
+    	            $anchor_fields{'showversions'} = $version_remainder;
                     $version_flag = &make_anchor('portfolio',\%anchor_fields,
                         '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
     	        } else {
-    	            $anchor_fields{'showversions'} = $filename;
+    	            # allow multiple files to show versioned
+    	            $anchor_fields{'showversions'} = $env{'form.showversions'}.','.$filename;
                     $version_flag = &make_anchor('portfolio',\%anchor_fields,
                         '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }
@@ -358,7 +368,7 @@ sub display_directory {
                                 currentpath => $current_path
                             );
                             $line .= &make_anchor($url,\%anchor_fields,'Rename');
-                            $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+                            $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
                             # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
@@ -496,6 +506,7 @@ sub done {
         $message='Done';
     }
     my %anchor_fields = (
+        'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},
         'mode'      => $env{'form.mode'}
@@ -636,13 +647,12 @@ sub display_access {
     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 or  passphrase-protected.');
+    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.');
-    $info .= '</li></ul>';
+    $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 />"));
     }
@@ -1090,24 +1100,24 @@ 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><td>&nbsp;</td><td valign="top">');
-#    &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) {
-#        $r->print('<td colspan="3" valign="top">');
-#    } else {
-#        $r->print('<td valign="top">');
-#    }
-#    &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><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><td>&nbsp;</td><td valign="top">');
+    &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) {
+        $r->print('<td colspan="3" valign="top">');
+    } else {
+        $r->print('<td valign="top">');
+    }
+    &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>');
 }