--- loncom/interface/portfolio.pm	2006/06/20 01:56:17	1.105
+++ loncom/interface/portfolio.pm	2006/06/20 03:13:08	1.107
@@ -182,9 +182,9 @@ sub display_directory {
     	if ($version) {
     	    $versioned{$fname} .= $version.",";
     	}
-        push @dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs];
+        push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }
-    foreach my $line(@dir_lines) {
+    foreach my $line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
@@ -626,9 +626,13 @@ sub access_setting_table {
         if ($end == 0) {
             $pub_noend = 'checked="checked"';
         }
-        $pub_action = '<td><input type="checkbox" name="delete" value="'.$num.
-                      '" />'.&mt('Delete').'<br /><input type="checkbox" '.
-                      'name="update" value="'.$num.'" />'.&mt('Update').
+        $pub_action = '<td><label>
+                         <input type="checkbox" name="delete" value="'.$num.
+                      '" />'.&mt('Delete').'
+                      </label> <br />
+                      <label><input type="checkbox" name="update" value="'.
+		      $num.'" />'.&mt('Update').
+		      '</label>'.
                       '<input type="hidden" name="scope_'.$num.'"'.
                       ' value="public" /></td>';
         $pub_startdate = &Apache::lonhtmlcommon::date_setter('portform',
@@ -637,11 +641,14 @@ sub access_setting_table {
         $pub_enddate = &Apache::lonhtmlcommon::date_setter('portform',
                           'enddate_'.$num,$end,undef,undef,undef,1,undef,
                           undef,undef,1).
-                       '&nbsp;&nbsp;<nobr><input type="checkbox" name="noend_'.
-                       $num.'" '.$pub_noend.' />'.&mt('No end date').'</nobr>';
+                       '&nbsp;&nbsp;<nobr><label>
+                       <input type="checkbox" name="noend_'.
+                       $num.'" '.$pub_noend.' />'.&mt('No end date').
+		       '</label></nobr>';
     } else {
-        $pub_action = '<input type="checkbox" name="activate" value="0" />'.
-                      &mt('Activate').
+        $pub_action = '<label>'.
+	              '<input type="checkbox" name="activate" value="0" />'.
+                      &mt('Activate').'</label>'.
                       '<input type="hidden" name="scope_0" value="public" />';
         $pub_startdate = &Apache::lonhtmlcommon::date_setter('portform',
                           'startdate_0',$now,undef,undef,undef,1,undef,
@@ -649,9 +656,9 @@ sub access_setting_table {
         $pub_enddate = &Apache::lonhtmlcommon::date_setter('portform',
                           'enddate_0',$then,,undef,undef,undef,1,undef,
                           undef,undef,1).
-                       '&nbsp;&nbsp<nobr><input type="checkbox" '.
+                       '&nbsp;&nbsp<nobr><label><input type="checkbox" '.
                        'name="noend_0" />'.&mt('No end date').
-                       '</nobr>';
+                       '</label></nobr>';
 
     }
     $r->print('<td>'.$pub_action.'</td><td>'.&mt('Start: ').$pub_startdate.