Index: openacs-4/packages/ecommerce/www/admin/products/link-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link-add-2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/products/link-add-2.adp	15 Aug 2008 10:23:03 -0000	1.1
@@ -0,0 +1,16 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+<p>
+Please choose an action:
+</p>
+<ul>
+
+<li><a href="link-add-3?action=from&@export_product_and_link_ids_html;noquote@">Link <i>to</i> @link_product_name;noquote@ <i>from</i> @product_name;noquote@</a>
+</li>
+<li><a href="link-add-3?action=to&@export_product_and_link_ids_html;noquote@">Link <i>to</i> @product_name;noquote@ <i>from</i> @link_product_name;noquote@</a>
+</li>
+<li><a href="link-add-3?action=both&@export_product_and_link_ids_html;noquote@">Link <i>to</i> @product_name;noquote@ <i>from</i> @link_product_name;noquote@ <i>and</i> vice versa</a>
+</li>
+</ul>
Index: openacs-4/packages/ecommerce/www/admin/products/link-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/products/link-add-2.tcl	9 Mar 2004 00:59:51 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/products/link-add-2.tcl	15 Aug 2008 10:23:03 -0000	1.4
@@ -16,29 +16,7 @@
 set product_name [ec_product_name $product_id]
 set link_product_name [ec_product_name $link_product_id]
 
-doc_body_append "[ad_admin_header "Create New Link, Cont."]
+set title "Create New Link, Cont."
+set context [list [list index Products] $title]
 
-<h2>Create New Link, Cont.</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] [list "one.tcl?[export_url_vars product_id]" $product_name] "New Link, Cont."]
-
-<hr>
-
-Please choose an action:
-
-<ul>
-
-<li><a href=\"link-add-3?action=from&[export_url_vars product_id link_product_id]\">Link <i>to</i> $link_product_name <i>from</i> $product_name</a>
-
-<p>
-
-<li><a href=\"link-add-3?action=to&[export_url_vars product_id link_product_id]\">Link <i>to</i> $product_name <i>from</i> $link_product_name</a>
-
-<p>
-
-<li><a href=\"link-add-3?action=both&[export_url_vars product_id link_product_id]\">Link <i>to</i> $product_name <i>from</i> $link_product_name <i>and</i> vice versa</a>
-
-</ul>
-
-[ad_admin_footer]
-"
\ No newline at end of file
+set export_product_and_link_ids_html [export_url_vars product_id link_product_id]
Index: openacs-4/packages/ecommerce/www/admin/products/link-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/products/link-add.adp	15 Aug 2008 10:23:03 -0000	1.1
@@ -0,0 +1,16 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+
+
+<if @no_rows@ false>
+<p>Please select the product you wish to link to or from:</p>
+<ul>
+@doc_body;noquote@
+</ul>
+</if><else>
+<p> 
+No products found.
+</p>
Index: openacs-4/packages/ecommerce/www/admin/products/link-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/products/link-add.tcl	9 Mar 2004 00:59:51 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/products/link-add.tcl	15 Aug 2008 10:23:03 -0000	1.5
@@ -15,31 +15,20 @@
 
 set product_name [ec_product_name $product_id]
 
-doc_body_append "[ad_admin_header "Create New Link"]
+set title "Create New Products Link"
+set context [list [list index Products] $title]
 
-<h2>Create New Link</h2>
-
-[ad_context_bar [list ../ "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] [list "one.tcl?[export_url_vars product_id]" $product_name] "New Link"]
-
-<hr>
-Please select the product you wish to link to or from:
-<ul>
-"
-
 if { [info exists link_product_sku] } {
     set additional_query_part "sku=:link_product_sku"
 } else {
     set additional_query_part "upper(product_name) like '%' || upper(:link_product_name) || '%'"
 }
 
+set doc_body ""
+set no_rows 0
 
 db_foreach product_search_select "select product_id as link_product_id, product_name as link_product_name from ec_products where $additional_query_part" {
-    doc_body_append "<li><a href=\"link-add-2?[export_url_vars product_id link_product_id]\">$link_product_name</a>\n"
+    append doc_body "<li><a href=\"link-add-2?[export_url_vars product_id link_product_id]\">$link_product_name</a>\n"
 } if_no_rows {
-    doc_body_append "No matching products were found.\n"
+    set no_rows 1
 }
-
-doc_body_append "</ul>
-
-[ad_admin_footer]
-"
\ No newline at end of file
Index: openacs-4/packages/ecommerce/www/admin/products/link-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link-delete.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/products/link-delete.adp	15 Aug 2008 10:27:59 -0000	1.1
@@ -0,0 +1,16 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>
+Please confirm that you wish to delete this link.
+</p>
+<form method=post action=link-delete-2>
+@export_products_html;noquote@
+<center>
+<input type=submit value="Confirm">
+</center>
+
+</form>
+
Index: openacs-4/packages/ecommerce/www/admin/products/link-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/products/link-delete.tcl	9 Mar 2004 00:59:51 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/products/link-delete.tcl	15 Aug 2008 10:27:59 -0000	1.4
@@ -15,24 +15,7 @@
 
 set product_name [ec_product_name $product_id]
 
-doc_body_append "[ad_admin_header "Confirm Deletion"]
+set title "Confirm Link To Delete"
+set context [list [list index Products] $title]
 
-<h2>Confirm Deletion</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] [list "one.tcl?[export_url_vars product_id]" $product_name] "Delete Link"]
-
-<hr>
-Please confirm that you wish to delete this link.
-
-<form method=post action=link-delete-2>
-
-[export_form_vars product_id product_a product_b]
-
-<center>
-<input type=submit value=\"Confirm\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"
+set export_products_html [export_form_vars product_id product_a product_b]