Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -r1.11.12.1 -r1.11.12.2
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	6 Mar 2007 07:45:25 -0000	1.11.12.1
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	30 Mar 2007 11:37:30 -0000	1.11.12.2
@@ -92,7 +92,7 @@
             if {[string compare $option_val $thisoption] == 0} {
                 append html "<strong>[lindex $option_value 1]</strong>"
             } else {
-                append html "<a href=\"$url?[export_ns_set_vars "url" $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $thisoption]\">[lindex $option_value 1]</a>"
+                append html "<a href=\"$url?[export_ns_set_vars "url" $option_key $options_set][ad_quotehtml &][ns_urlencode $option_key]=[ns_urlencode $thisoption]\">[lindex $option_value 1]</a>"
             }
         }
         append html "\]</td>\n"
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.47.2.11 -r1.47.2.12
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	29 Mar 2007 19:20:57 -0000	1.47.2.11
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	30 Mar 2007 11:37:31 -0000	1.47.2.12
@@ -39,7 +39,7 @@
 
   <msg key="admin_pages_navbar_name">Admin</msg>
   <msg key="Administer">Administer</msg>
-  <msg key="administer_link">&lt;img border=0 valign=&quot;bottom&quot; src=&quot;/resources/dotlrn/admin.gif&quot; alt=&quot;Administer&quot;&gt;</msg>
+  <msg key="administer_link">&lt;img border=0 src=&quot;/resources/dotlrn/admin.gif&quot; alt=&quot;Administer&quot;&gt;</msg>
   <msg key="Administration">Administration</msg>
   <msg key="Administration_Accesskey">a</msg>
   <msg key="Administration_Cockpit">Administration Cockpit</msg>
@@ -93,24 +93,17 @@
   <msg key="class_name">%classes_pretty_name% Name</msg>
   <msg key="class_name_header">%class_instances_pretty_name% Name</msg>
   <msg key="class_page_calendar_title">Calendar</msg>
-  <msg key="class_page_calendar_accesskey">C</msg>
   <msg key="class_page_file_storage_title">File Storage</msg>
-  <msg key="class_page_file_storage_accesskey">F</msg>
   <msg key="class_page_home_title">Class Home</msg>
-  <msg key="class_page_home_accesskey">H</msg>
   <msg key="Classes">Classes</msg>
   <msg key="classes_pretty_name">Subject</msg>
   <msg key="classes_pretty_plural">Subjects</msg>
   <msg key="Closed">Closed</msg>
   <msg key="club_access_key">c</msg>
   <msg key="club_page_calendar_title">Calendar</msg>
-  <msg key="club_page_calendar_accesskey">C</msg>
   <msg key="club_page_file_storage_title">File Storage</msg>
-  <msg key="club_page_file_storage_accesskey">F</msg>
   <msg key="club_page_home_title">Community Home</msg>
-  <msg key="club_page_home_accesskey">H</msg>
   <msg key="club_page_people_title">People</msg>
-  <msg key="club_page_people_accesskey">P</msg>
   <msg key="clubs_name_header">%clubs_pretty_name% Name</msg>
   <msg key="clubs_pretty_name">Community</msg>
   <msg key="clubs_pretty_plural">Communities</msg>
@@ -591,6 +584,7 @@
   <msg key="Screen_name">Screen name:</msg>
   <msg key="Search">Search</msg>
   <msg key="search">search</msg>
+  <msg key="Search_classes_with">Search classes with</msg>
   <msg key="Search_departments_with">Search department with
 </msg>
   <msg key="Search_subjects_with">Search subjects with
@@ -640,13 +634,9 @@
   <msg key="student_role_pretty_name">Student</msg>
   <msg key="student_role_pretty_plural">Students</msg>
   <msg key="subcomm_page_calendar_title">Calendar</msg>
-  <msg key="subcomm_page_calendar_accesskey">C</msg>
   <msg key="subcomm_page_file_storage_title">Files</msg>
-  <msg key="subcomm_page_file_storage_accesskey">F</msg>
   <msg key="subcomm_page_home_title">Subgroup Home</msg>
-  <msg key="subcomm_page_home_accesskey">H</msg>
   <msg key="subcomm_page_info_title">Subgroup Info</msg>
