Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction.adp	24 Aug 2008 11:51:08 -0000	1.1
@@ -0,0 +1,24 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<table>
+  <tr><td align=right><b>Customer</td><td>@user_id_summary_html;noquote@</td></tr>
+  <tr><td align=right><b>Interaction Date</td><td>@interaction_date_html;noquote@</td></tr>
+  <tr><td align=right><b>Rep</td><td>@rep_html;noquote@</td></tr>
+  <tr><td align=right><b>Originator</td><td>@interaction_originator@</td></tr>
+  <tr><td align=right><b>Inquired Via</td><td>@interaction_type@</td></tr>
+
+<if @interaction_headers@ not nil>
+  <tr><td align=right><b>Interaction Header</td><td>@interaction_headers;noquote@</td></tr>
+</if>
+
+</table>
+
+<br>
+
+<h3>All actions associated with this interaction</h3>
+<center>
+@interaction_actions_html;noquote@
+</center>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction.tcl	9 Mar 2004 00:59:47 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction.tcl	24 Aug 2008 11:51:08 -0000	1.4
@@ -1,5 +1,4 @@
 # interaction.tcl
-
 ad_page_contract {
     @param interaction_id
     @author
@@ -12,84 +11,27 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title "Interaction #$interaction_id"
-append doc_body "[ad_admin_header $page_title]
-<h2>$page_title</h2>
+set title "Interaction ${interaction_id}"
+set context [list [list index "Customer Service"] $title]
 
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] $page_title]
-
-<hr>
-
-<table>
-<tr>
-<td align=right><b>Customer</td>
-"
-
-
 db_1row get_one_interaction_info "select user_identification_id, customer_service_rep, to_char(interaction_date,'YYYY-MM-DD HH24:MI:SS') as full_interaction_date, interaction_originator, interaction_type, interaction_headers from ec_customer_serv_interactions where interaction_id=:interaction_id"
 
+set interaction_date_html [util_AnsiDatetoPrettyDate [lindex [split $full_interaction_date " "] 0]] [lindex [split $full_interaction_date " "] 1]
+set user_id_summary_html [ec_user_identification_summary $user_identification_id]
+set rep_html "<a href=\"[ec_acs_admin_url]users/one?user_id=$customer_service_rep\">$customer_service_rep</a>"
 
-append doc_body "<td>[ec_user_identification_summary $user_identification_id]</td>
-</tr>
-"
-
-append doc_body "<tr>
-<td align=right><b>Interaction Date</td>
-<td>[util_AnsiDatetoPrettyDate [lindex [split $full_interaction_date " "] 0]] [lindex [split $full_interaction_date " "] 1]</td>
-</tr>
-<tr>
-<td align=right><b>Rep</td>
-<td><a href=\"[ec_acs_admin_url]users/one?user_id=$customer_service_rep\">$customer_service_rep</a></td>
-</tr>
-<tr>
-<td align=right><b>Originator</td>
-<td>$interaction_originator</td>
-</tr>
-<tr>
-<td align=right><b>Inquired Via</td>
-<td>$interaction_type</td>
-</tr>
-"
-
-if { ![empty_string_p $interaction_headers] } {
-    append doc_body "<tr>
-    <td align=right><b>Interaction Heade
-    <tr>
-    <td align=right><b>
-    "
-}
-
-append doc_body "
-</table>
-<p>
-<h3>All actions associated with this interaction</h3>
-<center>
-"
-
 set sql "select a.action_details, a.follow_up_required, a.issue_id
 from ec_customer_service_actions a
 where a.interaction_id=:interaction_id
 order by a.action_id desc"
-
+set interaction_actions_html ""
 db_foreach get_interaction_actions $sql {
-    
-    append doc_body "<table width=90%>
+    append interaction_actions_html "<table width=90%>
 <tr bgcolor=\"ececec\"><td><b>Issue:</b> <a href=\"issue?issue_id=$issue_id\">$issue_id</a></td></tr>
-<tr><td><b>Details:</b><br><blockquote>[ec_display_as_html $action_details]</blockquote></td></tr>
-"
-if { ![empty_string_p $follow_up_required] } {
-    append doc_body "<tr><td colspan=6><b>Follow-up Required:</b><br><blockquote>[ec_display_as_html $follow_up_required]</blockquote></td></tr>
-    "
+<tr><td><b>Details:</b><br>[ec_display_as_html $action_details]</td></tr>\n"
+    if { ![empty_string_p $follow_up_required] } {
+        append interaction_actions_html "<tr><td><b>Follow-up Required:</b><br>[ec_display_as_html $follow_up_required]</td></tr>\n"
+    }
+    append interaction_actions_html "</table>\n"
 }
-append doc_body "</table>
-<p>
-"
 
-}
-
-append doc_body "</center>
-[ad_admin_footer]
-"
-
-
-doc_return  200 text/html $doc_body