[CMF-checkins] CVS: CMF/CMFCore/dtml - explainActionsTool.dtml:1.2.12.1 manageActionProviders.dtml:1.4.12.1

Yvo Schubbe schubbe@web.de
Fri, 9 May 2003 17:32:09 -0400


Update of /cvs-repository/CMF/CMFCore/dtml
In directory cvs.zope.org:/tmp/cvs-serv20972/CMFCore/dtml

Modified Files:
      Tag: CMF-1_4-branch
	explainActionsTool.dtml manageActionProviders.dtml 
Log Message:
Merged yuppie-collector152-branch:
- Made type actions absolute URLs by default. (Collector #152)

=== CMF/CMFCore/dtml/explainActionsTool.dtml 1.2 => 1.2.12.1 ===
--- CMF/CMFCore/dtml/explainActionsTool.dtml:1.2	Tue Feb  4 17:29:42 2003
+++ CMF/CMFCore/dtml/explainActionsTool.dtml	Fri May  9 17:31:38 2003
@@ -5,17 +5,17 @@
 
 <p> This tool assembles the "actions" which are germane to the current
     user (anonymous, member, etc.) and context (content object or folder
-    being viewed).  These actions are drawn from several sources:
+    being viewed).  These actions are drawn from several optional sources:
 
     <ul>
-      <li> the actions tool itself, for "global" actions (optional);</li>
+      <li> the actions tool itself, for "global" actions;</li>
       <li> the workflow tool, for actions which depend on the
-           workflow state of the content object (optional);</li>
+           workflow state of the content object;</li>
       <li> the membership tool, for actions which depend on the
-           member or user (optional);</li>
+           member or user;</li>
       <li> the types tool, for actions which are specific to a given
-           content type (hardwired);</li>
-      <li> other action providers (optional).</li>
+           content type;</li>
+      <li> other action providers.</li>
     </ul>
 
 </p>


=== CMF/CMFCore/dtml/manageActionProviders.dtml 1.4 => 1.4.12.1 ===
--- CMF/CMFCore/dtml/manageActionProviders.dtml:1.4	Tue Feb  4 17:29:42 2003
+++ CMF/CMFCore/dtml/manageActionProviders.dtml	Fri May  9 17:31:38 2003
@@ -13,9 +13,7 @@
 </dtml-let>
 <dtml-var manage_tabs>
 
-<p>Content type specific actions of portal_types are always queried by this
-    tool. The usage of other action providers and of portal_types' global
-    actions is configurable here.</p>
+<p>The list of action providers queried by this tool is configurable here.</p>
 
 <form action="manage_aproviders" method="POST">
 <table>