Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp	3 Jul 2015 10:25:49 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp	7 Aug 2017 23:47:59 -0000	1.19
@@ -5,19 +5,20 @@
 
 <if @inline_portrait_state@ eq "inline">
       <div style="float:right">
-        <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" width="@width@" height="@height@" alt="Portrait of @first_names@ @last_name@"></a>
+        <a href="@portrait_url;noi18n@"><img src="@portrait_image_url;noi18n@"
+	width="@width@" height="@height@" alt="Portrait of @first_names@ @last_name@"></a>
       </div>
 </if>
 <else>
   <if @inline_portrait_state@ eq "link">
     <ul class="action-links">
-      <li><a href="portrait?@portrait_export_vars@">#acs-subsite.Portrait#</a></li>
+      <li><a href="@portrait_url;noi18n@">#acs-subsite.Portrait#</a></li>
     </ul>
   </if>
 </else>
 
 <p>
-  #acs-subsite.A_member_of_the_system# <b>@pretty_creation_date@</b>.
+  #acs-subsite.A_member_of_the_system# <strong>@pretty_creation_date@</strong>.
 </p>
 
 <if @member_state@ eq "deleted">
@@ -38,37 +39,35 @@
 </else>
 
 <p>
-  <b>#acs-subsite.Name#:</b> @first_names@ @last_name@
+  <strong>#acs-subsite.Name#:</strong> @first_names@ @last_name@
 </p>
 
-<if @show_email_p@ true>
- 	@email_image;noquote@
-</if>
+<if @show_email_p;literal@ true>@email_image;noquote@</if>
 
-<if @url@ not nil>
+<if @verified_user_id@ ne 0 and @url@ not nil>
   <p>
-    <b>#acs-subsite.Home_page#:</b> 
+    <strong>#acs-subsite.Home_page#:</strong> 
     <a href="@url@">@url@</a>
   </p>
 </if>
 
-<if @bio@ not nil>
-  <p>
-    <b>#acs-subsite.Biography#:</b>
-   </p>
-   <blockquote>
-     @bio;noquote@
-   </blockquote>
+<if @verified_user_id@ ne 0>
+    <if @bio@ not nil>
+      <p>
+	<strong>#acs-subsite.Biography#:</strong>
+      </p>
+      <blockquote>
+	@bio;noquote@
+      </blockquote>
+    </if>
 </if>
-
-
-<if @untrusted_user_id@ eq 0>
+<else>
   <blockquote>
     #acs-subsite.If_you_were_to# <a href="@subsite_url@register/index?@login_export_vars@">#acs-subsite.log_in#</a>#acs-subsite.lt__youd_be_able_to_get#
   </blockquote>
-</if>
+</else>
 
-<if @site_wide_admin_p@>
+<if @site_wide_admin_p;literal@ true>
   <h3>#acs-subsite.lt_For_Site-Wide_Adminis#</h3>
   <ul class="action-links">
     <li><a href="@admin_user_url@">#acs-subsite.Administrative_options#</a></li>