Index: openacs-4/packages/workflow/www/admin/action-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/action-ae.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/workflow/www/admin/action-ae.adp	14 Mar 2011 20:05:45 -0000	1.4
+++ openacs-4/packages/workflow/www/admin/action-ae.adp	17 Sep 2013 16:49:07 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context@ </property>
 
 
Index: openacs-4/packages/workflow/www/admin/delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/delete-confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/delete-confirm.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/delete-confirm.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context@ </property>
 
 <formtemplate id=confirm></formtemplate>
Index: openacs-4/packages/workflow/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/index.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/index.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context@ </property>
 
 Edit a boiler plate so that all future uses of the workflow will have the changes.  Note that current workflow instances using
Index: openacs-4/packages/workflow/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/index.tcl	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/index.tcl	17 Sep 2013 16:49:07 -0000	1.3
@@ -16,22 +16,22 @@
 #get a listing of all the workflow boiler plates
 set where_clause "object_id is null"
 db_multirow -extend {edit_url delete_url view_url}  get_bps get_wfs {} {
-    set edit_url "workflow-edit?[export_url_vars workflow_id]"
+    set edit_url "workflow-edit?[export_vars -url {workflow_id}]"
     workflow::get -workflow_id $workflow_id -array "wf_info"
     set msg "You are about to delete $wf_info(short_name). Are you sure?"
-    set delete_url "delete-confirm?[export_url_vars id=$workflow_id type=workflow msg]"
-    set view_url "workflow-graph?[export_url_vars workflow_id]"
+    set delete_url "delete-confirm?[export_url_vars id=$workflow_id {type workflow} msg]"
+    set view_url "workflow-graph?[export_vars -url {workflow_id}]"
 }
 
 
 #get a listing of all the workflow instances
 set where_clause "object_id is not null"
 db_multirow -extend {edit_url delete_url view_url} get_instances  get_wfs {} {
-    set edit_url "workflow-edit?[export_url_vars workflow_id]"
+    set edit_url "workflow-edit?[export_vars -url {workflow_id}]"
     workflow::get -workflow_id $workflow_id -array "wf_info"
     set msg "You are about to delete $wf_info(short_name). Are you sure?"
-    set delete_url "delete-confirm?[export_url_vars id=$workflow_id type=workflow msg]"
-    set view_url "workflow-graph?[export_url_vars workflow_id]"
+    set delete_url "delete-confirm?[export_url_vars id=$workflow_id {type workflow} msg]"
+    set view_url "workflow-graph?[export_vars -url {workflow_id}]"
 }
 
 set new_wf_url "workflow-ae"
Index: openacs-4/packages/workflow/www/admin/role-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/role-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/role-ae.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/role-ae.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context@ </property>
 
 <formtemplate id=add-edit></formtemplate>
Index: openacs-4/packages/workflow/www/admin/state-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/state-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/state-ae.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/state-ae.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context@ </property>
 
 <formtemplate id=add-edit></formtemplate>
Index: openacs-4/packages/workflow/www/admin/workflow-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/workflow-ae.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/workflow-ae.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name=title>@title@</property>
+<property name="doc(title)">@title@</property>
 <property name=context>@context@</property>
 <formtemplate id=add-edit></formtemplate>
Index: openacs-4/packages/workflow/www/admin/workflow-clone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-clone.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/workflow-clone.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/workflow-clone.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context@ </property>
 
 <formtemplate id=clone></formtemplate>
Index: openacs-4/packages/workflow/www/admin/workflow-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/workflow-edit.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/workflow-edit.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name=title> @title@ </property>
+<property name="doc(title)"> @title@ </property>
 <property name=context> @context;noquote@ </property>
 
 Editing <b> @wf_info.short_name@ </b>
