Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.adp	24 Aug 2008 22:14:07 -0000	1.1
@@ -0,0 +1,9 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<form method=post action=picklist-item-add-2>
+ @export_form_vars_html;noquote@
+ <p>Name: <input type=text name=picklist_item size=30><input type=submit value="Add"></p>
+</form>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.tcl	9 Mar 2004 00:59:47 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add.tcl	24 Aug 2008 22:14:07 -0000	1.6
@@ -1,5 +1,4 @@
 # picklist-item-add.tcl
-
 ad_page_contract {  
     @param picklist_name
     @param prev_sort_key
@@ -32,36 +31,14 @@
 if { $n_conflicts > 0 } {
     ad_return_complaint 1 "<li>The page you came from appears to be out-of-date;
     perhaps someone has changed the picklist items since you last reloaded the page.
-    Please go back to the previous page, push \"reload\" or \"refresh\" and try
-    again."
+    Please go back to the previous page, \"reload\" or \"refresh\" the page and try
+    again.</li>"
     return
 }
 
+set title "Add an Item"
+set context [list [list index "Customer Service"] $title]
 
-
-append doc_body "[ad_admin_header "Add an Item"]
-
-<h2>Add an Item</h2>
-
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] [list "picklists.tcl" "Picklist Management"] "Add an Item"]
-
-<hr>
-"
-
 set picklist_item_id [db_nextval ec_picklist_item_id_sequence]
 
-append doc_body "<ul>
-
-<form method=post action=picklist-item-add-2>
-[export_form_vars prev_sort_key next_sort_key picklist_name picklist_item_id]
-Name: <input type=text name=picklist_item size=30>
-<input type=submit value=\"Add\">
-</form>
-
-</ul>
-
-[ad_admin_footer]
-"
-
-
-doc_return  200 text/html $doc_body
+set export_form_vars_html "[export_form_vars prev_sort_key next_sort_key picklist_name picklist_item_id]"