Index: openacs-4/packages/ecommerce/www/admin/templates/add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/add-2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/templates/add-2.adp	19 Aug 2008 02:46:21 -0000	1.1
@@ -0,0 +1,15 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<form method=post action=add-3>
+ <p>Name: <tt>@template_name@</tt></p>
+ <p>ADP template: 
+<pre>
+@template@ 
+</pre>
+<center>
+  <input type=submit value="Confirm">
+</center>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/templates/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/add-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/templates/add-2.tcl	9 Mar 2004 00:59:54 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/templates/add-2.tcl	19 Aug 2008 02:46:21 -0000	1.5
@@ -10,79 +10,36 @@
 } {
     template_name
     template:allhtml
-
 }
 
 ad_require_permission [ad_conn package_id] admin
 
 set exception_count 0
 set exception_text ""
 
-
 if { ![info exists template] || [empty_string_p $template] } {
     incr exception_count
-    append exception_text "<li>You forgot to enter anything into the ADP template box.\n"
+    append exception_text "<li>The ADP template is empty. Backup and try again.</li>"
 }
 
 set f [ec_adp_function_p $template]
 if {$f != 0} {
     incr exception_count
-    append exception_text "
-    <li>We're sorry, but templates added here cannot
-    have functions in them for security reasons. Only HTML and 
-    <%= \$variable %> style code may be used.  We found <tt>$function</tt> in this template"
-
+    append exception_text "<li>We found <tt>$function</tt> in this template.  
+    For security reasons, the templates added here cannot
+    have functions in them. Only HTML and <%= \$variable %> style code may be used.</li>"
 }
 
 if { $exception_count > 0 } {
     ad_return_complaint $exception_count $exception_text
     return
 }
 
-set page_html "[ad_admin_header "Confirm Template"]
+set title "Confirm Template"
+set context [list [list index "Product Templates"] $title]
 
-<h2>Confirm Template</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Product Templates"] "Confirm Template"]
-
-<hr>
-"
-
-
 set template_id [db_nextval ec_template_id_sequence]
 
-append page_html "<form method=post action=add-3>
-[export_form_vars template_id template_name template]
+set export_form_vars_html [export_form_vars template_id template_name template]
 
-Name: 
-
-<p>
-
-<blockquote>
-<pre>$template_name</pre>
-</blockquote>
-
-<p>
-
-ADP template:
-
-<p>
-
-<blockquote>
-<pre>
-[ns_quotehtml $template]
-</pre>
-</blockquote>
-
-<p>
-
-<center>
-<input type=submit value=\"Confirm\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"
 db_release_unused_handles
-doc_return 200 text/html $page_html
Index: openacs-4/packages/ecommerce/www/admin/templates/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/edit.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/templates/edit.adp	19 Aug 2008 02:51:01 -0000	1.1
@@ -0,0 +1,14 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<form method=post action=edit-2>
+  @export_form_vars_html;noquote@
+  <p>Name: <input type=text name=template_name size=30 value="@template_name@"></p>
+  <p>ADP template:<br>
+    <textarea name=template rows=30 cols=60>@template@</textarea></p>
+<center>
+  <input type=submit value="Submit Changes">
+</center>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/templates/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/templates/edit.tcl	9 Mar 2004 00:59:54 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/templates/edit.tcl	19 Aug 2008 02:51:01 -0000	1.4
@@ -13,34 +13,10 @@
 
 db_1row get_template_info "select template_name, template from ec_templates where template_id=:template_id"
 
+set title  "Edit Template"
+set context [list [list index "Product Templates"] $title]
 
-set page_html "[ad_admin_header "Edit Template"]
+set export_form_vars_html [export_form_vars template_id]
 
-<h2>Edit Template</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Product Templates"] [list "one.tcl?template_id=$template_id" "$template_name"] "Edit Template"]
-
-<hr>
-
-<form method=post action=edit-2>
-[export_form_vars template_id]
-
-Name: <input type=text name=template_name size=30 value=\"[ad_quotehtml $template_name]\">
-
-<p>
-
-ADP template:<br>
-<textarea name=template rows=30 cols=60>$template</textarea>
-
-<p>
-
-<center>
-<input type=submit value=\"Submit Changes\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"
 db_release_unused_handles
-doc_return  200 text/html $page_html
+