-  <msg key="subcomm_page_info_accesskey">I</msg>
   <msg key="subcommunities_access_key">c</msg>
   <msg key="subcommunities_pretty_name">Subgroup</msg>
   <msg key="subcommunities_pretty_plural">Subgroups</msg>
@@ -694,11 +684,8 @@
   <msg key="User_ID_1">User ID</msg>
   <msg key="User_Management">User Management</msg>
   <msg key="user_portal_page_calendar_title">My Calendar</msg>
-  <msg key="user_portal_page_calendar_accesskey">C</msg>
   <msg key="user_portal_page_file_storage_title">My Files</msg>
-  <msg key="user_portal_page_file_storage_accesskey">F</msg>
   <msg key="user_portal_page_home_title">My Space</msg>
-  <msg key="user_portal_page_home_accesskey">H</msg>
   <msg key="user_portal_pretty_name">User</msg>
   <msg key="User_Search">User Search</msg>
   <msg key="User_Type">User Type</msg>
Index: openacs-4/packages/dotlrn/www/admin/class-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-edit.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/dotlrn/www/admin/class-edit.tcl	8 Aug 2006 21:26:28 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/class-edit.tcl	30 Mar 2007 11:37:31 -0000	1.10.2.1
@@ -57,7 +57,7 @@
     -label [_ dotlrn.Description] \
     -datatype text \
     -widget textarea \
-    -html {rows 5 cols 60 wrap soft} \
+    -html {rows 5 cols 60} \
     -optional
 
 element create edit_class referer \
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v
diff -u -r1.28 -r1.28.2.1
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	15 Dec 2006 22:45:22 -0000	1.28
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	30 Mar 2007 11:37:31 -0000	1.28.2.1
@@ -47,7 +47,7 @@
 
     {description:text(textarea),optional
 	{label "#dotlrn.Description#"}
-	{html {rows 5 cols 60 wrap soft}}
+	{html {rows 5 cols 60}}
 	{help_text "[_ dotlrn.lt_do_not_use_p_tags]"}
     }	
     
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.33.2.2 -r1.33.2.3
--- openacs-4/packages/dotlrn/www/admin/class.adp	3 Mar 2007 22:39:08 -0000	1.33.2.2
+++ openacs-4/packages/dotlrn/www/admin/class.adp	30 Mar 2007 11:37:31 -0000	1.33.2.3
@@ -34,7 +34,7 @@
 	</p>
 
 
-	  <a href="class-edit?class_key=@class_key@&referer=@referer@" class="button">#dotlrn.edit_subject_properties#</a>
+	  <a href="@class_edit_url@" class="button">#dotlrn.edit_subject_properties#</a>
 
 	<br><br>
 
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/dotlrn/www/admin/class.tcl	8 Aug 2006 21:26:28 -0000	1.19
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	30 Mar 2007 11:37:31 -0000	1.19.2.1
@@ -120,15 +120,15 @@
         actions {
             label "[_ dotlrn.actions]"
 	    display_template {
-		<nobr>
 		<small>
 		<a href="@class_instances.url@one-community-admin">[_ dotlrn.administer_link]</a> 
 		</small>
-		</nobr>
 	    }
         }
     }
 
 db_multirow class_instances $query {}
 
+set class_edit_url [export_vars -base class-edit {class_key referer}]
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -r1.22.2.1 -r1.22.2.2
--- openacs-4/packages/dotlrn/www/admin/departments.adp	15 Feb 2007 15:42:45 -0000	1.22.2.1
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	30 Mar 2007 11:37:31 -0000	1.22.2.2
@@ -21,6 +21,7 @@
   <master src="dotlrn-admin-master">
     <property name="title">@title@</property>
     <property name="context_bar">@context_bar@</property>
+    <br>
     <center>
       <form action="departments" method="GET">
         #dotlrn.Search_departments_with# 
@@ -29,6 +30,7 @@
       </form>
     </center>
     <if @departments:rowcount@ gt 0>
+        <br>
       <center>
 	<listtemplate name="departments"></listtemplate>
       </center>
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -r1.25.2.1 -r1.25.2.2
--- openacs-4/packages/dotlrn/www/admin/term.adp	15 Feb 2007 15:42:45 -0000	1.25.2.1
+++ openacs-4/packages/dotlrn/www/admin/term.adp	30 Mar 2007 11:37:31 -0000	1.25.2.2
@@ -45,15 +45,15 @@
 	  @end_date@
 	</li>
 
