Index: openacs-4/packages/acs-admin/www/users/complex-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/users/complex-search.adp	10 Sep 2003 15:22:09 -0000	1.6
+++ openacs-4/packages/acs-admin/www/users/complex-search.adp	12 Sep 2003 13:25:50 -0000	1.7
@@ -7,14 +7,18 @@
 </if><else>
   <if @criteria:rowcount@ eq 1>
     for users matching the criterion:
+    <ul>
     <multiple name="criteria">
       <li> @criteria.data@ </li>
     </multiple>
+    </ul>
   </if><else>
     for users matching <b> @combine_method@ </b> of the criteria:
+    <ul>
     <multiple name="criteria">
       <li> @criteria.data@ </li>
     </multiple>
+    </ul>
   </else>
 </else>
 
Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/users/one.adp	11 Sep 2003 14:12:31 -0000	1.11
+++ openacs-4/packages/acs-admin/www/users/one.adp	12 Sep 2003 13:25:50 -0000	1.12
@@ -2,24 +2,18 @@
 <property name=title>@first_names;noquote@ @last_name;noquote@</property>
 <property name="context">@context;noquote@</property>
 
+<h2>Basic Information</h2>
+
+<include src="/packages/acs-subsite/lib/user-info" user_id="@user_id@" return_url="@return_url@">
+
 <ul>
-<li>Name:  @first_names@ @last_name@ (<a href="@public_link@">public page</a>)</li>
-<li>Email:  <a href="mailto:@email@">@email@</a></li>
-<li>Username:  @username@</li>
-<li>Screen name:  @screen_name;noquote@ </li>
-<if @url@ not nil>
-  <li>Homepage: <a href="@url@">@url@</a></li>
-</if>
 <li>User ID:  @user_id@</li>
-</ul>
-[<a href="/user/basic-info-update?@export_edit_vars@">edit user information</a>]
-<ul>
+<li><a href="@public_link@">View community member page</a></li>
 <li>Registration date:  @registration_date@</li>
 <li>Registration IP: @creation_ip@ (<a href="complex-search?target=one&amp;ip=@creation_ip@" title="other registrations from this IP address">others</a>)</li>
-<if @last_visit@ not nil>
-  <li>Last visit: @last_visit@</li>
-</if>
+<li>Last visit: @last_visit_pretty@</li>
 
+
 <if @portrait_p@ eq 1>
   <li>Portrait:  <a href="/shared/portrait?user_id=@user_id@">@portrait_title@</a></li>
 </if>
Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/users/one.tcl	11 Sep 2003 14:12:31 -0000	1.11
+++ openacs-4/packages/acs-admin/www/users/one.tcl	12 Sep 2003 13:25:50 -0000	1.12
@@ -23,12 +23,11 @@
     user_finite_state_links:onevalue
 }
 
-if ![db_0or1row user_info "select first_names, last_name, username, email, coalesce(screen_name,'&lt none set up &gt') as screen_name, creation_date, creation_ip, last_visit, member_state, email_verified_p, url
-from cc_users
-where user_id = :user_id"] {
+if { ![db_0or1row user_info {}] } {
     ad_return_complaint 1 "<li>We couldn't find user #$user_id; perhaps this person was deleted?"
     return
 }
+set last_visit_pretty [lc_time_fmt $last_visit_ansi "%q %X"]
 
 #
 # RBM: Check if the requested user is a site-wide admin and warn the 
Index: openacs-4/packages/acs-admin/www/users/one.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/users/one.xql	3 Sep 2003 19:48:24 -0000	1.13
+++ openacs-4/packages/acs-admin/www/users/one.xql	12 Sep 2003 13:25:50 -0000	1.14
@@ -3,12 +3,19 @@
 
 <fullquery name="user_info">      
       <querytext>
-      select first_names, last_name, username, email,
-          coalesce(screen_name,'&lt; none set up &gt;') as screen_name,
-          creation_date, creation_ip, last_visit, member_state,
-          email_verified_p, url
-      from cc_users
-      where user_id = :user_id
+      select first_names, 
+             last_name, 
+             username, 
+             email,
+             coalesce(screen_name,'&lt; none set up &gt;') as screen_name,
+             creation_date, 
+             creation_ip, 
+             to_char(last_visit, 'YYYY-MM-DD HH24:MI:SS') as last_visit_ansi, 
+             member_state,
+             email_verified_p, 
+             url
+      from   cc_users
+      where  user_id = :user_id
       </querytext>
 </fullquery>