Index: openacs-4/contrib/packages/photobook/lib/person-profile.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/photobook/lib/person-profile.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/photobook/lib/person-profile.adp	3 Nov 2003 20:10:55 -0000	1.1
+++ openacs-4/contrib/packages/photobook/lib/person-profile.adp	18 Mar 2004 22:45:41 -0000	1.2
@@ -68,9 +68,12 @@
       </if>
     </multiple>
 
-    <if @phb_person.past_employers@ not nil>
-      <p>Past employers: @phb_person.past_employers@</p>
+    <if @phb_person.past_employer_company_1@ not nil>
+      <p>Past employer: @phb_person.past_employer_company_1@, @phb_person.past_employer_citystate_1@</p>
     </if>
+    <if @phb_person.past_employer_company_2@ not nil>
+      <p>Past employer: @phb_person.past_employer_company_2@, @phb_person.past_employer_citystate_2@</p>
+    </if>
     
     <multiple name="phb_spans"> 
       <if @phb_spans.relation_tag@ eq "internship" and @phb_spans.institution@ not nil>
@@ -79,9 +82,13 @@
     </multiple>
 
     <p>
-      <if @phb_person.urop_1@ not nil>UROP: @phb_person.urop_1@</if>
+      <if @phb_person.urop_1@ not nil>UROP: @phb_person.urop_1@
+        <if @phb_person.urop_professor_1@ not nil>Professor: @phb_person.urop_professor_1@</if>
+      </if>
       <if @phb_person.urop_2@ not nil and @phb_person.urop_1@ not nil> and </if>
-      <if @phb_person.urop_2@ not nil>@phb_person.urop_2@</if>
+      <if @phb_person.urop_2@ not nil>@phb_person.urop_2@
+        <if @phb_person.urop_professor_2@ not nil>Professor: @phb_person.urop_professor_2@</if>
+      </if>
     </p>
 
     <h2 class="section-head">Education</h2>