Index: openacs-4/packages/dotlrn/www/admin/users-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/users-search.adp	11 Feb 2002 20:17:00 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/users-search.adp	15 Mar 2002 02:06:48 -0000	1.2
@@ -5,11 +5,69 @@
 <p></p>
 
 <if @is_request@ ne 0>
-  <formtemplate id="user_search"></formtemplate>
+    <table width="60%" cellspacing="3" cellpadding="3">
+    <formtemplate id="user_search">
+
+      <tr>
+        <th align="left">Name / Email</th>
+        <td><formwidget id="name"></td>
+      </tr>
+
+      <tr>
+        <th align="left">ID</th>
+        <td><formwidget id="id"></td>
+      </tr>
+
+      <tr>
+        <th align="left">User Type</th>
+        <td><formwidget id="type"></td>
+      </tr>
+
+      <tr>
+        <th align="left">Access Level</th>
+        <td><formwidget id="access_level"></td>
+      </tr>
+
+      <tr>
+        <th align="left">Guest?</th>
+        <td><formwidget id="private_data_p"></td>
+      </tr>
+
+      <tr>
+        <th align="left">Role</th>
+        <td>
+          <formgroup id="role">
+            @formgroup.widget@&nbsp;@formgroup.label@&nbsp;&nbsp;
+          </formgroup>
+        </td>
+      </tr>
+
+      <tr>
+        <th align="left">Last visit over</th>
+        <th align="left"><formwidget id="last_visit_greater">&nbsp; days ago</th>
+      </tr>
+
+      <tr>
+        <th align="left">Last visit under</th>
+        <th align="left"><formwidget id="last_visit_less">&nbsp; days ago</th>
+      </tr>
+
+      <tr>
+        <th align="left">Join the above criteria with</th>
+        <td><formwidget id="join_criteria"></td>
+      </tr>
+
+      <tr align="center">
+        <td colspan="2"><input type="submit" value="Search"></td>
+      </tr>
+
+    </formtemplate>
+  </table>
 </if>
 <else>
   <if @n_users@ gt 0>
-    <formtemplate id="user_search_results"></formtemplate>
+    <formtemplate id="user_search_results">
+    </formtemplate>
   </if>
   <else>
     <p>
Index: openacs-4/packages/dotlrn/www/admin/users-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/users-search.tcl	14 Mar 2002 23:30:26 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/users-search.tcl	15 Mar 2002 02:06:48 -0000	1.12
@@ -83,21 +83,21 @@
 element create user_search type \
     -label "Type" \
     -datatype text \
-    -widget radio \
+    -widget select \
     -options "{Any any} [dotlrn::get_user_types_as_options]" \
     -value $type
 
 element create user_search access_level \
     -label "Access Level" \
     -datatype text \
-    -widget radio \
+    -widget select \
     -options {{Any any} {Limited limited} {Full full}} \
     -value $access_level
 
 element create user_search private_data_p \
     -label "Guest?" \
     -datatype text \
-    -widget radio \
+    -widget select \
     -options {{Any any} {Yes f} {No t}} \
     -value $private_data_p
 
@@ -125,7 +125,7 @@
 element create user_search join_criteria \
     -label "Join the above criteria by" \
     -datatype text \
-    -widget radio \
+    -widget select \
     -options {{And and} {Or or}} \
     -value $join_criteria