Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	14 May 2007 20:30:25 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	21 Nov 2007 17:01:55 -0000	1.8
@@ -2,18 +2,18 @@
 <property name="title">#acs-subsite.lt_Edit_comment_for_the_#</property>
 <property name="context">@context;noquote@</property>
 
+<div>
 <form method="post" action="comment-edit-2.tcl">
-@export_vars;noquote@
-#acs-subsite.Story_behind_photo#:<br />
+<div>@export_vars;noquote@</div>
+<p>#acs-subsite.Story_behind_photo#:</p>
+<p>
 <textarea rows="6" cols="50" name="description">
 @description@
 </textarea>
+</p>
 
-<br><br>
-<center>
+<p style="text-align:center">
 <input type="submit" value="#acs-subsite.Save_comment#">
-</center>
+</p>
 </form>
-
-
-
+</div>
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	11 Sep 2007 09:44:47 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	21 Nov 2007 17:01:55 -0000	1.7
@@ -9,10 +9,11 @@
   <p>#acs-subsite.lt_Sure_erase_user_por#</p>
 </else>
 
+<div>
 <form method="get" action="erase-2">
-@export_vars;noquote@
-<center>
-<input type="submit" value="#acs-subsite.Yes_I_am_sure#" />
-</center>
+<div>@export_vars;noquote@</div>
+<p style="text-align:center">
+<input type="submit" value="#acs-subsite.Yes_I_am_sure#">
+</p>
 </form>
-
+</div>
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	29 Jun 2004 10:17:43 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	21 Nov 2007 17:01:55 -0000	1.11
@@ -9,17 +9,14 @@
 <p>#acs-subsite.lt_This_is_the_image_that#:</p>
 </if>
 
-<center>
-<img @widthheight@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@"
-alt="Portrait of @first_names@ @last_name@">
-</center>
+<div style="text-align:center">
+<img @widthheight@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@" alt="Portrait of @first_names@ @last_name@">
+</div>
 
 <ul>
 <li>#acs-subsite.lt_Uploaded_pretty_date#</li>
 <li>#acs-subsite.Comment#: 
-<blockquote>
-@description@
-</blockquote>
+<p>@description@</p>
 </li>
 </ul>
 
@@ -37,15 +34,18 @@
 </case>
 
 <case value="no_user">
-#acs-subsite.lt_We_cant_find_you#
+<p>#acs-subsite.lt_We_cant_find_you#</p>
 </case>
 
 <case value="no_portrait_info">
+<p>
 #acs-subsite.lt_The_picture_of_you_in#
 <a href="upload?return_url=@return_url@">#acs-subsite.upload#</a> #acs-subsite.another_picture#
+</p>
 </case>
 
 <case value="no_portrait">
+<p>
 <if @admin_p@ eq "0">
 #acs-subsite.lt_This_user_doesnt_have#
 <a href="upload?@export_edit_vars@">#acs-subsite.go_upload_the_users_por#</a>.
@@ -54,6 +54,7 @@
 #acs-subsite.You_dont_have_a_portrait#
 <a href="upload?return_url=@return_url@">#acs-subsite.go_upload_your_portrait#</a>.
 </else>
+</p>
 </case>
  
 </switch>
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	29 May 2007 05:37:25 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	21 Nov 2007 17:01:55 -0000	1.8
@@ -2,20 +2,19 @@
 <property name=title>#acs-subsite.Upload_Portrait#</property>
 <property name="context">@context;noquote@</property>
 
-#acs-subsite.lt_How_would_you_like_the#
 
-<p>
+<p>#acs-subsite.lt_How_would_you_like_the#</p>
 
-#acs-subsite.lt_Upload_your_favorite#
+<p>#acs-subsite.lt_Upload_your_favorite#</p>
 
-<blockquote>
+<div>
 <form enctype="multipart/form-data" method=POST action="upload-2">
-@export_vars;noquote@
+<div>@export_vars;noquote@</div>
 <table>
 <if @portrait_p@ eq 1>
 <tr>
 <td colspan=2 align="center">
-<img src="/shared/portrait-bits.tcl?user_id=@current_user_id@"/>
+<img src="/shared/portrait-bits.tcl?user_id=@current_user_id@" alt="Your portrait">
 <br>
 (<a href="erase?return_url=@return_url;noquote@">Delete Portrait</a>)
 </td>
@@ -25,23 +24,22 @@
 <td valign=top align=right>#acs-subsite.Filename#: </td>
 <td>
 <input type=file name=upload_file size=20><br>
-<font size=-1>#acs-subsite.lt_Use_the_Browse_button#</font>
+#acs-subsite.lt_Use_the_Browse_button#
 </td>
 </tr>
 <tr>
 <td valign=top align=right>#acs-subsite.Story_Behind_Photo#
 <br>
-<font size=-1>#acs-subsite.optional#</font>
+#acs-subsite.optional#
 </td>
 <td><textarea rows=6 cols=50 name="portrait_comment">
 </textarea>
 </td>
 </tr>
 
 </table>
-<p>
-<center>
+<p style="text-align:center">
 <input type=submit value="Upload">
-</center>
+</p>
 </form>
-</blockquote>
+</div>
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	29 May 2007 05:37:25 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	21 Nov 2007 17:01:55 -0000	1.8
@@ -15,17 +15,11 @@
 
 set current_user_id [ad_conn user_id]
 
-set portrait_p [db_0or1row "checkportrait" {SELECT live_revision as revision_id, item_id
-          FROM acs_rels a, cr_items c
-          WHERE a.object_id_two = c.item_id
-          AND a.rel_type = 'user_portrait_rel'
-          AND a.object_id_one = :current_user_id
-          AND c.live_revision is not NULL
-} ]
+set portrait_p [db_0or1row "checkportrait" {}]
 
 
 if { $portrait_p } {
-	set story [db_string "getstory" "select description from cr_revisions where revision_id = :revision_id"]
+	set story [db_string "getstory" {}]
 } else {
 	set story ""
 	set revision_id ""
@@ -41,10 +35,7 @@
 
 ad_require_permission $user_id "write"
 
-if {![db_0or1row name "select 
-  first_names, last_name
-from persons 
-where person_id=:user_id"]} {
+if {![db_0or1row get_name {}]} {
     ad_return_error "Account Unavailable" "We can't find you (user #$user_id) in the users table.  Probably your account was deleted for some reason."
     return
 }