Index: openacs-4/packages/ecommerce/www/admin/products/link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/products/link.adp	15 Aug 2008 11:09:50 -0000	1.1
@@ -0,0 +1,41 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>Links <b>from</b> the page for @product_name;noquote@ to other products' display pages:</p>
+<if @product_counter_a2@ gt 0>
+<ul>
+@doc_body_a2;noquote@
+</ul>
+</if>
+<else><p>None.</p>
+</else>
+
+<p>Links <b>to</b> @product_name;noquote@ from other products' display pages:</p>
+<if @product_counter_2a@ gt 0>
+<ul>
+@doc_body_2a;noquote@
+</ul>
+</if>
+<else><p>None.</p>
+</else>
+
+<h3>Search for a product to add a link to/from:</h3>
+
+<form method=post action=link-add>
+@export_product_id_html;noquote@
+        Name: <input type=text name=link_product_name size=20>
+        <input type=submit value="Search">
+</form>
+
+<form method=post action=link-add>
+@export_product_id_html;noquote@
+       SKU: <input type=text name=link_product_sku size=10>
+       <input type=submit value="Search">
+</form>
+
+<h3>Audit Trail</h3>
+<ul>
+  <li><a href="@audit_url_html;noquote@">Audit Links from @product_name;noquote@</a></li>
+</ul>
Index: openacs-4/packages/ecommerce/www/admin/products/link.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/link.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/products/link.tcl	9 Mar 2004 00:59:51 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/products/link.tcl	15 Aug 2008 11:09:50 -0000	1.5
@@ -17,78 +17,41 @@
 
 set product_name [ec_product_name $product_id]
 
-doc_body_append "
-    [ad_admin_header "Links between $product_name and other products"]
+set title "Links between $product_name and other products"
+set context [list [list index Products] $title]
 
-    <h2>Links</h2>
 
-    [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] [list "one.tcl?[export_url_vars product_id]" "One"] "Links"]
-
-    <hr>
-
-    <p>Links <b>from</b> the page for $product_name to other products' display pages:</p>
-    <ul>"
-
-set product_counter 0
-
+set product_counter_a2 0
+set doc_body_a2 ""
 db_foreach linked_products_select "
     select product_b, product_name as product_b_name
     from ec_product_links, ec_products
     where product_a=:product_id
     and product_b=ec_products.product_id" {
  
-   incr product_counter
-    doc_body_append "
-	<li>
-	  <a href=\"one?product_id=$product_b\">$product_b_name</a>
-	  \[<a href=\"link-delete?[export_url_vars product_id]&product_a=$product_id&product_b=$product_b\">delete link</a>\]
-	</li>"
+   incr product_counter_a2
+    append doc_body_a2 "
+	<li><a href=\"one?product_id=$product_b\">$product_b_name</a>
+	  \[<a href=\"link-delete?[export_url_vars product_id]&product_a=$product_id&product_b=$product_b\">delete link</a>\]</li>"
 }
 
-if { $product_counter == 0 } {
-    doc_body_append "None"
-}
 
-doc_body_append "
-    </ul>
-    <p>Links <b>to</b> $product_name from other products' display pages:</p>
-    <ul>"
-
-set product_counter 0
-
+set product_counter_2a 0
+set doc_body_2a ""
 db_foreach more_links_select "
     select product_a, product_name as product_a_name
     from ec_product_links, ec_products
     where product_b=:product_id
     and ec_product_links.product_a=ec_products.product_id" {
 
-    incr product_counter
-    doc_body_append "
-	<li>
-	  <a href=\"one?product_id=$product_a\">$product_a_name</a> 
-	  \[<a href=\"link-delete?[export_url_vars product_id]&product_a=$product_a&product_b=$product_id\">delete link</a>\]
-	</li>"
+    incr product_counter_2a
+    append doc_body_2a "
+	<li><a href=\"one?product_id=$product_a\">$product_a_name</a> 
+	  \[<a href=\"link-delete?[export_url_vars product_id]&product_a=$product_a&product_b=$product_id\">delete link</a>\]</li>"
 }
 
-if { $product_counter == 0 } {
-    doc_body_append "None\n"
-}
+set export_product_id_html [export_form_vars product_id]
 
-doc_body_append "
-    </ul>
-    <p>Search for a product to add a link to/from:</p>
-    <blockquote>
-      <form method=post action=link-add>
-        [export_form_vars product_id]
-        Name: <input type=text name=link_product_name size=20> <input type=submit value=\"Search\">
-     </form>
-     <form method=post action=link-add>
-       [export_form_vars product_id]
-       SKU: <input type=text name=link_product_sku size=10>
-       <input type=submit value=\"Search\">
-     </form>
-    </blockquote>"
-
 # Set audit variables audit_name, audit_id, audit_id_column,
 # return_url, audit_tables, main_tables
 
@@ -98,22 +61,8 @@
 set return_url "[ad_conn url]?[export_url_vars product_id]"
 set audit_tables [list ec_product_links_audit]
 set main_tables [list ec_product_links]
+set audit_url_html "[ec_url_concat [ec_url] /admin]/audit?[export_url_vars audit_name audit_id audit_id_column return_url audit_tables main_tables]"
 
-doc_body_append "
-    <h3>Audit Trail</h3>
-    <ul>
-      <li>
-	<a href=\"[ec_url_concat [ec_url] /admin]/audit?[export_url_vars audit_name audit_id audit_id_column return_url audit_tables main_tables]\">
-	Audit Links from $product_name</a>
-      </li>"
-
 set audit_name "Links to $product_name"
 set audit_id_column "product_b"
 
-doc_body_append "
-     <li>
-       <a href=\"[ec_url_concat [ec_url] /admin]/audit?[export_url_vars audit_name audit_id audit_id_column return_url audit_tables main_tables]\">
-       Audit Links to $product_name</a>
-    </li>
-  </ul>
-  [ad_admin_footer]"