-	<br>
+      </ul>
+      <ul>
 
 	  <li>
-	    <a href="term-edit?term_id=@term_id@&referer=@referer@">#dotlrn.Edit#</a> #dotlrn.term_properties#
+	    <a href="@term_edit_url@">#dotlrn.Edit#</a> #dotlrn.term_properties#
 	  </li>
 
       </ul>
 
-      <br>
     </if>
 
     <center>
@@ -86,7 +86,7 @@
               <input type="submit" value="#dotlrn.Go#" />
 	    </form>
 	  </div>
-
+      <br>
 	  <listtemplate name="classes"></listtemplate>
 
 	</if>
Index: openacs-4/packages/dotlrn/www/admin/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/dotlrn/www/admin/term.tcl	8 Aug 2006 21:26:28 -0000	1.15
+++ openacs-4/packages/dotlrn/www/admin/term.tcl	30 Mar 2007 11:37:31 -0000	1.15.2.1
@@ -162,11 +162,9 @@
     [list label "[_ dotlrn.Actions]" \
 	 display_template {
 	     <center>
-	     <nobr>
 	     <small>
 	     <a href="@classes.url@one-community-admin">[_ dotlrn.administer_link]</a>
 	     </small>
-	     </nobr>
 	     </center>
 	 }]
 
@@ -183,4 +181,5 @@
 
 db_multirow classes $query {}
 
+set term_edit_url [export_vars -base term-edit {term_id referer}]
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp,v
diff -u -r1.13 -r1.13.6.1
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp	24 Feb 2005 13:33:07 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp	30 Mar 2007 11:37:31 -0000	1.13.6.1
@@ -22,63 +22,59 @@
 <property name="title">#dotlrn.Users_Bulk_Upload#</property>
 <property name="context_bar">@context_bar@</property>
 
-#dotlrn.lt_Here_you_can_create_s#
+<p>#dotlrn.lt_Here_you_can_create_s#</p>
 
 <p>
-
 <strong>#dotlrn.Be_sure#</strong> #dotlrn.lt_to_use_vaild_email_ad#
-
 </p>
 
 
 <div style="font-size: large; font-weight: bold;">#dotlrn.CSV_File_Format#</div>
 
-<p style="text-indent: 1em">
+<div style="text-indent: 1em">
   
   <strong>#dotlrn.First_Line#</strong>
 
   <p style="text-indent: 2em">
-  
     #dotlrn.first_line_of_file_must_be#
-    
+  </p>
+
     <div style="text-indent: 3em; font-family: monospace">
       first_names,last_name,email,username,password,type,access_level,guest,notify
     </div>
-   
-  </p>
 
-</p>
+</div>
 
 <p style="text-indent: 1em">
-
   <strong>#dotlrn.Fields#</strong>
+</p>
   
   <ul>
-    <li><tt>first_names</tt> - <em>#dotlrn.required#</em>
-    <li><tt>last_name</tt> - <em>#dotlrn.required#</em>
-    <li><tt>email</tt> - <em>#dotlrn.required#</em>
-    <li><tt>username</tt> - <em>#dotlrn.optional_defaults_to# email</em>
-    <li><tt>password</tt> - <em><em>#dotlrn.optional_defaults_to# random value</em>
+    <li><tt>first_names</tt> - <em>#dotlrn.required#</em></li>
+    <li><tt>last_name</tt> - <em>#dotlrn.required#</em></li>
+    <li><tt>email</tt> - <em>#dotlrn.required#</em></li>
+    <li><tt>username</tt> - <em>#dotlrn.optional_defaults_to# email</em></li>
+    <li><tt>password</tt> - <em>#dotlrn.optional_defaults_to# random value</em></li>
     <li><tt>type</tt> - <em>#dotlrn.required#</em> #dotlrn.must_have_values# 
       <ul>
-        <li>professor
-        <li>student
-        <li>admin
-        <li>external
+        <li>professor</li>
+        <li>student</li>
+        <li>admin</li>
+        <li>external</li>
       </ul>
+    </li>
     <li><tt>access_level</tt> - <em>#dotlrn.optional_defaults_to# full</em> - 
