--- loncom/interface/portfolio.pm	2006/06/26 22:23:27	1.121
+++ loncom/interface/portfolio.pm	2006/06/28 19:53:15	1.121.2.2
@@ -219,7 +219,7 @@ sub display_directory {
                 }
                my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);
-                if ($select_mode eq 'true'){
+                if ($select_mode eq 'true') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
 		    if ($$checked_files{$filename} eq 'selected') {
                         $line.=" checked ";
@@ -246,51 +246,55 @@ sub display_directory {
                         }
                         $line .= '</td>';
                     }
-		    $r->print('<tr class="'.$css_class.'">');
-		    $r->print($line);
                 }
-                my $curr_access;
-                my $pub_access = 0;
-                my $guest_access = 0;
-                my $cond_access = 0;
-                foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
-                    my ($num,$scope,$end,$start) = &unpack_acc_key($key);
-                    if (($now > $start) && (!$end || $end > $now)) {
-                        if ($scope eq 'public')  {
-                            $pub_access = 1;
-                        } elsif ($scope eq 'guest') {
-                            $guest_access = 1;
-                        } else {
-                            $cond_access = 1;
-                        }
-                    }
-                }
-                if (!$pub_access && !$guest_access && !$cond_access) {
-                    $curr_access = &mt('Private');
-                } else {
-                    my @allaccesses; 
-                    if ($pub_access) {
-                        push(@allaccesses,&mt('Public'));
-                    }
-                    if ($guest_access) {
-                        push(@allaccesses,&mt('Passphrase-protected'));
-                    }
-                    if ($cond_access) {
-                        push(@allaccesses,&mt('Conditional'));
-                    }
-                    $curr_access = join('+ ',@allaccesses);
-                }
-                $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-                $r->print('<td><a href="'.$href_location.$filename.'">'.
-			    $filename.'</a></td>'); 
-                $r->print('<td>'.$size.'</td>');
-                $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
-                $r->print('<td><span style="white-space: nowrap">'.
-                          &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
-                $r->print('<a href="'.$url.'?access='.$filename.
-                              '&amp;currentpath='.$current_path.$groupecho.
-                              '">'.$access_admin_text.'</a>');
-                $r->print('</span></td></tr>');
+		$r->print('<tr class="'.$css_class.'">');
+		$r->print($line);
+		my $curr_access;
+		if ($select_mode ne 'true') {
+		    my $pub_access = 0;
+		    my $guest_access = 0;
+		    my $cond_access = 0;
+		    foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
+			my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+			if (($now > $start) && (!$end || $end > $now)) {
+			    if ($scope eq 'public')  {
+				$pub_access = 1;
+			    } elsif ($scope eq 'guest') {
+				$guest_access = 1;
+			    } else {
+				$cond_access = 1;
+			    }
+			}
+		    }
+		    if (!$pub_access && !$guest_access && !$cond_access) {
+			$curr_access = &mt('Private');
+		    } else {
+			my @allaccesses; 
+			if ($pub_access) {
+			    push(@allaccesses,&mt('Public'));
+			}
+			if ($guest_access) {
+			    push(@allaccesses,&mt('Passphrase-protected'));
+			}
+			if ($cond_access) {
+			    push(@allaccesses,&mt('Conditional'));
+			}
+			$curr_access = join('+ ',@allaccesses);
+		    }
+		}
+		$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+		$r->print('<td><a href="'.$href_location.$filename.'">'.
+			  $filename.'</a></td>'); 
+		$r->print('<td>'.$size.'</td>');
+		$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+		if ($select_mode ne 'true') {
+		    $r->print('<td><span style="white-space: nowrap">'.
+			      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
+		    $r->print('<a href="'.$url.'?access='.$filename.
+			      '&amp;currentpath='.$current_path.$groupecho.
+			      '">'.$access_admin_text.'</a></span>');
+		}
+		$r->print('</td></tr>'.$/);
             }
         }
     }
@@ -526,7 +530,20 @@ 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 portfolio file: [_1]',$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.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</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 />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+    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.').
+	'<br /><ul><li>'.
+	&mt('Public files are available to anyone without the need for login.').
+	'</li><li>'.
+	&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').
+	'</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 />'.
+	#&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').
+	#'<br />'.
+	#&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').
+	'</li></ul>';
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
@@ -973,24 +990,25 @@ 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>');
 }