Index: openacs-4/packages/workflow/www/admin/workflow-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/workflow-edit.tcl	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/workflow-edit.tcl	17 Sep 2013 16:49:07 -0000	1.3
@@ -17,36 +17,36 @@
 set context [list "$wf_info(short_name)"]
 
 db_multirow -extend {edit_url delete_url} get_states get_states {} {
-    set edit_url "state-ae?[export_url_vars state_id workflow_id]"
+    set edit_url "state-ae?[export_vars -url {state_id workflow_id}]"
     workflow::state::fsm::get \
 	    -state_id $state_id \
 	    -array "state_info"
     set msg "You are about to delete $state_info(pretty_name). Are you sure?"
-    set delete_url "delete-confirm?[export_url_vars id=$state_id type=state msg]"
+    set delete_url "delete-confirm?[export_url_vars id=$state_id {type state} msg]"
 }
 
 db_multirow -extend {edit_url delete_url} get_actions get_actions {} {
-    set edit_url "action-ae?[export_url_vars action_id workflow_id]"
+    set edit_url "action-ae?[export_vars -url {action_id workflow_id}]"
     workflow::action::fsm::get \
 	    -action_id $action_id \
 	    -array "action_info"
     set msg "You are about to delete $action_info(pretty_name). Are you sure?"
-    set delete_url "delete-confirm?[export_url_vars id=$action_id type=action msg]"
+    set delete_url "delete-confirm?[export_url_vars id=$action_id {type action} msg]"
 }
 
 
 db_multirow -extend {edit_url delete_url} get_roles get_roles {} {
-    set edit_url "role-ae?[export_url_vars role_id workflow_id]"
+    set edit_url "role-ae?[export_vars -url {role_id workflow_id}]"
     workflow::role::get \
 	     -role_id $role_id \
 	    -array "role_info"
     set msg "You are about to delete $role_info(pretty_name). Are you sure?"
-    set delete_url "delete-confirm?[export_url_vars id=$role_id msg type=role]"
+    set delete_url "delete-confirm?[export_url_vars id=$role_id msg {type role}]"
 }
 
-set wf_meta_edit "workflow-ae?[export_url_vars workflow_id]"
-set add_role_url "role-ae?[export_url_vars workflow_id]"
-set add_state_url "state-ae?[export_url_vars workflow_id]"
-set add_action_url "action-ae?[export_url_vars workflow_id]"
+set wf_meta_edit "workflow-ae?[export_vars -url {workflow_id}]"
+set add_role_url "role-ae?[export_vars -url {workflow_id}]"
+set add_state_url "state-ae?[export_vars -url {workflow_id}]"
+set add_action_url "action-ae?[export_vars -url {workflow_id}]"
 
 
Index: openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp	4 Jan 2007 09:04:10 -0000	1.2
+++ openacs-4/packages/workflow/www/admin/workflow-meta-edit.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,4 +1,4 @@
 <master>
-<property name=title>@title@</property>
+<property name="doc(title)">@title@</property>
 <property name=context>@context@</property>
 <formtemplate id=add-edit></formtemplate>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-cc-1.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 <h2>Elementary Private Law Template</h2>
 
Index: openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-cc-2.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 <h3 style="margin-top: 24px; border-top: 1px solid black">Properties</h3>
 <formtemplate id="task"></formtemplate>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-1.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 <h2>Elementary Private Law Template</h2>
 
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp	15 Dec 2003 12:56:33 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-2.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-3.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
 <h3>Roles</h3>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp	30 Jan 2004 15:58:50 -0000	1.3
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-4.adp	17 Sep 2013 16:49:07 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp	9 Dec 2003 09:53:34 -0000	1.2
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-5.adp	17 Sep 2013 16:49:07 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
 <h3>Roles</h3>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp	30 Jan 2004 15:58:50 -0000	1.3
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-6.adp	17 Sep 2013 16:49:07 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-6a.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-7.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.tcl	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-sim-ft-example-task-edit.tcl	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   
   <table cellpadding=3 cellspacing=1 border=0>
Index: openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-tip-cc-1.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 <h2>TIP Process</h2>
 
Index: openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp	9 Dec 2003 09:33:17 -0000	1.1
+++ openacs-4/packages/workflow/www/doc/mockup-tip-cc-2.adp	17 Sep 2013 16:49:07 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
+  <property name="doc(title)">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 <h3 style="margin-top: 24px; border-top: 1px solid black">Properties</h3>
 <formtemplate id="task"></formtemplate>