Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.adp	21 Aug 2008 11:31:13 -0000	1.1
@@ -0,0 +1,34 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>@early_message;noquote@</p>
+
+<form method=post action=interaction-add-2>
+@export_form_vars_html;noquote@
+
+<table>
+@table_rows_html;noquote@
+<tr><td>Date &amp; Time:</td><td>@date_time_widget_html;noquote@</td></tr>
+<tr><td>Inquired via:</td><td>@interaction_widget_html;noquote@</td></tr>
+<tr><td>Who initiated this inquiry?</td><td><select name=interaction_originator>
+  <option value="customer">customer</option><option value="rep">customer service rep</option></select></td></tr>
+</table>
+
+<if @user_identification_id@ nil>
+ <p>Fill in any of the following information, which the system can use to try to identify the customer:</p>
+  <table>
+    <tr><td>First Name:</td><td><input type=text name=first_names size=15> Last Name: <input type=text name=last_name size=20></td></tr>
+    <tr><td>Email Address:</td><td><input type=text name=email size=30></td></tr>
+    <tr><td>Zip Code:</td><td><input type=text name=postal_code size=5 maxlength=5>
+        If you fill this in, we'll determine which city/state they live in.</td></tr>
+    <tr><td>Other Identifying Info:</td><td><input type=text name=other_id_info size=30></td></tr>
+  </table>
+</if>
+
+<center>
+  <input type=submit value="Continue">
+</center>
+
+</form>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl	9 Mar 2004 00:59:47 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl	21 Aug 2008 11:31:13 -0000	1.5
@@ -1,5 +1,4 @@
 # interaction-add.tcl
-
 ad_page_contract { 
     @param issue_id:optional
     @param user_identification_id:optional
@@ -16,7 +15,6 @@
 ad_require_permission [ad_conn package_id] admin
 
 # the customer service rep must be logged on
-
 set return_url "[ad_conn url]"
 
 set customer_service_rep [ad_get_user_id]
@@ -35,92 +33,18 @@
 
 set insert_id 0
 
-append doc_body "[ad_admin_header "New Interaction"]
-<h2>New Interaction</h2>
+set title "New Interaction"
+set context [list [list index "Customer Service"] $title]
 
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "New Interaction"]
+set export_form_vars_html [export_form_vars issue_id return_to_issue c_user_identification_id insert_id]
+set table_rows_html ""
 
-<hr>
-
-<form method=post action=interaction-add-2>
-[export_form_vars issue_id return_to_issue c_user_identification_id insert_id]
-<blockquote>
-<table>
-"
-
-
-
 if { [info exists user_identification_id] } {
-    append doc_body "<tr>
-    <td>Customer:</td>
-    <td>[ec_user_identification_summary $user_identification_id]</td>
-    </tr>
-    "
+    append table_rows_html "<tr><td>Customer:</td><td>[ec_user_identification_summary $user_identification_id]</td></tr>\n"
 }
 
-append doc_body "<tr>
-<td>Customer Service Rep:</td>
-<td>[db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:customer_service_rep"] (if this is wrong, please <a href=\"/register?[export_url_vars return_url]\">log in</a>)</td>
-</tr>
-<tr>
-<td>Date &amp; Time:</td>
-<td>[ad_dateentrywidget open_date] [ec_timeentrywidget open_date "[ns_localsqltimestamp]"]</td>
-</tr>
-<tr>
-<td>Inquired via:</td>
-<td>
-[ec_interaction_type_widget]
-</td>
-</tr>
-<tr>
-<td>Who initiated this inquiry?</td>
-<td><select name=interaction_originator>
-<option value=\"customer\">customer
-<option value=\"rep\">customer service rep
-</select>
-</td>
-</tr>
-</table>
-</blockquote>
-"
+append early_message "Customer Service Rep: [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:customer_service_rep"] (if this is wrong, please <a href=\"/register?[export_url_vars return_url]\">log in</a>)"
 
-if { ![info exists user_identification_id] } {
-    append doc_body "<p>
-    Fill in any of the following information, which the system can use to try to identify the customer:
-    <p>
-    <blockquote>
-    <table>
-    <tr>
-    <td>First Name:</td>
-    <td><input type=text name=first_names size=15> Last Name: <input type=text name=last_name size=20></td>
-    </tr>
-    <tr>
-    <td>Email Address:</td>
-    <td><input type=text name=email size=30></td>
-    </tr>
-    <tr>
-    <td>Zip Code:</td>
-    <td><input type=text name=postal_code size=5 maxlength=5>
-    If you fill this in, we'll determine which city/state they live in.</td>
-    </tr>
-    <tr>
-    <td>Other Identifying Info:</td>
-    <td><input type=text name=other_id_info size=30></td>
-    </tr>
-    </table>
-    "
-}
+set date_time_widget_html "[ad_dateentrywidget open_date] [ec_timeentrywidget open_date "[ns_localsqltimestamp]"]"
 
-append doc_body "</blockquote>
-
-<center>
-<input type=submit value=\"Continue\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"
-
-
-doc_return  200 text/html $doc_body
+set interaction_widget_html [ec_interaction_type_widget]