-        <em>#dotlrn.must_have_values#</em> <tt>full</tt>, <tt>limited</tt>
+        <em>#dotlrn.must_have_values#</em> <tt>full</tt>, <tt>limited</tt></li>
     <li><tt>guest</tt> - <em>#dotlrn.optional_defaults_to# f</em> -
-        <em>#dotlrn.must_have_values#</em> <tt>t</tt>, <tt>f</tt>
+        <em>#dotlrn.must_have_values#</em> <tt>t</tt>, <tt>f</tt></li>
     <li><tt>notify</tt> - <em>#dotlrn.optional_defaults_to# f</em>    
-        <em>#dotlrn.must_have_values#</em> <tt>t</tt>, <tt>f</tt>
+        <em>#dotlrn.must_have_values#</em> <tt>t</tt>, <tt>f</tt></li>
   </ul>
   
-</p>
 
 <p style="text-indent: 1em">
-
   <strong>#dotlrn.Example_File#</strong>
+</p>
   
   <pre>
     first_names,last_name,email,username,password,type,access_level,guest,notify
@@ -88,17 +84,13 @@
     Intersted,Onlooker,onlooker@_somewhere_.net,,,external,limited,t,t
   </pre>
   
-</p>
-
 <p style="text-indent: 1em">
-
 #dotlrn.lt_Note_you_will_have_th#
-
 </p>
 
 <div style="padding-left: 1em">
 
-  <FORM enctype=multipart/form-data method=post action=users-bulk-upload-2>
+  <FORM enctype="multipart/form-data" method=post action="users-bulk-upload-2">
   <INPUT TYPE=file name=users_csv_file>
   <br>
   <br>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp,v
diff -u -r1.8 -r1.8.12.1
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	23 Oct 2002 12:38:40 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	30 Mar 2007 11:37:31 -0000	1.8.12.1
@@ -34,7 +34,7 @@
 
 </formtemplate>
 
-<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
+<include src="users-chunk" type=@type@ &users="users" referer=@referer;noquote@>
 
 
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp,v
diff -u -r1.8 -r1.8.12.1
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	25 Sep 2003 17:50:53 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	30 Mar 2007 11:37:31 -0000	1.8.12.1
@@ -20,6 +20,6 @@
 
 <p>@control_bar;noquote@</p>
 
-<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
+<include src="users-chunk" type=@type@ &users="users" referer=@referer;noquote@>
 
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp,v
diff -u -r1.8 -r1.8.12.1
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	12 Nov 2002 08:44:06 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	30 Mar 2007 11:37:31 -0000	1.8.12.1
@@ -18,4 +18,4 @@
 
 %>
 
-<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
+<include src="users-chunk" type=@type@ &users="users" referer=@referer;noquote@>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v
diff -u -r1.26 -r1.26.2.1
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	8 Aug 2006 21:26:28 -0000	1.26
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	30 Mar 2007 11:37:31 -0000	1.26.2.1
@@ -77,8 +77,8 @@
 
     <if @oacs_site_wide_admin_p@ true>
     <% # We had to escape to Tcl to get the desired behavior. AG %>
-    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
-    <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
+    <small><a href="@users.state_change_url@">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
+    <a href="@users.nuke_url@">#acs-kernel.common_delete#</a></small>
     </td>
 </if>
 <else>
@@ -96,10 +96,10 @@
  <td align="center">
   <if @user_id@ ne @users.user_id@>
     <if @users.site_wide_admin_p@ true>
-      <b>#dotlrn.Yes#</b> | <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=@referer@" title="#dotlrn.Revoke_site_wide_admin#">#dotlrn.No#</a>
+      <b>#dotlrn.Yes#</b> | <a href="@users.swa_revoke_url@" title="#dotlrn.Revoke_site_wide_admin#">#dotlrn.No#</a>
     </if>
     <else>
-      <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=grant&referer=@referer@" title="#dotlrn.Grant_site_wide_admin#">#dotlrn.Yes#</a> | <b>#dotlrn.No#</b>
+      <a href="@users.swa_grant_url@" title="#dotlrn.Grant_site_wide_admin#">#dotlrn.Yes#</a> | <b>#dotlrn.No#</b>
     </else>
   </if>
       <else>#dotlrn.Yes#</else>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/dotlrn/www/admin/users-chunk.tcl	8 Aug 2006 21:26:28 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.tcl	30 Mar 2007 11:37:31 -0000	1.10.2.1
