Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/users.adp	23 Jan 2002 00:15:44 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/users.adp	30 Jan 2002 22:54:59 -0000	1.12
@@ -2,68 +2,14 @@
 <property name="title">Users</property>
 <property name="context_bar">@context_bar@</property>
 
-[ <a href="/acs-admin/users/user-add?referer=/dotlrn/admin/users"><font size="-1">create a new user</font></a> ]
+[ <a href="../user-add?add_membership_p=f&referer=/dotlrn/admin/users"><font size="-1">Create A New User</font></a> ]
 
 <p></p>
 
 <form method="get" action="user-new">
   Add a new dotLRN user: <input type="text" name="search_text"><input type="submit" value="search">
 </form>
 
-<table border="0" cellpadding="2" cellspacing="0" width="650">
-  <tr bgcolor="black">
-    <td>
-      <table border="0" cellpadding="2" cellspacing="0" width="100%">
-        <tr bgcolor="#aaaaaa">
-          <th align="left" width="50%">User</th>
-          <th align="left">Type</th>
-          <th align="left">Access</th>
-          <th align="left">Read Private Data?</th>
-          <th align="left">Site-wide Admin?</th>
-        </tr>
-
-<% set i 0 %>
-
-<multiple name="users">
-
-<%
-  if {$i == 0} {set bgcolor white} else {set bgcolor #cccccc}
-  set i [expr 1 - $i]
-%>
-
-        <tr bgcolor="@bgcolor@">
-          <td><a href="user-edit?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)</td>
-          <td><i>@users.type@</i></td>
-          <td><if @users.limited_access_p@ eq t>limited</if><else>full</else></td>
-          <td><if @users.read_private_data_p@ eq t>yes</if><else>no</else></td>
-          <td>
-            <if @user_id@ ne @users.user_id@>
-              <if @users.site_wide_admin_p@ eq t>
-                <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=users">yes</a>
-              </if>
-              <else>
-                <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=grant&referer=users">no</a>
-              </else>
-            </if>
-            <else>yes</else>
-          </td>
-        </tr>
-
-</multiple>
-
-      </table>
-    </td>
-  </tr>
-</table>
-
 <p></p>
 
-<if @users:rowcount@ gt 10>
-<form method="get" action="user-new">
-  Add a new dotLRN user: <input type="text" name="search_text"><input type="submit" value="search">
-</form>
-
-<p></p>
-
-[ <a href="/acs-admin/users/user-add?referer=/dotlrn/admin/users"><font size="-1">create a new user</font></a> ]
-</if>
+<include src="users-chunk">