[CMF-checkins] CVS: Products/CMFCore/dtml - editToolsActions.dtml:1.3

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCore/dtml
In directory cvs.zope.org:/tmp/cvs-serv10833/CMFCore/dtml

Modified Files:
	editToolsActions.dtml 
Log Message:
merged yuppie-actions-cleanup-branch:
- enforced usage of 'title' instead of 'name', 'url' instead of 'action'
- enforced boolean type of 'visible'
- refactored CMFSetup actions and type-info handling
- updated default profile


=== Products/CMFCore/dtml/editToolsActions.dtml 1.2 => 1.3 ===
--- Products/CMFCore/dtml/editToolsActions.dtml:1.2	Fri Jan  4 14:50:04 2002
+++ Products/CMFCore/dtml/editToolsActions.dtml	Mon Jul 19 14:11:36 2004
@@ -28,12 +28,12 @@
 </td>
 <td>
   <div class="form-label">
-  Name
+  Title
   </div>
 </td>
 <td>
   <div class="form-element">
-  <input type="text" name="name_&dtml-index;" value="&dtml-name;" />
+  <input type="text" name="name_&dtml-index;" value="&dtml-title;" />
   </div>
 </td>
 </tr>
@@ -56,7 +56,7 @@
 <td></td>
 <td>
   <div class="form-label">
-  Action
+  URL (Expression)
   </div>
 </td>
 <td>
@@ -70,7 +70,7 @@
 <td></td>
 <td>
   <div class="form-label">
-  Condition 
+  Condition (Expression)
   </div>
 </td>
 <td>
@@ -90,11 +90,11 @@
 <td>
   <div class="form-element">
   <select name="permission_&dtml-index;">
-    <dtml-let selected="(not permission) and 'selected' or ' '">
+    <dtml-let selected="(not permissions) and 'selected' or ' '">
       <option value="" &dtml-selected;>(none)</option>
     </dtml-let>
     <dtml-in possible_permissions sort>
-      <dtml-let selected="(permission == _['sequence-item'])
+      <dtml-let selected="(permissions and permissions[0] == _['sequence-item'])
         and 'selected' or ' '">
       <option value="&dtml-sequence-item;" &dtml-selected;>&dtml-sequence-item;</option>
       </dtml-let>
@@ -168,7 +168,7 @@
 <td></td>
 <td>
   <div class="form-label">
-  Name
+  Title
   </div>
 </td>
 <td>
@@ -196,7 +196,7 @@
 <td></td>
 <td>
   <div class="form-label">
-  Action
+  URL (Expression)
   </div>
 </td>
 <td>
@@ -209,7 +209,7 @@
 <td></td>
 <td>
   <div class="form-label">
-  Condition
+  Condition (Expression)
   </div>
 </td>
 <td>