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 -N -r1.25 -r1.26
--- openacs-4/packages/acs-admin/www/users/one.adp	14 Jul 2015 22:26:55 -0000	1.25
+++ openacs-4/packages/acs-admin/www/users/one.adp	7 Aug 2017 23:47:45 -0000	1.26
@@ -7,31 +7,30 @@
 <include src="/packages/acs-subsite/lib/user-info" user_id="@user_id;literal@" return_url="@return_url;literal@">
 
 <ul>
-<li>User ID:  @user_id@</li>
-<li><a href="@user_info.url@">View community member page</a></li>
+<li>User ID:  @user_id;literal@</li>
+<li><a href="@user_info.url;noi18n@">View community member page</a></li>
 <li>Registration date:  @user_info.creation_date_pretty@</li>
-<li>Registration IP: @user_info.creation_ip@ (<a href="@user_info.by_ip_url@" title="Other registrations from this IP address">others</a>)</li>
-<li>Last visit: @user_info.last_visit_pretty@</li>
+<li>Registration IP: <a href="./ip-info?ip=@user_info.creation_ip@">@user_info.creation_ip@</a> (<a href="@user_info.by_ip_url@" title="Other registrations from this IP address">others</a>)</li>
+<li>Last visit: @user_info.last_visit_pretty@ from </li>
 
 
 <if @portrait_url@ not nil>
-  <li>Portrait:  <a href="@portrait_url@">@portrait_title@</a></li>
+  <li>Portrait:  <a href="@portrait_url;noi18n@">@portrait_title@</a></li>
 </if>
 </ul>
 
-<if @user_id@ ne @ad_conn_user_id@>
-  <if @warning_p@>
-      <!-- RBM: Added August 1, 2003 --!>
+<if @user_id;literal@ ne @ad_conn_user_id;literal@>
+  <if @warning_p;literal@ true>
       <p>
-        <b>WARNING:</b> This user is a site-wide administrator (maybe the only one).
+        <strong>WARNING:</strong> This user is a site-wide administrator (maybe the only one).
         Deleting or banning this user may mean you will be unable to administrate the site.
       </p>
   </if>
-  <p>Member state: <b>@user_info.member_state@</b> - change member state: @user_finite_state_links;noquote@<br>
+  <p>Member state: <strong>@user_info.member_state@</strong> - change member state: @user_finite_state_links;noquote@<br>
   Delete user: <a href="@delete_user_url@">temporarily</a>, <a href="@delete_user_permanent_url@">permanently</a></p>
 </if>
 <else>
-  <p>Member state: <b>@user_info.member_state@</b> <i>(cannot change state for yourself)</i></p>
+  <p>Member state: <strong>@user_info.member_state@</strong> <em>(cannot change state for yourself)</em></p>
 </else>
 
 <h2>This user is a member of the following groups:</h2>
@@ -41,7 +40,7 @@
 <ul>
   <multiple name="direct_group_membership">
     <li>@direct_group_membership.group_name@
-        (<a href="/admin/relations/remove?rel_id=@direct_group_membership.rel_id@&amp;return_url=@return_url@">Remove</a>)</li>
+        (<a href="/admin/relations/remove?rel_id=@direct_group_membership.rel_id@&amp;return_url=@return_url;noi18n@">Remove</a>)</li>
   </multiple>
 </ul>
 <p>
@@ -71,19 +70,19 @@
 <h2>Administrative Actions</h2>
 
 <ul>
-<if @site_wide_admin_p@ true>
-  <li><a href="modify-admin-privileges?user_id=@user_id@&amp;action=revoke">Revoke site-wide administration privileges</a></li>
+<if @site_wide_admin_p;literal@ true>
+  <li><a href="@modify_admin_url;noi18n@">Revoke site-wide administration privileges</a></li>
 </if>
 <else>
-  <li><a href="modify-admin-privileges?user_id=@user_id@&amp;action=grant">Grant site-wide administration privileges</a></li>
+  <li><a href="@modify_admin_url;noi18n@">Grant site-wide administration privileges</a></li>
 </else>
 
 <li>Merge this user with:
-   <form method=get action=search>
+   <form method="get" action="search">
    <div>
    <input type="hidden" name="target" value="merge">
-    <input type="hidden" name="limit_to_user_id" value="@user_id@">
-    <input type="hidden" name="from_user_id" value="@user_id@">
+    <input type="hidden" name="limit_to_user_id" value="@user_id;literal@">
+    <input type="hidden" name="from_user_id" value="@user_id;literal@">
     <input type="hidden" name="only_authorized_p" value="0">
     <input type="text" size="15" name="keyword">
     <input type="submit" value="Find User">
@@ -92,16 +91,15 @@
  </li>
 
 <if @password_reset_url@ not nil>
-  <li><a href="@password_reset_url@">Reset this user's password</a></li>
+  <li><a href="@password_reset_url;noi18n@">Reset this user's password</a></li>
 </if>
 
 <if @password_update_url@ not nil>
-  <li><a href="@password_update_url@">Update this user's password</a></li>
+  <li><a href="@password_update_url;noi18n@">Update this user's password</a></li>
 </if>
 
-<li><a href="@portrait_manage_url@">Manage this user's portrait</a></li>
-
-<li><a href="become?user_id=@user_id@">Login as this user</a></li>
+<li><a href="@portrait_manage_url;noi18n@">Manage this user's portrait</a></li>
+<li><a href="become?user_id=@user_id;literal@">Login as this user</a></li>
 </ul>