Index: openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.adp	16 Aug 2008 05:51:19 -0000	1.1
@@ -0,0 +1,14 @@
+<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 file.</p>
+<p>@comments@</p>
+
+<form method=post action=supporting-file-delete-2>
+@export_form_vars_html;noquote@
+<center>
+<input type=submit value="Confirm">
+</center>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.tcl	9 Mar 2004 00:59:51 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/products/supporting-file-delete.tcl	16 Aug 2008 05:51:19 -0000	1.4
@@ -14,28 +14,10 @@
 ad_require_permission [ad_conn package_id] admin
 
 set product_name [ec_product_name $product_id]
-
-doc_body_append "[ad_admin_header "Delete Supporting File for $product_name"]
-
-<h2>Delete Supporting File for $product_name</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] [list "one.tcl?[export_url_vars product_id]" $product_name] "Delete Supporting File"]
-
-<hr>
-
-Please confirm that you wish to delete this file.
-"
-
-if { $file == "product-thumbnail.jpg" } {
-    doc_body_append "Note: this file is the thumbnail picture of the product.  If you delete it, the customer will not be able to see what the product looks like."
+set title "Delete Supporting File for $product_name"
+set context [list [list index Products] $title]
+set comments ""
+if { [string match "product-*.jpg" $file } {
+    set comments "Note: this file is the thumbnail picture of the product.  If you delete it, the customer will not be able to see what the product looks like."
 }
-
-doc_body_append "<form method=post action=supporting-file-delete-2>
-[export_form_vars file product_id]
-<center>
-<input type=submit value=\"Confirm\">
-</center>
-</form>
-
-[ad_admin_footer]
-"
\ No newline at end of file
+set export_form_vars_html [export_form_vars file product_id]
Index: openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.adp	16 Aug 2008 05:51:19 -0000	1.1
@@ -0,0 +1,33 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<h3>Current Supporting Files</h3>
+<ul>
+
+<if @files_count@ eq 0>
+  <p>No files found. 
+    <if @dirname_exists@ false>
+      @comments@
+    </if>
+  </p>
+</if><else>
+  <ul>
+   @file_list_html;noquote@
+  </ul>
+</else>
+<h3>Upload New File</h3>
+<if @dirname_exists@ true>
+  <blockquote>
+  Note: the picture of the product is not considered a supporting file.  If you want to change it, go to
+  <a href="edit?@export_product_id_html;noquote@">the regular product edit page</a>.
+  <form enctype=multipart/form-data method=post action=supporting-files-upload-2>
+    @export_form_product_id_html;noquote@
+    <input type=file size=10 name=upload_file>
+    <input type=submit value="Continue">
+    </form>
+ </blockquote>
+</if><else>
+  <p>No directory found in which to upload files.</p>
+</else>
Index: openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.tcl	9 Mar 2004 00:59:51 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/products/supporting-files-upload.tcl	16 Aug 2008 05:51:19 -0000	1.5
@@ -14,71 +14,35 @@
 
 set product_name [ec_product_name $product_id]
 
-doc_body_append "[ad_admin_header "Supporting Files for $product_name"]
+set title "Supporting Files for $product_name"
+set context [list [list index Products] $title]
 
-<h2>Supporting Files for $product_name</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] [list "one.tcl?[export_url_vars product_id]" "One"] "Supporting Files"]
-
-<hr>
-<h3>Current Supporting Files</h3>
-<ul>
-"
-
-
 set dirname [db_string dirname_select "select dirname from ec_products where product_id=$product_id"]
 
-# make sure there are no /'s in dirname
-if { [regexp {/} $dirname] } {
-    error "Invalid dirname."
-}
-
-if { ![empty_string_p $dirname] } {
+set comments ""
+# make sure there are no /'s in dirname, and the dirname is not blank
+set dirname_exists [expr { ![empty_string_p $dirname] && ![regexp {/} $dirname] }]
+if { $dirname_exists } {
     set subdirectory [ec_product_file_directory $product_id]
-
     set full_dirname "[ec_data_directory][ec_product_directory]$subdirectory/$dirname"
 
     # see what's in that directory
     set file_list [glob -nocomplain -directory $full_dirname *]
 
+    set file_list_html ""
+    set files_count 0
     foreach file_name $file_list {
-      set file [lindex [file split $file_name] end]
-	doc_body_append "<li><a href=\"[ec_url]product-file/$subdirectory/$dirname/$file\">$file</a> \[<a href=\"supporting-file-delete?[export_url_vars file product_id]\">delete</a>]\n"
+        set file [lindex [file split $file_name] end]
+        if { [string match {product.[jg][pi][gf]} $file] } {
+            # do not show it
+        } elseif { [string match {product-thumbnail.jpg} $file] } {
+            # do not show it
+        } else {
+            append file_list_html "<li><a href=\"[ec_url]product-file/$subdirectory/$dirname/$file\">$file</a> \[<a href=\"supporting-file-delete?[export_url_vars file product_id]\">delete</a>]</li>\n"
+            incr files_count
+        }
     }
+} 
 
-    if { [string length $file_list] == 0 } {
-	doc_body_append "No files found.\n"
-    }
-} else {
-    doc_body_append "No directory found.\n"
-}
-
-doc_body_append "</ul>
-
-<h3>Upload New File</h3>
-
-<blockquote>
-"
-if { [string compare $dirname ""] != 0 } {
-    doc_body_append "<form enctype=multipart/form-data method=post action=supporting-files-upload-2>
-    [export_form_vars product_id]
-    <input type=file size=10 name=upload_file>
-    <input type=submit value=\"Continue\">
-    </form>
-    "
-} else {
-    doc_body_append "No directory found in which to upload files."
-}
-
-doc_body_append "</blockquote>
-
-<blockquote>
-
-Note that the picture of the product is not considered a supporting
-file.  If you want to change it, go to
-<a href=\"edit?[export_url_vars product_id]\">the regular product edit page</a>.
-
-</blockquote>
-
-[ad_admin_footer]
-"
+set export_product_id_html [export_url_vars product_id]
+set export_form_product_id_html [export_form_vars product_id]