--- loncom/interface/lonhtmlcommon.pm	2005/10/04 19:59:15	1.112
+++ loncom/interface/lonhtmlcommon.pm	2005/11/15 20:46:40	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.112 2005/10/04 19:59:15 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.118 2005/11/15 20:46:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1246,7 +1246,7 @@ returns: nothing
 #
 # In general a &submit_row() call should proceed the call to &end_pick_box(),
 # as this routine adds a button for form submission.
-# &submit_row(0 does not require a &row_closure after it.
+# &submit_row() does not require a &row_closure after it.
 #  
 # &start_pick_box() creates a bounding table with 1-pixel wide black border.
 # rows should be placed between calls to &start_pick_box() and &end_pick_box.
@@ -1317,7 +1317,7 @@ ENDONE
 }
 
 sub row_closure {
-    my $output .= <<"ENDTWO";
+    my $output = <<"ENDTWO";
               </tr>
              </table>
             </td>
@@ -1333,16 +1333,26 @@ ENDTWO
 
 sub role_select_row {
     my ($roles,$col_width,$tablecolor,$title) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
+    my $output;
+    if (defined($title)) {
+        $output = &row_title($col_width,$tablecolor,$title);
+    }
     $output .= qq|               <td>
                                   <select name="roles" multiple >\n|;
-    foreach (@$roles) {
-        my $plrole=&Apache::lonnet::plaintext($_);
-        $output .= '  <option value="'.$_.'">'.$plrole.'</option>';
+    foreach my $role (@$roles) {
+        my $plrole;
+        if ($role eq 'ow') {
+            $plrole = &mt('Course Owner');
+        } else {
+            $plrole=&Apache::lonnet::plaintext($role);
+        }
+        $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
     }
     $output .= qq|                </select>
                                  </td>\n|;
-    $output .= &row_closure();
+    if (defined($title)) {
+        $output .= &row_closure();
+    }
     return $output;
 }
 
@@ -1354,10 +1364,10 @@ sub course_select_row {
 <script type="text/javascript" language="Javascript" >
     function coursePick (formname) {
         for  (var i=0; i<formname.coursepick.length; i++) {
+            if (formname.coursepick[i].value == 'category') {
+                courseSet('');
+            }
             if (!formname.coursepick[i].checked) {
-                if (formname.coursepick[i].value == 'category') {
-                    courseSet('');
-                }
                 if (formname.coursepick[i].value == 'specific') {
                     formname.coursetotal.value = 0;
                     formname.courselist = '';
@@ -1365,10 +1375,19 @@ sub course_select_row {
             }
         }
     }
+    function setPick (formname) {
+        for  (var i=0; i<formname.coursepick.length; i++) {
+            if (formname.coursepick[i].value == 'category') {
+                formname.coursepick[i].checked = true;
+            }
+            formname.coursetotal.value = 0;
+            formname.courselist = '';
+        }
+    }
 </script>
     |;
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
-                     ($formname,'pickcourse','pickdomain','coursedesc').'</b>';
+                     ($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
     if ($totcodes > 0) {
         $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses');
         my $numtitles = @$codetitles;
@@ -1376,18 +1395,18 @@ sub course_select_row {
             $output .= '<br /><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
                '<select name="'.$$codetitles[0].
-               '" onChange="courseSet('."'$$codetitles[0]'".')">'."\n".
+               '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
                ' <option value="-1" />Select'."\n";
             my @items = ();
             my @longitems = ();
             if ($$idlist{$$codetitles[0]} =~ /","/) {
-                @items = split/","/,$$idlist{$$codetitles[0]};
+                @items = split(/","/,$$idlist{$$codetitles[0]});
             } else {
                 $items[0] = $$idlist{$$codetitles[0]};
             }
             if (defined($$idlist_titles{$$codetitles[0]})) {
                 if ($$idlist_titles{$$codetitles[0]} =~ /","/) {
-                    @longitems = split/","/,$$idlist_titles{$$codetitles[0]};
+                    @longitems = split(/","/,$$idlist_titles{$$codetitles[0]});
                 } else {
                     $longitems[0] = $$idlist_titles{$$codetitles[0]};
                 }
@@ -1414,22 +1433,27 @@ sub course_select_row {
             $output .= '</tr></table><br />';
         }
     }
-    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".'rolefilter'."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."',''".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br /></td>'."\n";
+    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br /></td>'."\n";
     $output .= &row_closure();
     return $output;
 }
 
 sub status_select_row {
     my ($types,$col_width,$tablecolor,$title) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
+    my $output; 
+    if (defined($title)) {
+        $output = &row_title($col_width,$tablecolor,$title);
+    }
     $output .= qq|              <td>
                                     <select name="types" multiple>\n|;
-    foreach my $status_type (sort keys (%{$types})) {
+    foreach my $status_type (sort(keys(%{$types}))) {
         $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
     }
     $output .= qq|                   </select>
                                     </td>\n|; 
-    $output .= &row_closure();
+    if (defined($title)) {
+        $output .= &row_closure();
+    }
     return $output;
 }
 
@@ -1437,13 +1461,13 @@ sub email_default_row {
     my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;
     my $output = &row_title($col_width,$tablecolor,$title);
     my @rowcols = ('#eeeeee','#dddddd');
-    $output .= '              <td>'.$descrip.'
-                               <table>
-                                <tr>
-                                 <td><b>'.&mt('Authentication Method').'</b></td><td>&nbsp;&nbsp;&nbsp;</td><td>&nbsp;&nbsp;&nbsp;</td><td><b>'.&mt('Username -> e-mail conversion').'</b></td>
+    $output .= '              <td>'.$descrip;
+    $output .= &start_pick_box(''); 
+    $output .= '                <tr bgcolor="'.$tablecolor.'">
+                                 <td><b>'.&mt('Authentication Method').'</b></td><td align="right"><b>'.&mt('Username -> e-mail conversion').'</b></td>
                                 </tr>'."\n";
     my $rownum = 0;
-    foreach my $auth (sort keys (%{$authtypes})) {
+    foreach my $auth (sort(keys(%{$authtypes}))) {
         my ($userentry,$size);
         my $rowiter = $rownum%2;
         if ($auth =~ /^krb/) {
@@ -1453,11 +1477,11 @@ sub email_default_row {
             $userentry = 'username@';
             $size = 15;
         }
-        $output .= '<tr rowcolor="'.$rowcols[$rowiter].'"><td>  '.$$authtypes{$auth}.'</td><td>&nbsp;&nbsp;&nbsp;</td><td align="right">'.$userentry.'</td><td><input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
+        $output .= '<tr bgcolor="'.$rowcols[$rowiter].'"><td>  '.$$authtypes{$auth}.'</td><td align="right">'.$userentry.'<input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
         $rownum ++;
     }
-    $output .= "                   </table>
-                                  </td>\n";
+    $output .= &end_pick_box();
+    $output .= "                   <br /></td>\n"; 
     $output .= &row_closure();
     return $output;
 }
@@ -1465,7 +1489,7 @@ sub email_default_row {
 
 sub submit_row {
     my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;
-    my $output .= &row_title($col_width,$tablecolor,$title);
+    my $output = &row_title($col_width,$tablecolor,$title);
     $output .= qq|
             <td width="100%" valign="top" align="right">
              <br />