Index: openacs-4/packages/curriculum-central/www/staff-member-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/staff-member-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/staff-member-postgresql.xql	4 Dec 2005 13:08:27 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/staff-member-postgresql.xql	4 Dec 2005 13:21:18 -0000	1.2
@@ -7,7 +7,9 @@
      <querytext>
        SELECT s.title || ' ' || u.first_names || ' ' || u.last_name AS name,
          s.position, s.department_id, d.department_name, s.staff_id,
-	 u.email, u.url, s.address, s.phone, s.fax, s.homepage_url
+	 u.email, u.url, s.address_line_1, s.address_line_2, s.address_suburb,
+         s.address_state, s.address_postcode, s.address_country, s.phone,
+         s.fax, s.homepage_url
        FROM cc_users u, cc_staff s, cc_department d
        WHERE s.staff_id = u.user_id
        AND s.staff_id = :staff_id
Index: openacs-4/packages/curriculum-central/www/staff-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/staff-member.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/staff-member.adp	4 Dec 2005 13:08:27 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/staff-member.adp	4 Dec 2005 13:21:18 -0000	1.2
@@ -9,7 +9,11 @@
 <li>portrait</li>
 <li>name: @name@</li>
 <li>position: @position@</li>
-<li>address: @address@</li>
+<li>address: @address_line_1@<br />
+@address_line_2@<br />
+@address_suburb@ @address_state@ @address_postcode@<br />
+@address_country@<br />
+</li>
 <li>email: @email@</li>
 <if @phone@ ne ""><li>phone number: @phone@</li></if>
 <if @fax@ ne ""><li>fax number: @fax@</li></if>
Index: openacs-4/packages/curriculum-central/www/staff-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/staff-member.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/staff-member.tcl	4 Dec 2005 13:08:27 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/staff-member.tcl	4 Dec 2005 13:21:18 -0000	1.2
@@ -9,7 +9,12 @@
 }
 
 # Set optional fields to the empty string by default.
-set address {}
+set address_line_1 {}
+set address_line_2 {}
+set address_suburb {}
+set address_state {}
+set address_postcode {}
+set address_country {}
 set phone {}
 set fax {}
 set homepage_url {}