--- loncom/interface/portfolio.pm	2006/06/22 15:33:35	1.109
+++ loncom/interface/portfolio.pm	2006/06/22 15:56:03	1.112
@@ -261,10 +261,10 @@ sub display_directory {
 			    $filename.'</a></td>'); 
                 $r->print('<td>'.$size.'</td>');
                 $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
-                $r->print('<td><nobr>'.&mt($curr_access).'&nbsp;&nbsp;&nbsp;'.
+                $r->print('<td><span style="white-space: nowrap">'.&mt($curr_access).'&nbsp;&nbsp;&nbsp;'.
                           '<a href="'.$url.'?access='.$filename.
                           '&amp;currentpath='.$current_path.$groupecho.
-                          '">'.&mt('View/Change').'</a></nobr></td>');
+                          '">'.&mt('View/Change').'</a></span></td>');
                 $r->print('</tr>'); 
             }
         }
@@ -316,7 +316,7 @@ sub close_form {
               $group.'" />');
     }
     $r->print('</p></form>');
-    $r->print('<form action="'.$url.'" method="POST">
+    $r->print('<form action="'.$url.'" method="post">
                <p>
               <input type="hidden" name="currentpath" value="'.
 	      $env{'form.currentpath'}.'" />');
@@ -547,11 +547,11 @@ sub update_access {
             my $updated_controls = $access_controls{$file_name};
             my ($showstart,$showend);
             $r->print(&Apache::loncommon::start_data_table());
-            $r->print(&Apache::loncommon::start_data_table_row());
+            $r->print(&Apache::loncommon::start_data_table_header_row());
             $r->print('<th>'.&mt('Type of change').'</th><th>'.
                       &mt('Access control').'</th><th>'.&mt('Dates available').
                       '</th><th>'.&mt('Additional information').'</th>');
-            $r->print(&Apache::loncommon::end_data_table_row());
+            $r->print(&Apache::loncommon::end_data_table_header_row());
             foreach my $chg (sort(keys(%processing))) {
                 if (@{$processing{$chg}} > 0) {
                     if ($chg eq 'delete') {
@@ -830,9 +830,9 @@ sub access_setting_table {
     $r->print('<table border="0"><tr><td valign="top">');
     $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');
     $r->print(&Apache::loncommon::start_data_table());
-    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
-    $r->print(&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::end_data_table_header_row());
     $r->print(&Apache::loncommon::start_data_table_row());
     if ($public) {
         $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
@@ -846,10 +846,10 @@ sub access_setting_table {
     $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
     $r->print('<h3>'.&mt('Password-protected access:').' '.$guesttext.'</h3>');
     $r->print(&Apache::loncommon::start_data_table());
-    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
               '</th><th>'. &mt('Password').'</th>');
-    $r->print(&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::end_data_table_header_row());
     $r->print(&Apache::loncommon::start_data_table_row());
     my $passwd;
     if ($guest) {
@@ -926,8 +926,8 @@ sub display_access_row {
         my $uctype = $type;
         $uctype =~ s/^(\w)/uc($1)/e;
         $r->print(&Apache::loncommon::start_data_table());
-        $r->print(&Apache::loncommon::start_data_table_row());
-        $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</td><th>'.
+        $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')) {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
@@ -938,7 +938,8 @@ sub display_access_row {
         } elsif ($type eq 'domains') {
             @all_doms = &Apache::loncommon::get_domains();
         }
-        $r->print(&Apache::loncommon::end_data_table_row());
+        $r->print(&Apache::loncommon::end_data_table_header_row());
+	$r->print(&Apache::loncommon::start_data_table_row());
         foreach my $key (@{$items}) {
             if (($type eq 'course') || ($type eq 'group')) {
                 &course_row($r,$status,$type,$key,$access_controls,
@@ -951,10 +952,11 @@ sub display_access_row {
             }
         }
         $r->print(&Apache::loncommon::end_data_table_row());
-        $r->print(&Apache::loncommon::start_data_table_row());
         if ($status eq 'old') {
+	    $r->print(&Apache::loncommon::start_data_table_row());
             $r->print('<td colspan="',$colspan.'">'.&additional_item($type).
                       '</td>');
+	    $r->print(&Apache::loncommon::end_data_table_row());
         }
         $r->print(&Apache::loncommon::end_data_table());
     } else {
@@ -964,15 +966,8 @@ sub display_access_row {
     return;
 }
 
-sub course_row {
-    my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
-    my %content;
-    my $defdom = $env{'user.domain'};
-    if ($status eq 'old') {
-        $defdom =  $$access_controls{$item}{'domain'}; 
-    }
-    $r->print(&Apache::loncommon::coursebrowser_javascript($defdom));
-    $r->print(qq|
+sub course_js {
+    return qq|
 <script type="text/javascript">
 function setRoleOptions(caller,num,cdom,cnum,type) {
     addIndexnum = getCallerIndex(caller);
@@ -1011,15 +1006,25 @@ function getIndex(name,value) {
 }
 
 </script>
-|);
-    $r->print(&Apache::loncommon::start_data_table_row());
+|;
+}
+
+sub course_row {
+    my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
+    my %content;
+    my $defdom = $env{'user.domain'};
+    if ($status eq 'old') {
+        $defdom =  $$access_controls{$item}{'domain'}; 
+    }
+    my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
+	.&course_js();
     my $crsgrptext = 'Groups';
     if ($type eq 'group') {
         $crsgrptext = 'Teams';
     }
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     $type);
-    $r->print('<td>'.&actionbox($status,$num,$scope).'</td>');
+    $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
     if ($status eq 'old') {
         my $cid = $content{'domain'}.'_'.$content{'number'};
         my %course_description = &Apache::lonnet::coursedescription($cid);
@@ -1042,7 +1047,7 @@ function getIndex(name,value) {
             }
             $max_id ++;
             my $role_selects = &role_selectors($num,$role_id,$status,$type,\%content,'display');
-            $r->print('<tr><td><nobr><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></nobr><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
+            $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}','Course'".')" 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') {
@@ -1051,18 +1056,15 @@ function getIndex(name,value) {
         $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>');
     }
-    $r->print(&Apache::loncommon::end_data_table_row());
     return;
 }
 
 sub domains_row {
     my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
-    $r->print(&Apache::loncommon::start_data_table_row());
     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="true">'.
                      ' <option value="">'.&mt('Please select').'</option>';
-    $r->print(&Apache::loncommon::start_data_table_row());
     if ($status eq 'old') {
         my $content =  $$access_controls{$item};
 	foreach my $dom (@{$all_doms}) {
@@ -1079,15 +1081,13 @@ sub domains_row {
             $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
         }
     }
+    $dom_select .= '</select>';
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.$dom_select.
               '</td><td>'.&dateboxes($num,$start,$end).'</td>');
-    $r->print(&Apache::loncommon::end_data_table_row());
-    $r->print(&Apache::loncommon::start_data_table_row());
 }
 
 sub users_row {
     my ($r,$status,$item,$access_controls,$now,$then) = @_;
-    $r->print(&Apache::loncommon::start_data_table_row());
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     'users');
     my $curr_user_list;
@@ -1096,7 +1096,6 @@ sub users_row {
         $curr_user_list = &sort_users($content->{'users'});
     }
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc  ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30"  rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');
-    $r->print(&Apache::loncommon::end_data_table_row());
 }
 
 sub additional_item {
@@ -1107,17 +1106,17 @@ sub additional_item {
 
 sub actionbox {
     my ($status,$num,$scope) = @_;
-    my $output = '<nobr><label>';
+    my $output = '<span style="white-space: nowrap"><label>';
     if ($status eq 'new') {
         $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.
         &mt('Activate');
     } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.
-                   '" />'.&mt('Delete').'</label><br /><nobr>'.
+                   '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.
                    '<label><input type="checkbox" name="update" value="'.
                    $num.'" />'.&mt('Update');
     }
-    $output .= '</label></nobr><input type="hidden" name="scope_'.$num.                '" value="'.$scope.'" />';
+    $output .= '</label></span><input type="hidden" name="scope_'.$num.                '" value="'.$scope.'" />';
     return $output;
 }
                                                                                    
@@ -1132,10 +1131,10 @@ 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;<nobr><label>'.
+                                undef,undef,1). '&nbsp;&nbsp;<span style="white-space: nowrap"><label>'.
                                 '<input type="checkbox" name="noend_'.
                                 $num.'" '.$noend.' />'.&mt('No end date').
-                                '</label></nobr>';
+                                '</label></span>';
                                                                                    
     my $output = &mt('Start: ').$startdate.'<br />'.&mt('End: ').$enddate;
     return $output;