[Checkins] SVN: Products.DCWorkflow/trunk/ - content_url is deprecated

[Yvo Schubbe]

Log message for revision 127502:
  - content_url is deprecated

Changed:
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/doc/actbox.stx
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/profiles/revision2/workflows/default_workflow/definition.xml
  U   Products.DCWorkflow/trunk/docs/narrative/ActionBoxes.rst

-=-
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/doc/actbox.stx
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/doc/actbox.stx	2012-08-13 07:58:34 UTC (rev 127501)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/doc/actbox.stx	2012-08-13 08:02:26 UTC (rev 127502)
@@ -2,16 +2,16 @@
 Names and URLs for the actions box can be formatted using standard Python
 string formatting.  An example::
 
-  %(content_url)s/content_submit_form
+  %(object_url)s/content_submit_form
 
-The string '%(content_url)s' will be replaced by the value of content_url.
+The string '%(object_url)s' will be replaced by the value of object_url.
 The following names are available:
 
 - portal_url
 
 - folder_url
 
-- content_url
+- object_url
 
 - user_id
 
@@ -25,6 +25,6 @@
 
 - folder
 
-- content
+- object
 
 - isAnonymous

Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/profiles/revision2/workflows/default_workflow/definition.xml
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/profiles/revision2/workflows/default_workflow/definition.xml	2012-08-13 07:58:34 UTC (rev 127501)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/profiles/revision2/workflows/default_workflow/definition.xml	2012-08-13 08:02:26 UTC (rev 127502)
@@ -97,7 +97,7 @@
              title="Member makes content private"
              new_state="private" trigger="USER"
              before_script="" after_script="">
-  <action url="%(content_url)s/content_hide_form"
+  <action url="%(object_url)s/content_hide_form"
           icon="%(portal_url)s/retract_icon.png"
           category="workflow">Make private</action>
   <guard>
@@ -145,7 +145,7 @@
              title="Member makes content visible"
              new_state="visible" trigger="USER"
              before_script="" after_script="">
-  <action url="%(content_url)s/content_show_form"
+  <action url="%(object_url)s/content_show_form"
           icon="%(portal_url)s/approve_icon.png"
           category="workflow">Make visible</action>
   <guard>

Modified: Products.DCWorkflow/trunk/docs/narrative/ActionBoxes.rst
===================================================================
--- Products.DCWorkflow/trunk/docs/narrative/ActionBoxes.rst	2012-08-13 07:58:34 UTC (rev 127501)
+++ Products.DCWorkflow/trunk/docs/narrative/ActionBoxes.rst	2012-08-13 08:02:26 UTC (rev 127502)
@@ -9,16 +9,16 @@
 Names and URLs for the actions box can be formatted using standard Python
 string formatting. An example::
 
-  %(content_url)s/content_submit_form
+  %(object_url)s/content_submit_form
 
-The string '%(content_url)s' will be replaced by the value of content_url.
+The string '%(object_url)s' will be replaced by the value of object_url.
 The following names are available:
 
 * portal_url
 
 * folder_url
 
-* content_url
+* object_url
 
 * count (Available in work lists only. Represents the number of items in the
   work list.)
@@ -30,7 +30,7 @@
 
 * folder
 
-* content
+* object
 
 * isAnonymous