@@ -31,5 +31,15 @@
     set referer "[dotlrn::get_admin_url]/users"
 }
 
+template::multirow extend users state_change_url nuke_url swa_grant_url swa_revoke_url
+
+template::multirow foreach users {
+    set return_url "[dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$referer"
+    set state_change_url [export_vars -base "/acs-admin/users/member-state-change" {{member_state approved} user_id return_url}] 
+    set nuke_url [export_vars -base user-nuke {user_id referer}]
+    set swa_grant_url [export_vars -base site-wide-admin-toggle {{value grant} user_id referer}]
+    set swa_revoke_url [export_vars -base site-wide-admin-toggle {{value revoke} user_id referer}]
+}
+
 ad_return_template
 
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.10 -r1.10.6.1
--- openacs-4/packages/dotlrn/www/admin/users-search.adp	20 Apr 2004 21:13:22 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/users-search.adp	30 Mar 2007 11:37:31 -0000	1.10.6.1
@@ -25,64 +25,7 @@
 <p></p>
 
 <if @is_request@ ne 0>
-    <table width="60%" cellspacing="3" cellpadding="3">
-    <formtemplate id="user_search">
-
-      <tr>
-        <th align="left">#dotlrn.Name__Email#</th>
-        <td><formwidget id="name"></td>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.ID#</th>
-        <td><formwidget id="id"></td>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.User_Type#</th>
-        <td><formwidget id="type"></td>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.Access_Level#</th>
-        <td><formwidget id="can_browse_p"></td>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.Guest#</th>
-        <td><formwidget id="guest_p"></td>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.Role#</th>
-        <td>
-          <formgroup id="role">
-            @formgroup.widget;noquote@&nbsp;@formgroup.label@&nbsp;&nbsp;
-          </formgroup>
-        </td>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.Last_visit_over#</th>
-        <th align="left"><formwidget id="last_visit_greater"></th>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.Last_visit_under#</th>
-        <th align="left"><formwidget id="last_visit_less"></th>
-      </tr>
-
-      <tr>
-        <th align="left">#dotlrn.lt_Join_the_above_criter#</th>
-        <td><formwidget id="join_criteria"></td>
-      </tr>
-
-      <tr align="center">
-        <td colspan="2"><input type="submit" value="#dotlrn.Search#"></td>
-      </tr>
-
-    </formtemplate>
-  </table>
+    <formtemplate id="user_search"></formtemplate>
 </if>
 <else>
   <if @n_users@ gt 0>
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.31.2.1 -r1.31.2.2
--- openacs-4/packages/dotlrn/www/admin/users.adp	29 Mar 2007 14:55:40 -0000	1.31.2.1
+++ openacs-4/packages/dotlrn/www/admin/users.adp	30 Mar 2007 11:37:31 -0000	1.31.2.2
@@ -28,7 +28,7 @@
   <a href="users-search" class="button">#dotlrn.Search_Users#</a>
   <a href="users-bulk-upload" class="button">#dotlrn.Bulk_Upload#</a>
   <a href="users-bulk-approve" class="button">#dotlrn.Bulk_Approve#</a>
-    </p>
+</p>
 
 <form method="get" action="users-search">
   #dotlrn.lt_Search_dotLRN_users_f# <input type="text" name="name"><input type="submit" value="#dotlrn.search#">
@@ -43,16 +43,16 @@
 
 <p></p>
 
-<p>@control_bar;noquote@</p>
+@control_bar;noquote@
 
 <if @n_users@ gt 500>
-  <include src="users-chunk-large" type=@type@ referer="@referer@?type=@type@">
+  <include src="users-chunk-large" type=@type@ referer="@referer;noquote@">
 </if>
 <else>
   <if @n_users@ gt 50>
-    <include src="users-chunk-medium" type=@type@ referer="@referer@?type=@type@">
+    <include src="users-chunk-medium" type=@type@ referer="@referer;noquote@">
   </if>
   <else>
-    <include src="users-chunk-small" type=@type@ referer="@referer@?type=@type@">
+    <include src="users-chunk-small" type=@type@ referer="@referer;noquote@">
   </else>
 </else>