--- loncom/interface/lonpickcourse.pm	2008/05/19 21:40:26	1.71
+++ loncom/interface/lonpickcourse.pm	2008/07/01 05:26:04	1.73.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.71 2008/05/19 21:40:26 bisitz Exp $
+# $Id: lonpickcourse.pm,v 1.73.2.2 2008/07/01 05:26:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -228,14 +228,23 @@ sub display_matched_courses {
                  $menuchk = ' checked="checked" ';
             }
             $r->print(
+                '<table class="LC_pick_box">'.
+                '<tr class="LC_pick_box_row">'.
+                '<td class="LC_pick_box_title" rowspan="2">'.&mt('Action').'</td>'.
+                '<td class="LC_evenrow_value">'.
                 '<span class="LC_nobreak"><label>'.
                 '<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'.
                 '&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle).
-                '</label>'.('&nbsp;'x3).'</span><br />'.
+                '</label>'.('&nbsp;'x3).'</span>'.
+                '</td></tr>'.
+                '<tr class="LC_pick_box_row">'.
+                '<td class="LC_oddrow_value">'.
                 '<span class="LC_nobreak"><label>'.
                 '<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'.
                 &mt('View or modify course settings which only a [_1] may modify.',$dctitle).
-                '</label></span><br /><br />');
+                '</label></span>'.
+                '</td></tr></table>'.
+                '<br />');
         }
     }
     my %by_descrip;
@@ -267,14 +276,14 @@ sub display_matched_courses {
                  .'<th>'.&mt('Course Description').'</th>'
                  .'<th>'.&mt('Domain').'</th>'
                  .'<th>'.&mt('Course Code').'</th>'
-                 .'<th>'.&mt('Owner:Domain').'</th>'
-                 .'<th>'.&mt('Type').'</th>'
+                 .'<th>'.&mt('Owner/Co-owner(s)').'</th>'
+#                 .'<th>'.&mt('Type').'</th>'
                  );
         $r->print(&Apache::loncommon::end_data_table_header_row());
     }
     foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) {
-        $r->print(&Apache::loncommon::start_data_table_row());
         foreach my $course (@{$by_descrip{$description}}) {
+            $r->print(&Apache::loncommon::start_data_table_row());
             my $cleandesc=&HTML::Entities::encode($description,'<>&"');
             $cleandesc=~s/'/\\'/g;
             my ($cdom,$cnum)=split(/\_/,$course);
@@ -294,7 +303,7 @@ sub display_matched_courses {
                 ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
                 push(@owners,&unescape($singleowner));
             }
-            my $owner = join(', ',@owners);
+            my $ownerstr = join(', ',@owners);
             $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc).'</td>');
             $r->print('<td>'.$description.'</td>');
             $r->print('<td>');
@@ -308,28 +317,22 @@ sub display_matched_courses {
                 $r->print('&nbsp;');
             }
             $r->print('</td>');
-            $r->print('<td>');
-            if (@owners > 1) {
-#               $r->print(', '.&mt('owners').' - ',join(', ',@owners)); 
-                $r->print(join(', ',@owners)); 
-            } elsif (@owners == 1) {
-#               $r->print(', '.&mt('owner').' - '.$owner);
-                $r->print($owner);
-            }
-            $r->print('</td>');
-            $r->print('<td>');
-            if ($ttype ne '') {
-                $r->print(&mt(&unescape($ttype)));
-            } else {
-                $r->print('&nbsp;');
-            }
-            $r->print('</td>');
+            $r->print('<td>'.$ownerstr.'</td>');
+#            $r->print('<td>');
+#            if ($ttype ne '') {
+#                $r->print(&mt(&unescape($ttype)));
+#            } else {
+#                $r->print('&nbsp;');
+#            }
+#            $r->print('</td>');
             if ($multiple) { $r->print("</label>\n"); }
+            $r->print(&Apache::loncommon::end_data_table_row());
             # $r->print("<br />\n");
         }
-        $r->print(&Apache::loncommon::end_data_table_row());
     }
-    $r->print(&Apache::loncommon::end_data_table());
+    if (%courses) {
+        $r->print(&Apache::loncommon::end_data_table());
+    }
 
     if (!%courses) {
         $r->print(&mt('None found'));
@@ -449,8 +452,8 @@ sub build_filters {
                 $list->{'instcodefilter'}.'" />';
     }
     foreach my $posstype ('Course','Non-standard Course') {
-        $typeselectform.='<option value="'.$posstype.'" "'.
-            ($posstype eq $type ? 'selected="selected" ' : ''). ">$posstype</option>\n";
+        $typeselectform.='<option value="'.$posstype.'"'.
+            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
     }
     $typeselectform.="</select>";
     my $output = qq|
@@ -484,9 +487,9 @@ $multelement
     if ($domainselectform) {
         $output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
     }
-    if ($typeselectform) {
-        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
-    }
+#    if ($typeselectform) {
+#        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
+#    }
     if ($instcodeform) {
         $output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
     }