--- loncom/interface/loncommon.pm	2007/08/14 19:32:27	1.562
+++ loncom/interface/loncommon.pm	2007/08/15 16:25:14	1.563
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.562 2007/08/14 19:32:27 albertel Exp $
+# $Id: loncommon.pm,v 1.563 2007/08/15 16:25:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1424,7 +1424,7 @@ sub select_level_form {
 
 =pod
 
-=item * select_dom_form($defdom,$name,$includeempty)
+=item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1433,18 +1433,28 @@ See loncreateuser.pm for an example invo
 If the $includeempty flag is set, it also includes an empty choice ("no domain
 selected");
 
+If the $showdomdesc flag is set, the domain name is followed by the domain description. 
+
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty) = @_;
+    my ($defdom,$name,$includeempty,$showdomdesc) = @_;
     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
     foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".
-            ($dom eq $defdom ? 'selected="selected" ' : '').
-                ">$dom</option>\n";
+            ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
+        if ($showdomdesc) {
+            if ($dom ne '') {
+                my $domdesc = &Apache::lonnet::domain($dom,'description');
+                if ($domdesc ne '') {
+                    $selectdomain .= ' ('.$domdesc.')';
+                }
+            } 
+        }
+        $selectdomain .= "</option>\n";
     }
     $selectdomain.="</select>";
     return $selectdomain;
@@ -5565,9 +5575,8 @@ sub user_picker {
         $srchterm = $srch->{'srchterm'};
     }
     my %lt=&Apache::lonlocal::texthash(
-                    'usr'       => 'Search for',
-                    'or'        => 'or',
-                    'doma'      => 'domain',
+                    'usr'       => 'Search criteria',
+                    'doma'      => 'Domain/institution to search',
                     'uname'     => 'username',
                     'lastname'  => 'last name',
                     'lastfirst' => 'last name, first name',
@@ -5578,9 +5587,8 @@ sub user_picker {
                     'exact'     => 'is',
                     'contains'  => 'contains',
                                        );
-    my $domform = &select_dom_form($currdom,'srchdomain',1);
-
-    my $srchin;
+    my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+    my $srchinsel = ' <select name="srchin">';
 
     my @srchins = ('crs','dom','alc','instd');
 
@@ -5590,18 +5598,15 @@ sub user_picker {
         #       has been completed.
         next if ($option eq 'alc');
         next if ($option eq 'crs' && !$env{'request.course.id'});
-        my $checked =($curr_selected{'srchin'} eq $option) ?'checked="checked"'
-	                                                   :'';
-	my $extra = ($option eq 'dom') ? $domform
-	                               : '';
-	$srchin.=<<ROW
- <tr>
-   <td>
-     <label><input type="radio" name="srchin" value="$option" $checked /> $lt{$option}</label> $extra
-   </td>
-</tr>
-ROW
+        if ($curr_selected{'srchin'} eq $option) {
+            $srchinsel .= ' 
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+        } else {
+            $srchinsel .= '
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
+        }
     }
+    $srchinsel .= "\n  </select>\n";
 
     my $srchbysel =  ' <select name="srchby">';
     foreach my $option ('uname','lastname','lastfirst') {
@@ -5641,8 +5646,8 @@ function setSearch(createnew) {
             }
         }
         for (var i=0; i<document.crtuser.srchin.length; i++) {
-            if ( document.crtuser.srchin[i].value == 'dom') {
-		document.crtuser.srchin[i].checked = 1;
+            if ( document.crtuser.srchin.options[i].value == 'dom') {
+		document.crtuser.srchin.selectedIndex = i;
             }
         }
         for (var i=0; i<document.crtuser.srchtype.length; i++) {
@@ -5677,6 +5682,7 @@ function validateEntry() {
     var srchby = document.crtuser.srchby.options[document.crtuser.srchby.selectedIndex].value;
     var srchdomain = document.crtuser.srchdomain.options[document.crtuser.srchdomain.selectedIndex].value;
     var srchterm =  document.crtuser.srchterm.value;
+    var srchin = document.crtuser.srchin.options[document.crtuser.srchin.selectedIndex].value;
     var msg = "";
 
     if (srchterm == "") {
@@ -5687,7 +5693,7 @@ function validateEntry() {
     if (srchtype== 'contains') {
         if (srchterm.length < 3) {
             checkok = 0;
-            msg += "The text you are searching for must contain at least three characters when using a 'contained in' type search.\\n";
+            msg += "The text you are searching for must contain at least three characters when using a 'contains' type search.\\n";
         }
     }
     if (srchin == 'instd') {
@@ -5729,12 +5735,18 @@ $new_user_create
 
 <table>
  <tr>
-  <td> $srchbysel
-       $srchtypesel 
-       <input type="text" size="15" name="srchterm" value="$srchterm" />
+  <td>$lt{'usr'}:</td>
+  <td>$srchbysel
+      $srchtypesel 
+      <input type="text" size="15" name="srchterm" value="$srchterm" />
+      &nbsp;&nbsp;$srchinsel 
+  </td>
+ </tr>
+ <tr>
+  <td align="right">$lt{'doma'}:</td>
+  <td>$domform</td>
   </td>
  </tr>
-$srchin
 </table>
 <br />
 END_BLOCK